head -1 patch

6 files changed, 88 insertions, 18 deletions

diff --git a/net-mail/checkpassword/ChangeLog b/net-mail/checkpassword/ChangeLog
index fcf8b9722903..561c9022e3cc 100644
--- a/net-mail/checkpassword/ChangeLog
+++ b/net-mail/checkpassword/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-mail/checkpassword
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/checkpassword/ChangeLog,v 1.8 2003/05/14 04:39:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/checkpassword/ChangeLog,v 1.9 2003/09/03 16:09:22 vapier Exp $
 
 *checkpassword-0.90-r1 (05 Mar 2003)
 
+  03 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add head -1 patch.
+
   13 May 2003; Robin Johnson <robbat2@gentoo.org> checkpassword-0.90-r1.ebuild:
   Fixed DESCRIPTION and HOMEPAGE, added more docs to install list.
   Fix gcc/$CC bug, make sure CFLAGS are used as well.
diff --git a/net-mail/checkpassword/checkpassword-0.90-r1.ebuild b/net-mail/checkpassword/checkpassword-0.90-r1.ebuild
index 55b69c18e83a..a59dbbe95bd0 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r1.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r1.ebuild
@@ -1,34 +1,36 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/checkpassword/checkpassword-0.90-r1.ebuild,v 1.4 2003/05/14 04:39:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/checkpassword/checkpassword-0.90-r1.ebuild,v 1.5 2003/09/03 16:09:22 vapier Exp $
 
-inherit eutils
+inherit eutils gcc
 
 DESCRIPTION="A uniform password checking interface for root applications"
-SRC_URI="http://cr.yp.to/checkpwd/${P}.tar.gz"
 HOMEPAGE="http://cr.yp.to/checkpwd.html"
+SRC_URI="http://cr.yp.to/checkpwd/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha ~mips ~hppa ~arm"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-errno.patch
-}
+	epatch ${FILESDIR}/${PV}-head-1.patch
 
-src_compile() {
 	# the -s is from the original build
 	LDFLAGS="${LDFLAGS} -s"
 	use pic && CFLAGS="${CFLAGS} -fPIC" 
 	use static && LDFLAGS="${LDFLAGS} -static"
-	echo "${CC} ${CFLAGS}" > conf-cc
-	echo "${CC} ${LDFLAGS}" > conf-ld
+	echo "$(gcc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(gcc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+src_compile() {
 	make || die "Error in make"
 }
 
-src_install() {				 
+src_install() {
 	into /
 	dobin checkpassword
 	dodoc CHANGES README TODO VERSION FILES SYSDEPS TARGETS
diff --git a/net-mail/checkpassword/files/0.90-head-1.patch b/net-mail/checkpassword/files/0.90-head-1.patch
new file mode 100644
index 000000000000..08e54297de4e
--- /dev/null
+++ b/net-mail/checkpassword/files/0.90-head-1.patch
@@ -0,0 +1,39 @@
+diff -ur checkpassword-0.90.orig/Makefile checkpassword-0.90/Makefile
+--- checkpassword-0.90.orig/Makefile	2003-09-03 12:06:23.225291952 -0400
++++ checkpassword-0.90/Makefile	2003-09-03 12:06:29.578326144 -0400
+@@ -22,7 +22,7 @@
+ 
+ auto_home.c: \
+ auto-str conf-home
+-	./auto-str auto_home `head -1 conf-home` > auto_home.c
++	./auto-str auto_home `head -n 1 conf-home` > auto_home.c
+ 
+ auto_home.o: \
+ compile auto_home.c
+@@ -91,7 +91,7 @@
+ choose: \
+ warn-auto.sh choose.sh conf-home
+ 	cat warn-auto.sh choose.sh \
+-	| sed s}HOME}"`head -1 conf-home`"}g \
++	| sed s}HOME}"`head -n 1 conf-home`"}g \
+ 	> choose
+ 	chmod 755 choose
+ 
+@@ -166,7 +166,7 @@
+ warn-auto.sh conf-ld
+ 	( cat warn-auto.sh; \
+ 	echo 'main="$$1"; shift'; \
+-	echo exec "`head -1 conf-ld`" \
++	echo exec "`head -n 1 conf-ld`" \
+ 	'-o "$$main" "$$main".o $${1+"$$@"}' \
+ 	) > load
+ 	chmod 755 load
+diff -ur checkpassword-0.90.orig/print-cc.sh checkpassword-0.90/print-cc.sh
+--- checkpassword-0.90.orig/print-cc.sh	2003-09-03 12:06:23.227291648 -0400
++++ checkpassword-0.90/print-cc.sh	2003-09-03 12:06:34.308607032 -0400
+@@ -1,4 +1,4 @@
+-cc="`head -1 conf-cc`"
++cc="`head -n 1 conf-cc`"
+ systype="`cat systype`"
+ 
+ cat warn-auto.sh
diff --git a/net-mail/dot-forward/ChangeLog b/net-mail/dot-forward/ChangeLog
index b155563f18a1..28c100f8a640 100644
--- a/net-mail/dot-forward/ChangeLog
+++ b/net-mail/dot-forward/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-mail/dot-forward
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dot-forward/ChangeLog,v 1.6 2003/03/16 23:13:16 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dot-forward/ChangeLog,v 1.7 2003/09/03 16:05:32 vapier Exp $
 
 *dot-forward-0.71-r1 (05 Mar 2003)
 
+  03 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add head -1 patch.
+
   16 Mar 2003; Will Woods <wwoods@gentoo.org> dot-forward-0.71-r1.ebuild:
   Added alpha to KEYWORDS
 
diff --git a/net-mail/dot-forward/dot-forward-0.71-r1.ebuild b/net-mail/dot-forward/dot-forward-0.71-r1.ebuild
index b8c20dd941f0..6d167bcc68c9 100644
--- a/net-mail/dot-forward/dot-forward-0.71-r1.ebuild
+++ b/net-mail/dot-forward/dot-forward-0.71-r1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dot-forward/dot-forward-0.71-r1.ebuild,v 1.2 2003/03/16 23:13:16 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dot-forward/dot-forward-0.71-r1.ebuild,v 1.3 2003/09/03 16:05:32 vapier Exp $
 
-inherit eutils
+inherit eutils gcc
 
 DESCRIPTION="reads sendmail's .forward files under qmail"
 HOMEPAGE="http://cr.yp.to/dot-forward.html"
 SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
 
 DEPEND="virtual/glibc
@@ -19,20 +19,21 @@ src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-errno.patch
+	epatch ${FILESDIR}/${PV}-head-1.patch
 
-	echo "gcc ${CFLAGS}" > conf-cc
-	echo "gcc" > conf-ld
+	echo "$(gcc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(gcc-getCC)" > conf-ld
 }
 
 src_compile() {
 	emake it || die
 }
 
-src_install() {				 
+src_install() {
 	dodoc BLURB CHANGES FILES INSTALL README SYSDEPS TARGETS THANKS
 	dodoc TODO VERSION
 	doman *.1
- 
+
 	insopts -o root -g qmail -m 755
 	insinto /var/qmail/bin
 	doins dot-forward
diff --git a/net-mail/dot-forward/files/0.71-head-1.patch b/net-mail/dot-forward/files/0.71-head-1.patch
new file mode 100644
index 000000000000..8becc0297263
--- /dev/null
+++ b/net-mail/dot-forward/files/0.71-head-1.patch
@@ -0,0 +1,22 @@
+--- Makefile.orig	2003-09-03 12:02:43.275729368 -0400
++++ Makefile	2003-09-03 12:02:52.751288864 -0400
+@@ -19,8 +19,8 @@
+ auto-ccld.sh: \
+ conf-cc conf-ld warn-auto.sh
+ 	( cat warn-auto.sh; \
+-	echo CC=\'`head -1 conf-cc`\'; \
+-	echo LD=\'`head -1 conf-ld`\' \
++	echo CC=\'`head -n 1 conf-cc`\'; \
++	echo LD=\'`head -n 1 conf-ld`\' \
+ 	) > auto-ccld.sh
+ 
+ auto-str: \
+@@ -33,7 +33,7 @@
+ 
+ auto_qmail.c: \
+ auto-str conf-qmail
+-	./auto-str auto_qmail `head -1 conf-qmail` > auto_qmail.c
++	./auto-str auto_qmail `head -n 1 conf-qmail` > auto_qmail.c
+ 
+ auto_qmail.o: \
+ compile auto_qmail.c