/proc moves around #67642

6 files changed, 43 insertions, 31 deletions

diff --git a/net-misc/ipx-utils/ChangeLog b/net-misc/ipx-utils/ChangeLog
index ea9ea14a2bdb..ced588f3b49e 100644
--- a/net-misc/ipx-utils/ChangeLog
+++ b/net-misc/ipx-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/ipx-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ChangeLog,v 1.9 2004/10/01 23:16:23 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ChangeLog,v 1.10 2004/10/16 17:19:20 vapier Exp $
+
+*ipx-utils-1.1-r1 (16 Oct 2004)
+
+  16 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  -files/ipx-utils-1.1-gentoo.diff, +files/ipx-utils-1.1-makefile.patch,
+  +files/ipx-utils-1.1-proc.patch, +ipx-utils-1.1-r1.ebuild,
+  -ipx-utils-1.1.ebuild:
+  Clean up and fix /proc updates #67642 by Josef Kovacs.
 
   02 Oct 2004; Markus Nigbur <pyrania@gentoo.org> ipx-utils-1.1.ebuild:
   hooray for epatch!
diff --git a/net-misc/ipx-utils/Manifest b/net-misc/ipx-utils/Manifest
index 7de9a7366f71..a3eaa4961a2f 100644
--- a/net-misc/ipx-utils/Manifest
+++ b/net-misc/ipx-utils/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f242669fc717a16637600fcfc6b14dc4 ipx-utils-1.1.ebuild 1027
-MD5 2814ab237f8592b585490971998ff081 ChangeLog 763
+MD5 8fbb605a58dfad19a38d665625e660a2 ChangeLog 1063
+MD5 7e747ba041c2472830a02b75d798b4fc ipx-utils-1.1-r1.ebuild 924
+MD5 621ddf456883c9bb8ff0f2a516c47c0d files/ipx-utils-1.1-makefile.patch 822
+MD5 92018f349d5f554db2cbe96cb53bee87 files/ipx-utils-1.1-proc.patch 430
 MD5 09ac2581b478d6ca4fb33002ecd34a2a files/ipx.confd 663
-MD5 78845a00cf7ab6edd46bd2e705fd55ea files/digest-ipx-utils-1.1 57
-MD5 639484e03a0f107b4dbdfedea00ca006 files/ipx-utils-1.1-gentoo.diff 830
 MD5 12d5c69423f199bf025dfc6be9233d7a files/ipx.init 950
+MD5 78845a00cf7ab6edd46bd2e705fd55ea files/digest-ipx-utils-1.1-r1 57
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBXeVZI7fK2cqeyXkRAuJnAJ9pdDD22zXSUwwWPLwH4u8Cj69ibwCgxdVR
-8NrUd8jgf3ORiq6V1D+QpOY=
-=MG9V
+iD8DBQFBcVgkHTu7gpaalycRAm7sAKCF/XOPGHgJm892XgrfytkODPnN1QCbBabe
+WlmUA2dAt2sp/o0rmSkpDLo=
+=DMD+
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ipx-utils/files/digest-ipx-utils-1.1 b/net-misc/ipx-utils/files/digest-ipx-utils-1.1-r1
index dda49eb20af9..dda49eb20af9 100644
--- a/net-misc/ipx-utils/files/digest-ipx-utils-1.1
+++ b/net-misc/ipx-utils/files/digest-ipx-utils-1.1-r1
diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-gentoo.diff b/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch
index 0d7b4a53d000..e609823134cc 100644
--- a/net-misc/ipx-utils/files/ipx-utils-1.1-gentoo.diff
+++ b/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch
@@ -6,7 +6,7 @@
  	do \
 -		install --strip $$i /sbin; \
 -		install $$i.8 /usr/man/man8; \
-+		install --strip $$i ${DESTDIR}/sbin; \
++		install $$i ${DESTDIR}/sbin; \
 +		install $$i.8 ${DESTDIR}/usr/share/man/man8; \
  	done
 -	install init.ipx /etc/rc.d/init.d/ipx
diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch b/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch
new file mode 100644
index 000000000000..4c9a5986cf00
--- /dev/null
+++ b/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch
@@ -0,0 +1,13 @@
+--- ipx-1.1/ipx_interface.c.orig	2004-10-16 13:14:40.677964152 -0400
++++ ipx-1.1/ipx_interface.c	2004-10-16 13:15:18.464219768 -0400
+@@ -191,7 +191,9 @@
+ 		exit(-1);
+ 	}
+ 
+-	fp = fopen("/proc/net/ipx_interface", "r");
++	fp = fopen("/proc/net/ipx/ipx_interface", "r");
++	if (fp == NULL)
++		fp = fopen("/proc/net/ipx_interface", "r");
+ 	if (fp == NULL) {
+ 		fprintf(stderr, 
+ 			"%s: Unable to open \"/proc/net/ipx_interface.\"\n",
diff --git a/net-misc/ipx-utils/ipx-utils-1.1.ebuild b/net-misc/ipx-utils/ipx-utils-1.1-r1.ebuild
index 1943308c3373..9d73da3710f3 100644
--- a/net-misc/ipx-utils/ipx-utils-1.1.ebuild
+++ b/net-misc/ipx-utils/ipx-utils-1.1-r1.ebuild
@@ -1,47 +1,37 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ipx-utils-1.1.ebuild,v 1.11 2004/10/01 23:16:23 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ipx-utils-1.1-r1.ebuild,v 1.1 2004/10/16 17:19:20 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P/-utils}
-IUSE=""
 DESCRIPTION="The IPX Utilities"
 HOMEPAGE="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/"
 SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/${P/-utils}.tar.gz"
 
 LICENSE="Caldera"
 SLOT="0"
-KEYWORDS="x86 sparc s390 ppc64"
+KEYWORDS="ppc64 s390 sparc x86"
+IUSE=""
 
 DEPEND="virtual/libc"
 
+S=${WORKDIR}/${P/-utils}
+
 src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	# Fix CFLAGS
-	cp Makefile Makefile.orig
-	sed -e "s:-O2 -Wall:${CFLAGS}:" \
-		Makefile.orig > Makefile
-
-	# Fix install locations
-	epatch ${FILESDIR}/${P}-gentoo.diff || die "epatch failed."
-}
-
-src_compile() {
-	emake || die
+	sed -i "s:-O2 -Wall:${CFLAGS}:" Makefile
+	epatch ${FILESDIR}/${P}-makefile.patch
+	epatch ${FILESDIR}/${P}-proc.patch #67642
 }
 
 src_install() {
 	dodir /sbin /usr/share/man/man8
 	make DESTDIR=${D} install || die
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/ipx.confd ipx
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/ipx.init ipx
+	insinto /etc/conf.d ; newins ${FILESDIR}/ipx.confd ipx
+	exeinto /etc/init.d ; newexe ${FILESDIR}/ipx.init ipx
 
-	dodoc COPYING README
+	dodoc README
 }
-