summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2003-09-03 04:06:40 +0000
committerMike Frysinger <vapier@gentoo.org>2003-09-03 04:06:40 +0000
commit01140c0e8708c639fe3ba808c88f8049794da04c (patch)
tree60016d2027a5430f93666e5e15ceba4729d918d9 /sys-apps
parentAdded tdl to ~ppc. (diff)
downloadgentoo-2-01140c0e8708c639fe3ba808c88f8049794da04c.tar.gz
gentoo-2-01140c0e8708c639fe3ba808c88f8049794da04c.tar.bz2
gentoo-2-01140c0e8708c639fe3ba808c88f8049794da04c.zip
remove deprecated head -1
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/daemontools/ChangeLog5
-rw-r--r--sys-apps/daemontools/daemontools-0.76-r3.ebuild13
-rw-r--r--sys-apps/daemontools/files/0.76-head-1.patch21
3 files changed, 32 insertions, 7 deletions
diff --git a/sys-apps/daemontools/ChangeLog b/sys-apps/daemontools/ChangeLog
index 3236f0ca17ac..48fd366bc209 100644
--- a/sys-apps/daemontools/ChangeLog
+++ b/sys-apps/daemontools/ChangeLog
@@ -1,9 +1,12 @@
# ChangeLog for sys-apps/daemontools
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/ChangeLog,v 1.11 2003/03/16 23:12:40 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/ChangeLog,v 1.12 2003/09/03 04:06:40 vapier Exp $
*daemontools-0.76-r3 (26 Feb 2003)
+ 02 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+ Add patch to change `head -1` to `head -n 1`.
+
16 Mar 2003; Will Woods <wwoods@gentoo.org> daemontools-0.76-r3.ebuild:
Added alpha to KEYWORDS
diff --git a/sys-apps/daemontools/daemontools-0.76-r3.ebuild b/sys-apps/daemontools/daemontools-0.76-r3.ebuild
index 7aa21dba08b7..829dc4aa4f36 100644
--- a/sys-apps/daemontools/daemontools-0.76-r3.ebuild
+++ b/sys-apps/daemontools/daemontools-0.76-r3.ebuild
@@ -1,16 +1,16 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/daemontools-0.76-r3.ebuild,v 1.4 2003/06/21 21:19:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/daemontools-0.76-r3.ebuild,v 1.5 2003/09/03 04:06:40 vapier Exp $
-inherit eutils
+inherit eutils gcc
DESCRIPTION="Collection of tools for managing UNIX services"
SRC_URI="http://cr.yp.to/daemontools/${P}.tar.gz"
HOMEPAGE="http://cr.yp.to/daemontools.html"
-KEYWORDS="x86 amd64 ppc sparc alpha"
-SLOT="0"
LICENSE="freedist"
+SLOT="0"
+KEYWORDS="x86 amd64 ppc sparc alpha"
DEPEND="virtual/glibc"
@@ -20,11 +20,12 @@ src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/${PV}-errno.patch
+ epatch ${FILESDIR}/${PV}-head-1.patch
use static && LDFLAGS="${LDFLAGS} -static"
- echo "gcc ${CFLAGS}" > src/conf-cc
- echo "gcc ${LDFLAGS}" > src/conf-ld
+ echo "$(gcc-getCC) ${CFLAGS}" > src/conf-cc
+ echo "$(gcc-getCC) ${LDFLAGS}" > src/conf-ld
echo ${S} > src/home
}
diff --git a/sys-apps/daemontools/files/0.76-head-1.patch b/sys-apps/daemontools/files/0.76-head-1.patch
new file mode 100644
index 000000000000..d9569f322958
--- /dev/null
+++ b/sys-apps/daemontools/files/0.76-head-1.patch
@@ -0,0 +1,21 @@
+diff -U 0 -r src.orig/Makefile src/Makefile
+--- src.orig/Makefile 2003-09-03 00:00:31.900099744 -0400
++++ src/Makefile 2003-09-03 00:01:07.776645680 -0400
+@@ -88 +88 @@
+- | sed s}HOME}"`head -1 home`"}g \
++ | sed s}HOME}"`head -n 1 home`"}g \
+@@ -393 +393 @@
+- | sed s}HOME}"`head -1 home`"}g \
++ | sed s}HOME}"`head -n 1 home`"}g \
+diff -U 0 -r src.orig/print-cc.sh src/print-cc.sh
+--- src.orig/print-cc.sh 2003-09-03 00:00:31.902099440 -0400
++++ src/print-cc.sh 2003-09-03 00:01:07.777645528 -0400
+@@ -1 +1 @@
+-cc="`head -1 conf-cc`"
++cc="`head -n 1 conf-cc`"
+diff -U 0 -r src.orig/print-ld.sh src/print-ld.sh
+--- src.orig/print-ld.sh 2003-09-03 00:00:31.902099440 -0400
++++ src/print-ld.sh 2003-09-03 00:01:07.777645528 -0400
+@@ -1 +1 @@
+-ld="`head -1 conf-ld`"
++ld="`head -n 1 conf-ld`"