From 4711195f553f5583af7d3c28523c9269ad72bbf0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 16 Oct 2004 17:19:20 +0000 Subject: /proc moves around #67642 --- net-misc/ipx-utils/ChangeLog | 10 ++++- net-misc/ipx-utils/files/digest-ipx-utils-1.1 | 1 - net-misc/ipx-utils/files/digest-ipx-utils-1.1-r1 | 1 + net-misc/ipx-utils/files/ipx-utils-1.1-gentoo.diff | 24 ----------- .../ipx-utils/files/ipx-utils-1.1-makefile.patch | 24 +++++++++++ net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch | 13 ++++++ net-misc/ipx-utils/ipx-utils-1.1-r1.ebuild | 37 +++++++++++++++++ net-misc/ipx-utils/ipx-utils-1.1.ebuild | 47 ---------------------- 8 files changed, 84 insertions(+), 73 deletions(-) delete mode 100644 net-misc/ipx-utils/files/digest-ipx-utils-1.1 create mode 100644 net-misc/ipx-utils/files/digest-ipx-utils-1.1-r1 delete mode 100644 net-misc/ipx-utils/files/ipx-utils-1.1-gentoo.diff create mode 100644 net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch create mode 100644 net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch create mode 100644 net-misc/ipx-utils/ipx-utils-1.1-r1.ebuild delete mode 100644 net-misc/ipx-utils/ipx-utils-1.1.ebuild (limited to 'net-misc/ipx-utils') 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 + -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 ipx-utils-1.1.ebuild: hooray for epatch! diff --git a/net-misc/ipx-utils/files/digest-ipx-utils-1.1 b/net-misc/ipx-utils/files/digest-ipx-utils-1.1 deleted file mode 100644 index dda49eb20af9..000000000000 --- a/net-misc/ipx-utils/files/digest-ipx-utils-1.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 300bdb7e4c8ed31d510c4781c0ae3969 ipx-1.1.tar.gz 8177 diff --git a/net-misc/ipx-utils/files/digest-ipx-utils-1.1-r1 b/net-misc/ipx-utils/files/digest-ipx-utils-1.1-r1 new file mode 100644 index 000000000000..dda49eb20af9 --- /dev/null +++ b/net-misc/ipx-utils/files/digest-ipx-utils-1.1-r1 @@ -0,0 +1 @@ +MD5 300bdb7e4c8ed31d510c4781c0ae3969 ipx-1.1.tar.gz 8177 diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-gentoo.diff b/net-misc/ipx-utils/files/ipx-utils-1.1-gentoo.diff deleted file mode 100644 index 0d7b4a53d000..000000000000 --- a/net-misc/ipx-utils/files/ipx-utils-1.1-gentoo.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.orig Fri Jul 19 21:31:42 2002 -+++ Makefile Fri Jul 19 21:33:05 2002 -@@ -10,17 +10,9 @@ - install: $(UTILS) - for i in $(UTILS); \ - do \ -- install --strip $$i /sbin; \ -- install $$i.8 /usr/man/man8; \ -+ install --strip $$i ${DESTDIR}/sbin; \ -+ install $$i.8 ${DESTDIR}/usr/share/man/man8; \ - done -- install init.ipx /etc/rc.d/init.d/ipx -- install -m 0644 config.ipx /etc/sysconfig/ipx -- rm -f /etc/rc.d/rc2.d/S15ipx -- ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc2.d/S15ipx -- rm -f /etc/rc.d/rc3.d/S15ipx -- ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc3.d/S15ipx -- rm -f /etc/rc.d/rc5.d/S15ipx -- ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc5.d/S15ipx -- rm -f /etc/rc.d/rc6.d/K55ipx -- ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc6.d/K55ipx -+# install init.ipx /etc/rc.d/init.d/ipx -+# install -m 0644 config.ipx /etc/sysconfig/ipx - diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch b/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch new file mode 100644 index 000000000000..e609823134cc --- /dev/null +++ b/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch @@ -0,0 +1,24 @@ +--- Makefile.orig Fri Jul 19 21:31:42 2002 ++++ Makefile Fri Jul 19 21:33:05 2002 +@@ -10,17 +10,9 @@ + install: $(UTILS) + for i in $(UTILS); \ + do \ +- install --strip $$i /sbin; \ +- install $$i.8 /usr/man/man8; \ ++ install $$i ${DESTDIR}/sbin; \ ++ install $$i.8 ${DESTDIR}/usr/share/man/man8; \ + done +- install init.ipx /etc/rc.d/init.d/ipx +- install -m 0644 config.ipx /etc/sysconfig/ipx +- rm -f /etc/rc.d/rc2.d/S15ipx +- ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc2.d/S15ipx +- rm -f /etc/rc.d/rc3.d/S15ipx +- ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc3.d/S15ipx +- rm -f /etc/rc.d/rc5.d/S15ipx +- ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc5.d/S15ipx +- rm -f /etc/rc.d/rc6.d/K55ipx +- ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc6.d/K55ipx ++# install init.ipx /etc/rc.d/init.d/ipx ++# install -m 0644 config.ipx /etc/sysconfig/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-r1.ebuild b/net-misc/ipx-utils/ipx-utils-1.1-r1.ebuild new file mode 100644 index 000000000000..9d73da3710f3 --- /dev/null +++ b/net-misc/ipx-utils/ipx-utils-1.1-r1.ebuild @@ -0,0 +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-r1.ebuild,v 1.1 2004/10/16 17:19:20 vapier Exp $ + +inherit eutils + +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="ppc64 s390 sparc x86" +IUSE="" + +DEPEND="virtual/libc" + +S=${WORKDIR}/${P/-utils} + +src_unpack() { + unpack ${A} + + cd ${S} + 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 + + dodoc README +} diff --git a/net-misc/ipx-utils/ipx-utils-1.1.ebuild b/net-misc/ipx-utils/ipx-utils-1.1.ebuild deleted file mode 100644 index 1943308c3373..000000000000 --- a/net-misc/ipx-utils/ipx-utils-1.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# 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 $ - -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" - -DEPEND="virtual/libc" - -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 -} - -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 - - dodoc COPYING README -} - -- cgit v1.2.3-65-gdbad