fix build problem on latest glibc

4 files changed, 83 insertions, 2 deletions

diff --git a/net-nds/portmap/ChangeLog b/net-nds/portmap/ChangeLog
index 0dc36b817b58..1501ee965cc0 100644
--- a/net-nds/portmap/ChangeLog
+++ b/net-nds/portmap/ChangeLog
@@ -1,8 +1,15 @@
 # ChangeLog for net-nds/portmap
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.3 2002/12/13 11:00:17 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.4 2002/12/31 20:27:47 azarah Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+*portmap-5b-r7 (31 Dec 2002)
+
+  31 Dec 2002; Martin Schlemmer <azarah@gentoo.org> portmap-5b-r7.ebuild :
+  Should include errno.h, and not define as external.  Fix
+  relocation error and build problem with glibc-2.3.2 cvs ...
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+  Changed sparc ~sparc keywords.
  
 *portmap-5b-r6 (1 Feb 2002)
 
diff --git a/net-nds/portmap/files/digest-portmap-5b-r7 b/net-nds/portmap/files/digest-portmap-5b-r7
new file mode 100644
index 000000000000..61f9e105bbe8
--- /dev/null
+++ b/net-nds/portmap/files/digest-portmap-5b-r7
@@ -0,0 +1 @@
+MD5 781e16ed4487c4caa082c6fef09ead4f portmap_5beta.tar.gz 18702
diff --git a/net-nds/portmap/files/portmap-5b-include-errno_h.patch b/net-nds/portmap/files/portmap-5b-include-errno_h.patch
new file mode 100644
index 000000000000..a440e6158809
--- /dev/null
+++ b/net-nds/portmap/files/portmap-5b-include-errno_h.patch
@@ -0,0 +1,18 @@
+--- portmap_5beta/portmap.c.orig	2002-12-31 22:13:17.000000000 +0200
++++ portmap_5beta/portmap.c	2002-12-31 22:13:50.000000000 +0200
+@@ -97,6 +97,7 @@
+ 
+ extern char *strerror();
+ #include <stdlib.h>
++#include <errno.h>
+ 
+ #ifndef LOG_PERROR
+ #define LOG_PERROR 0
+@@ -124,7 +125,6 @@
+ static void callit();
+ struct pmaplist *pmaplist;
+ int debugging = 0;
+-extern int errno;
+ 
+ #include "pmap_check.h"
+ 
diff --git a/net-nds/portmap/portmap-5b-r7.ebuild b/net-nds/portmap/portmap-5b-r7.ebuild
new file mode 100644
index 000000000000..35245eb2ac35
--- /dev/null
+++ b/net-nds/portmap/portmap-5b-r7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-5b-r7.ebuild,v 1.1 2002/12/31 20:27:47 azarah Exp $
+
+IUSE=""
+
+inherit eutils
+
+MY_P="${PN}_${PV}eta"
+A0=portmap_5beta.dif
+S=$WORKDIR/${MY_P}
+DESCRIPTION="Netkit - portmapper"
+SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
+HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
+
+DEPEND="virtual/glibc
+		sys-apps/tcp-wrappers"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+src_unpack() {
+	unpack ${A}
+	
+	cd ${S}
+	epatch ${FILESDIR}/${PN}_5beta.dif
+
+	# Should include errno.h, and not define as external.  Fix
+	# relocation error and build problem with glibc-2.3.2 cvs ...
+	# <azarah@gentoo.org> (31 Dec 2002).
+	epatch ${FILESDIR}/${P}-include-errno_h.patch
+	
+	# Get portmap to use our CFLAGS ...
+	mv Makefile Makefile.orig
+	sed -e "s/-O2/${CFLAGS}/" Makefile.orig > Makefile || die
+}
+
+src_compile() {
+	make || die
+}
+
+src_install() {
+	into / ; dosbin portmap
+	into /usr ; dosbin pmap_dump pmap_set
+	doman portmap.8 pmap_dump.8 pmap_set.8
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/portmap.rc6 portmap
+
+	# Is this really the sort of thing we wanna be doing? :)
+	# ln -s ../../init.d/portmap ${D}/etc/runlevels/default/portmap
+
+	dodoc BLURB CHANGES README
+}