--- trunk/net-tools/patches/net-tools-1.60-usr-move.patch	2012/06/26 19:47:26	1818
+++ trunk/net-tools/patches/net-tools-1.60-usr-move.patch	2012/06/26 19:54:22	1819
@@ -1,7 +1,17 @@
 diff -Naur net-tools-1.60/Makefile net-tools-1.60-magellan/Makefile
 --- net-tools-1.60/Makefile	2001-04-15 16:34:31.000000000 +0200
-+++ net-tools-1.60-magellan/Makefile	2012-06-26 22:49:36.984982661 +0200
-@@ -221,39 +221,39 @@
++++ net-tools-1.60-magellan/Makefile	2012-06-26 22:55:47.680982661 +0200
+@@ -72,6 +72,9 @@
+ # set the base of the Installation 
+ # BASEDIR = /mnt
+ 
++# prefix for the Installation
++PREFIX = /usr
++
+ # path to the net-lib support library. Default: lib
+ NET_LIB_PATH = lib
+ NET_LIB_NAME = net-tools
+@@ -221,39 +224,39 @@
  		$(CC) $(LDFLAGS) -o mii-tool mii-tool.o
  
  installbin:
@@ -16,38 +26,38 @@
 -	install -m 0755 rarp       ${BASEDIR}/sbin
 -	install -m 0755 route      ${BASEDIR}/sbin
 -	install -m 0755 slattach   $(BASEDIR)/sbin
-+	install -m 0755 -d ${BASEDIR}/usr/sbin
-+	install -m 0755 -d ${BASEDIR}/usr/bin
-+	install -m 0755 arp        ${BASEDIR}/usr/sbin
-+	install -m 0755 hostname   ${BASEDIR}/usr/bin
-+	install -m 0755 ifconfig   ${BASEDIR}/usr/sbin
-+	install -m 0755 nameif     ${BASEDIR}/usr/sbin
-+	install -m 0755 netstat    ${BASEDIR}/usr/bin
-+	install -m 0755 plipconfig $(BASEDIR)/usr/sbin
-+	install -m 0755 rarp       ${BASEDIR}/usr/sbin
-+	install -m 0755 route      ${BASEDIR}/usr/sbin
-+	install -m 0755 slattach   $(BASEDIR)/usr/sbin
++	install -m 0755 -d ${BASEDIR}/$(PREFIX)/sbin
++	install -m 0755 -d ${BASEDIR}/$(PREFIX)/bin
++	install -m 0755 arp        ${BASEDIR}/$(PREFIX)/sbin
++	install -m 0755 hostname   ${BASEDIR}/$(PREFIX)/bin
++	install -m 0755 ifconfig   ${BASEDIR}/$(PREFIX)/sbin
++	install -m 0755 nameif     ${BASEDIR}/$(PREFIX)/sbin
++	install -m 0755 netstat    ${BASEDIR}/$(PREFIX)/bin
++	install -m 0755 plipconfig $(BASEDIR)/$(PREFIX)/sbin
++	install -m 0755 rarp       ${BASEDIR}/$(PREFIX)/sbin
++	install -m 0755 route      ${BASEDIR}/$(PREFIX)/sbin
++	install -m 0755 slattach   $(BASEDIR)/$(PREFIX)/sbin
  ifeq ($(HAVE_IP_TOOLS),1)
 -	install -m 0755 ipmaddr    $(BASEDIR)/sbin
 -	install -m 0755 iptunnel   $(BASEDIR)/sbin
-+	install -m 0755 ipmaddr    $(BASEDIR)/usr/sbin
-+	install -m 0755 iptunnel   $(BASEDIR)/usr/sbin
++	install -m 0755 ipmaddr    $(BASEDIR)/$(PREFIX)/sbin
++	install -m 0755 iptunnel   $(BASEDIR)/$(PREFIX)/sbin
  endif
  ifeq ($(HAVE_MII),1)
 -	install -m 0755 mii-tool   $(BASEDIR)/sbin
-+	install -m 0755 mii-tool   $(BASEDIR)/usr/sbin
++	install -m 0755 mii-tool   $(BASEDIR)/$(PREFIX)/sbin
  endif
 -	ln -fs hostname $(BASEDIR)/bin/dnsdomainname
 -	ln -fs hostname $(BASEDIR)/bin/ypdomainname
 -	ln -fs hostname $(BASEDIR)/bin/nisdomainname
 -	ln -fs hostname $(BASEDIR)/bin/domainname
-+	ln -fs hostname $(BASEDIR)/usr/bin/dnsdomainname
-+	ln -fs hostname $(BASEDIR)/usr/bin/ypdomainname
-+	ln -fs hostname $(BASEDIR)/usr/bin/nisdomainname
-+	ln -fs hostname $(BASEDIR)/usr/bin/domainname
++	ln -fs hostname $(BASEDIR)/$(PREFIX)/bin/dnsdomainname
++	ln -fs hostname $(BASEDIR)/$(PREFIX)/bin/ypdomainname
++	ln -fs hostname $(BASEDIR)/$(PREFIX)/bin/nisdomainname
++	ln -fs hostname $(BASEDIR)/$(PREFIX)/bin/domainname
  ifeq ($(HAVE_AFDECnet),1)
 -	ln -fs hostname $(BASEDIR)/bin/nodename
-+	ln -fs hostname $(BASEDIR)/usr/bin/nodename
++	ln -fs hostname $(BASEDIR)/$(PREFIX)/bin/nodename
  endif
  
  savebin:
@@ -57,12 +67,40 @@
 -		 ${BASEDIR}/bin/hostname ${BASEDIR}/bin/ypdomainname \
 -                 ${BASEDIR}/bin/dnsdomainname ${BASEDIR}/bin/nisdomainname \
 -		 ${BASEDIR}/bin/domainname ; do \
-+	@for i in ${BASEDIR}/usr/sbin/arp ${BASEDIR}/usr/sbin/ifconfig \
-+                 ${BASEDIR}/usr/bin/netstat \
-+		 ${BASEDIR}/usr/sbin/rarp ${BASEDIR}/usr/sbin/route \
-+		 ${BASEDIR}/usr/bin/hostname ${BASEDIR}/usr/bin/ypdomainname \
-+                 ${BASEDIR}/usr/bin/dnsdomainname ${BASEDIR}/usr/bin/nisdomainname \
-+		 ${BASEDIR}/usr/bin/domainname ; do \
++	@for i in ${BASEDIR}/$(PREFIX)/sbin/arp ${BASEDIR}/$(PREFIX)/sbin/ifconfig \
++                 ${BASEDIR}/$(PREFIX)/bin/netstat \
++		 ${BASEDIR}/$(PREFIX)/sbin/rarp ${BASEDIR}/$(PREFIX)/sbin/route \
++		 ${BASEDIR}/$(PREFIX)/bin/hostname ${BASEDIR}/$(PREFIX)/bin/ypdomainname \
++                 ${BASEDIR}/$(PREFIX)/bin/dnsdomainname ${BASEDIR}/$(PREFIX)/bin/nisdomainname \
++		 ${BASEDIR}/$(PREFIX)/bin/domainname ; do \
  		 [ -f $$i ] && cp -f $$i $$i.old ; done ; echo Saved.
  
  installdata:
+diff -Naur net-tools-1.60/man/Makefile net-tools-1.60-magellan/man/Makefile
+--- net-tools-1.60/man/Makefile	2000-10-28 12:59:42.000000000 +0200
++++ net-tools-1.60-magellan/man/Makefile	2012-06-26 22:57:02.504982661 +0200
+@@ -24,8 +24,10 @@
+ #	your option) any later version.
+ #
+ 
++PREFIX = /usr
++
+ INSTALL=install
+-mandir=/usr/share/man
++mandir=$(PREFIX)/share/man
+ 
+ -include ../config.make
+ ifeq ($(I18N),1)
+diff -Naur net-tools-1.60/po/Makefile net-tools-1.60-magellan/po/Makefile
+--- net-tools-1.60/po/Makefile	1999-11-20 22:02:59.000000000 +0100
++++ net-tools-1.60-magellan/po/Makefile	2012-06-26 22:56:46.992982661 +0200
+@@ -1,7 +1,8 @@
++PREFIX = /usr
+ INSTALL=install -c
+ INSTALL_PROGRAM= ${INSTALL}
+ INSTALL_DATA= ${INSTALL} -m 644
+-INSTALLNLSDIR=${BASEDIR}/usr/share/locale
++INSTALLNLSDIR=${BASEDIR}/$(PREFIX)/share/locale
+ 
+ TUPDATE = tupdate
+