[patch] nistnet-2.4.1-gentoo.diff

nistnet-2.4.1-gentoo.diff (text/plain), 3.80 KB, created by Michael Zanetta on 2005-04-13 17:03:07 UTC

--- nistnet/lib/Makefile        2004-09-13 11:55:17.000000000 +0100
+++ nistnet/lib/Makefile.new    2004-09-13 11:55:34.000000000 +0100
@@ -21,7 +21,7 @@
 all: $(LIB_TARGET)

 install: all
-	install -m 444 $(LIB_TARGET) /usr/local/lib
+	install -D -m 444 $(LIB_TARGET) ${DESTDIR}usr/lib

 $(LIB_TARGET):	nistnetlib.o nistnetutil.o tabledist.o random.o alarmingdns.o
 	ar vr $@ $?

--- nistnet/cli/Makefile        2004-08-22 15:46:02.000000000 +0100
+++ nistnet/cli/Makefile.new    2004-09-13 12:47:11.000000000 +0100
@@ -29,8 +29,8 @@
	-rm -f *.o $(ALL_TARGETS)

 install: all
-	-mkdir /usr/local/bin
-	install -o root cnistnet /usr/local/bin
+	-mkdir ${DESTDIR}/usr/bin
+	install -o root cnistnet ${DESTDIR}/usr/bin

 ship: all
 	# Ship target not relevant for released Makefile

--- nistnet/kernel/Makefile	2004-08-23 00:02:35.000000000 +0100
+++ nistnet/kernel/Makefile.new	2004-09-20 13:13:05.000000000 +0100
@@ -40,12 +40,13 @@
 # relocations required by build roots.  This is not defined in the
 # makefile but the argument can be passed to make if needed.
 
-MODLIB=/lib/modules/`uname -r`/misc
+MODLIB=${DESTDIR}lib/modules/`uname -r`/misc
 
 install: all
-	-mkdir $(MODLIB)
+	-mkdir -p $(MODLIB)
+	-mkdir /${DESTDIR}dev
 	install -o root nistnet.o $(MODLIB) 
-	-/sbin/depmod -a > /dev/null 2>&1
+	-/sbin/depmod -a -b ${DESTDIR}lib/modules/'uname -r' > /dev/null 2>&1
 # -q flag doesn't work with older versions
 # Ignore errors; can get with leftover irrelevant modules
 

--- nistnet/man/Makefile	2004-08-23 00:03:06.000000000 +0100
+++ nistnet/man/Makefile.new	2004-09-13 16:32:01.000000000 +0100
@@ -29,12 +29,12 @@
 all: 
 
 install: 
-	-mkdir /usr/local/man
-	-mkdir /usr/local/man/man1
-	install -m 444 $(MAN1) /usr/local/man/man1
-	-mkdir /usr/local/man/man3
-	install -m 444 $(MAN3) /usr/local/man/man3
-	-mkdir /usr/local/man/man4
-	install -m 444 $(MAN4) /usr/local/man/man4
+	-mkdir ${DESTDIR}/usr/man
+	-mkdir ${DESTDIR}/usr/man/man1
+	install -m 444 $(MAN1) ${DESTDIR}/usr/man/man1
+	-mkdir ${DESTDIR}/usr/man/man3
+	install -m 444 $(MAN3) ${DESTDIR}/usr/man/man3
+	-mkdir ${DESTDIR}/usr/man/man4
+	install -m 444 $(MAN4) ${DESTDIR}/usr/man/man4
 
 clean:

--- nistnet/Config	2004-08-23 00:06:48.000000000 +0100
+++ nistnet/Config.new	2004-09-20 12:31:18.000000000 +0100
@@ -19,7 +19,7 @@
 HPATH = $(TOPDIR)/include
 
 # 2. Device node names and major numbers -- edit here and recompile if needed
-DEVNISTNET = /dev/nistnet
+DEVNISTNET = ${DESTDIR}dev/nistnet
 NISTNETMAJOR = 62
 NISTNETMINOR = 0
 
--- nistnet/configure	2004-08-24 03:31:36.000000000 +0200
+++ nistnet/configure.new	2005-04-14 03:25:53.000000000 +0200
@@ -31,39 +31,19 @@
 
 # 2. Ask whether they want ECN or COS support
 
-grep DCONFIG_ECN Config | grep '#' > /dev/null
-if [ $? = 0 ] ; then
-	# ECN off
-	ECN='# -DCONFIG_ECN'
-	echo -n 'Add explicit congestion notification (ECN) support [no]? '
-else
-	# ECN on
-	ECN='-DCONFIG_ECN'
-	echo -n 'Add explicit congestion notification (ECN) support [yes]? '
-fi
-read response junk
+response=`grep -G "^CONFIG_INET_ECN=." $TOPDIR/.config | grep -o .$`
 case $response in
-	Y* | y*)
+	[Yy]*)
 		ECN='-DCONFIG_ECN';;
-	N* | n*)
+	*)
 		ECN='# -DCONFIG_ECN';;
 esac
 
-grep DCONFIG_COS Config | grep '#' > /dev/null
-if [ $? = 0 ] ; then
-	# COS off
-	COS='# -DCONFIG_COS'
-	echo -n 'Add class/type of service (COS) support [no]? '
-else
-	# COS on
-	COS='-DCONFIG_COS'
-	echo -n 'Add class/type of service (COS) support [yes]? '
-fi
-read response junk
-case $response in
-	Y* | y*)
+# we can pass this argument as a parameter to configure through USEFLAGS
+case $1 in
+	cos)
 		COS='-DCONFIG_COS';;
-	N* | n*)
+	*)
 		COS='# -DCONFIG_COS';;
 esac
 
@@ -96,14 +76,6 @@
 
 cd monitor
 
-ex Imakefile << below.Imakefile
-/OURXAWLIB/c
-OURXAWLIB = $OURXAWLIB
-.
-w
-q
-below.Imakefile
-
 # Rebuild the monitor makefiles appropriately:
 echo ' '
 echo ' '