Link against -lgdbm_compat now that it has been broken out. Thanks to Ryan Finnie <gentoo-bugzilla@arrrrrr.com> in bug 91275 for the patch.

Package-Manager: portage-2.0.51.21

4 files changed, 60 insertions, 41 deletions

diff --git a/www-servers/ncsa-httpd/ChangeLog b/www-servers/ncsa-httpd/ChangeLog
index 282eec454c3f..c2833d54a953 100644
--- a/www-servers/ncsa-httpd/ChangeLog
+++ b/www-servers/ncsa-httpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/ncsa-httpd
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/ncsa-httpd/ChangeLog,v 1.2 2004/09/05 09:43:04 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ncsa-httpd/ChangeLog,v 1.3 2005/05/04 12:31:53 ka0ttic Exp $
+
+  04 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/ncsa-httpd-1.5.2a-gdbm_compat.patch, ncsa-httpd-1.5.2a.ebuild:
+  Link against -lgdbm_compat now that it has been broken out. Thanks to Ryan
+  Finnie <gentoo-bugzilla@arrrrrr.com> in bug 91275 for the patch.
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> ncsa-httpd-1.5.2a.ebuild:
   Fixed ChangeLog header. Added missing IUSE.
diff --git a/www-servers/ncsa-httpd/Manifest b/www-servers/ncsa-httpd/Manifest
index 925be2ceac67..6e91a845c4b6 100644
--- a/www-servers/ncsa-httpd/Manifest
+++ b/www-servers/ncsa-httpd/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 697e30fcc7e862d3c2bb5cdbbbc4308b ChangeLog 902
+MD5 a634ed6348da6046eee8ef40ad06bb5d ChangeLog 1167
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
-MD5 9c25be6301ed3cbaeef1f8f22efe2053 ncsa-httpd-1.5.2a.ebuild 2090
+MD5 34fd2fe874e45d76499162f3fcbbe547 ncsa-httpd-1.5.2a.ebuild 1978
 MD5 3c8fa7efedafecfd7c5c7a2bbdf2b988 files/ncsa-httpd-1.5.2a.patch 8410
 MD5 9f7c216b1e80dd1aa1521ae2a56df73a files/digest-ncsa-httpd-1.5.2a 77
+MD5 a97bbfa88d054b6786e3eb396d1669d8 files/ncsa-httpd-1.5.2a-gdbm_compat.patch 1066
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCE1e8EZCkKN40op4RAq3gAKCmzAauQFoEAoh5H3ri4dOapNofFACfYrZU
-JViJ9AdT+3krLE4rqkALgqg=
-=jJL8
+iD8DBQFCeMECEZCkKN40op4RAiWGAKClLz4Gmu3BrOPINoI1RLv/+bRzYgCdERcW
+h8WGLSQdlGNwgqQr3Xi7hTE=
+=MG7D
 -----END PGP SIGNATURE-----
diff --git a/www-servers/ncsa-httpd/files/ncsa-httpd-1.5.2a-gdbm_compat.patch b/www-servers/ncsa-httpd/files/ncsa-httpd-1.5.2a-gdbm_compat.patch
new file mode 100644
index 000000000000..ab4d251c39f9
--- /dev/null
+++ b/www-servers/ncsa-httpd/files/ncsa-httpd-1.5.2a-gdbm_compat.patch
@@ -0,0 +1,24 @@
+diff --exclude='*~' -urN httpd_1.5.2a-export.orig/src/Makefile httpd_1.5.2a-export/src/Makefile
+--- httpd_1.5.2a-export.orig/src/Makefile	2005-05-03 23:16:50.000000000 -0400
++++ httpd_1.5.2a-export/src/Makefile	2005-05-03 23:17:26.000000000 -0400
+@@ -71,7 +71,7 @@
+ # Place here any extra libraries you may need to link to. You
+ # shouldn't have to.
+ 
+-EXTRA_LIBS=-lcrypt
++EXTRA_LIBS=-lcrypt -lgdbm_compat
+ 
+ # Place here any flags you may need upon linking, such as a flag to
+ # prevent dynamic linking (if desired)
+diff --exclude='*~' -urN httpd_1.5.2a-export.orig/support/Makefile httpd_1.5.2a-export/support/Makefile
+--- httpd_1.5.2a-export.orig/support/Makefile	2005-05-03 23:16:50.000000000 -0400
++++ httpd_1.5.2a-export/support/Makefile	2005-05-03 23:17:26.000000000 -0400
+@@ -49,7 +49,7 @@
+ 	make all CC=gcc CFLAGS="-DHPUX" EXTRA_LIBS=-lndbm
+ 
+ linux:
+-	make all CC=gcc CFLAGS="-DLINUX" EXTRA_LIBS="-lgdbm -lcrypt"
++	make all CC=gcc CFLAGS="-DLINUX" EXTRA_LIBS="-lgdbm -lgdbm_compat -lcrypt"
+ 
+ netbsd: 
+ 	make all CC=cc CFLAGS="-DNETBSD" EXTRA_LIBS=-lcrypt
diff --git a/www-servers/ncsa-httpd/ncsa-httpd-1.5.2a.ebuild b/www-servers/ncsa-httpd/ncsa-httpd-1.5.2a.ebuild
index 9d8e52d91308..87e4ad01dbe5 100644
--- a/www-servers/ncsa-httpd/ncsa-httpd-1.5.2a.ebuild
+++ b/www-servers/ncsa-httpd/ncsa-httpd-1.5.2a.ebuild
@@ -1,36 +1,39 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/ncsa-httpd/ncsa-httpd-1.5.2a.ebuild,v 1.2 2004/09/05 09:43:04 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ncsa-httpd/ncsa-httpd-1.5.2a.ebuild,v 1.3 2005/05/04 12:31:53 ka0ttic Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
-# httpd_1.5.2a-export
-MY_P=httpd_${PV}-export
-S=${WORKDIR}/${MY_P}
+MY_P="httpd_${PV}-export"
+S="${WORKDIR}/${MY_P}"
 DESCRIPTION="NCSA HTTPd, a classic web server"
 HOMEPAGE="http://hoohoo.ncsa.uiuc.edu"
-KEYWORDS="~x86"
 SRC_URI="ftp://ftp.ncsa.uiuc.edu/Web/httpd/Unix/ncsa_httpd/current/${MY_P}_source.tar.Z"
-DEPEND=""
+
 LICENSE="ncsa-1.3"
 SLOT="1"
+KEYWORDS="~x86"
 IUSE=""
 
+DEPEND=">=sys-libs/gdbm-1.8.3"
+
 src_unpack() {
 	unpack ${A}
+	cd ${S}
 	epatch ${FILESDIR}/${P}.patch
+	epatch ${FILESDIR}/${P}-gdbm_compat.patch
 }
 
 src_compile() {
 	chown -R root:root *
-	make linux || die
+	make CFLAGS="${CFLAGS}" linux || die "make linux failed"
 	cd support/auth
-	gcc -o uudecode uudecode.c
-	gcc -o uuencode uuencode.c
+	$(tc-getCC) -Wall ${CFLAGS} uuencode.c -o uuencode || \
+		die "failed to build uuencode"
 }
 
 src_install() {
-	INSDIR=/usr/local/etc/httpd/
+	local INSDIR=/usr/local/etc/httpd
 	exeinto $INSDIR
 	doexe httpd
 
@@ -48,31 +51,17 @@ src_install() {
 	cp -rf conf ${D}/usr/local/etc/httpd/
 	cp -rf icons ${D}/usr/local/etc/httpd/
 
-	cd src
-	cp httpd.man httpd.1
-	cd ..
-
+	cd support
 	exeinto $INSDIR/support
-	doexe support/dbm2std
-	doexe support/dbmdigest
-	doexe support/dbmgroup
-	doexe support/dbmpasswd
-	doexe support/htdigest
-	doexe support/htpasswd
-	doexe support/inc2shtml
-	doexe support/std2dbm
-	doexe support/unescape
-	doexe support/webgrab
+	doexe dbm{2std,digest,group,passwd} ht{digest,passwd} inc2shtml std2dbm \
+		unescape webgrab
 
+	cd auth
 	exeinto $INSDIR/support/auth
-	doexe support/auth/pgp-dec
-	doexe support/auth/pgp-enc
-	doexe support/auth/ripem-dec
-	doexe support/auth/ripem-enc
-	doexe support/auth/uudecode
-	doexe support/auth/uuencode
+	doexe pgp-{dec,enc} ripem-{dec,enc} uu{de,en}code
 
-	doman src/httpd.1
+	cd ${S}
+	newman src/httpd.man src/httpd.1
 	mv support/README README-SUPPORT
 	dodoc COPYRIGHT BUGS CHANGES CREDITS README README-SUPPORT \
 		support/README.change-passwd