Add patch to delete the $(SYS) variable which isnt used at all #83000 by Mihai Limbasan.

Package-Manager: portage-2.0.51-r15

4 files changed, 44 insertions, 19 deletions

diff --git a/net-nds/portmap/ChangeLog b/net-nds/portmap/ChangeLog
index b500dd03f239..9a280663fcb2 100644
--- a/net-nds/portmap/ChangeLog
+++ b/net-nds/portmap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nds/portmap
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.30 2005/02/07 19:46:40 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.31 2005/02/22 22:35:52 vapier Exp $
+
+  22 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/portmap-5b-no-SYS.patch, portmap-5b-r9.ebuild:
+  Add patch to delete the $(SYS) variable which isnt used at all #83000 by
+  Mihai Limbasan.
 
   07 Feb 2005; Markus Rothe <corsair@gentoo.org> -portmap-5b-r8.ebuild,
   portmap-5b-r9.ebuild:
diff --git a/net-nds/portmap/Manifest b/net-nds/portmap/Manifest
index f39503e62437..f10c47bbf1b5 100644
--- a/net-nds/portmap/Manifest
+++ b/net-nds/portmap/Manifest
@@ -1,13 +1,14 @@
-MD5 08b223a513d6837330449e2d6e3f56b1 ChangeLog 4208
-MD5 af84419d6dca9e72490556aba983f089 portmap-5b-r9.ebuild 1901
-MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r9 64
+MD5 add2963ac6e016110cd159075fe57b57 ChangeLog 4407
+MD5 f4fdf8480456ccccd3cc1b23e9809c9d portmap-5b-r9.ebuild 1998
+MD5 b806d1f955acd4cdb322e74159cc17f5 files/portmap.confd 275
+MD5 887940376974bf01ecf94fd032f224eb files/portmap-5b-include-errno_h.patch 403
+MD5 a42b77e374c390069e747670ef0f76b2 files/portmap.rc6 1132
+MD5 0ec47652f96bfda762a2ffc72a78f002 files/portmap_5beta.dif 8871
 MD5 c4cab1b374730a709460d95211200852 files/portmap-4.0-cleanup.patch 2193
 MD5 7667fe1c5070f9f57c1beb25015bb7be files/portmap-4.0-malloc.patch 9067
 MD5 49ef87c468b07ca837a1282faca5647b files/portmap-4.0-rpc_user.patch 1779
 MD5 d0820fd449ae88e56f2a3e78b96bb9d1 files/portmap-4.0-sigpipe.patch 353
-MD5 887940376974bf01ecf94fd032f224eb files/portmap-5b-include-errno_h.patch 403
-MD5 5bef50780d3ffa439bc12d3e238f2e14 files/portmap-5b-loopback-only.patch 2007
+MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r9 64
 MD5 8b7fc4f54e294754bbd464ec3b6f919b files/portmap-5b-optional-tcpd.patch 1066
-MD5 b806d1f955acd4cdb322e74159cc17f5 files/portmap.confd 275
-MD5 a42b77e374c390069e747670ef0f76b2 files/portmap.rc6 1132
-MD5 0ec47652f96bfda762a2ffc72a78f002 files/portmap_5beta.dif 8871
+MD5 5bef50780d3ffa439bc12d3e238f2e14 files/portmap-5b-loopback-only.patch 2007
+MD5 14b082c837898bb8901a41a43306d0f2 files/portmap-5b-no-SYS.patch 541
diff --git a/net-nds/portmap/files/portmap-5b-no-SYS.patch b/net-nds/portmap/files/portmap-5b-no-SYS.patch
new file mode 100644
index 000000000000..ca8798d21b91
--- /dev/null
+++ b/net-nds/portmap/files/portmap-5b-no-SYS.patch
@@ -0,0 +1,16 @@
+The Makefile doesn't actually use the SYS variable and having it 
+set in your env can cause weird build failures.  Just punt it.
+
+http://bugs.gentoo.org/show_bug.cgi?id=83000
+
+--- portmap/Makefile
++++ portmap/Makefile
+@@ -109,7 +109,7 @@
+ SHELL	= /bin/sh
+ 
+ COPT	= $(CONST) -Dperror=xperror $(CHECK_PORT) \
+-	$(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(SA_LEN) \
++	-DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(SA_LEN) \
+ 	$(LOOPBACK) $(SETPGRP)
+ CFLAGS	= $(COPT) $(O) $(NSARCHS)
+ OBJECTS	= portmap.o pmap_check.o from_local.o $(AUX)
diff --git a/net-nds/portmap/portmap-5b-r9.ebuild b/net-nds/portmap/portmap-5b-r9.ebuild
index 15e77f70182b..c7144b2f59f1 100644
--- a/net-nds/portmap/portmap-5b-r9.ebuild
+++ b/net-nds/portmap/portmap-5b-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-5b-r9.ebuild,v 1.12 2005/02/07 19:46:40 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-5b-r9.ebuild,v 1.13 2005/02/22 22:35:53 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -27,25 +27,28 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}_5beta.dif
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}_5beta.dif
 
 	# Redhat patches
-	epatch ${FILESDIR}/${PN}-4.0-malloc.patch
-	epatch ${FILESDIR}/${PN}-4.0-cleanup.patch
-	epatch ${FILESDIR}/${PN}-4.0-rpc_user.patch
-	epatch ${FILESDIR}/${PN}-4.0-sigpipe.patch
+	epatch "${FILESDIR}"/${PN}-4.0-malloc.patch
+	epatch "${FILESDIR}"/${PN}-4.0-cleanup.patch
+	epatch "${FILESDIR}"/${PN}-4.0-rpc_user.patch
+	epatch "${FILESDIR}"/${PN}-4.0-sigpipe.patch
 
 	# 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
+	epatch "${FILESDIR}"/${P}-include-errno_h.patch
 
 	# Patch to listen on loopback only #65199
-	epatch ${FILESDIR}/${P}-loopback-only.patch
+	epatch "${FILESDIR}"/${P}-loopback-only.patch
 
 	# Make tcp wrapper checks easier
-	epatch ${FILESDIR}/${P}-optional-tcpd.patch
+	epatch "${FILESDIR}"/${P}-optional-tcpd.patch
+
+	# Remove useless make variable #83000
+	epatch "${FILESDIR}"/${P}-no-SYS.patch
 }
 
 src_compile() {