diff options
Diffstat (limited to 'net/ipv6calc/patches/patch-aa')
| -rw-r--r-- | net/ipv6calc/patches/patch-aa | 147 |
1 files changed, 99 insertions, 48 deletions
diff --git a/net/ipv6calc/patches/patch-aa b/net/ipv6calc/patches/patch-aa index 18a563ff263..fa95cd0ab1d 100644 --- a/net/ipv6calc/patches/patch-aa +++ b/net/ipv6calc/patches/patch-aa @@ -1,77 +1,128 @@ -$NetBSD: patch-aa,v 1.8 2004/11/23 21:32:11 hubertf Exp $ +$NetBSD: patch-aa,v 1.9 2005/11/08 21:50:15 hubertf Exp $ ---- Makefile.in.orig 2004-11-21 17:03:11.000000000 +0100 +--- Makefile.in.orig 2005-09-15 19:29:19.000000000 +0200 +++ Makefile.in -@@ -32,7 +32,10 @@ distclean: - make clean +@@ -29,17 +29,17 @@ ipv6logstats: getopt-make lib-make ipv6l + ipv6calc: getopt-make lib-make ipv6calc-make ipv6calcweb-make + + distclean: +- make clean ++ ${MAKE} clean rm -f config.cache config.status config.log - for dir in ipv6logconv ipv6logstats ipv6calcweb ipv6calc man lib md5 getopt databases/ieee-oui databases/ipv4-assignment; do \ -- pushd $$dir && make distclean; popd; \ -+ ocwd=`pwd`; \ -+ cd $$dir; \ -+ make $@ ; \ -+ cd $$ocwd ; \ + for dir in ipv6logconv ipv6logstats ipv6calcweb ipv6calc man lib md5 getopt databases/ieee-oui databases/ipv4-assignment databases/ipv6-assignment; do \ + ocwd=`pwd`; \ + cd $$dir; \ +- make $@ ; \ ++ ${MAKE} $@ ; \ + cd $$ocwd ; \ done autoclean: -@@ -42,12 +45,18 @@ autoclean: +- make distclean ++ ${MAKE} distclean + rm -f Makefile + rm -f version.h rm -f contrib/ipv6calc.spec - rm config.h +@@ -47,7 +47,7 @@ autoclean: for dir in ipv6logconv ipv6logstats ipv6calcweb ipv6calc man lib md5 getopt; do \ -- pushd $$dir && make autoclean; popd;\ -+ ocwd=`pwd`; \ -+ cd $$dir; \ -+ make $@ ; \ -+ cd $$ocwd ; \ + ocwd=`pwd`; \ + cd $$dir; \ +- make $@ ; \ ++ ${MAKE} $@ ; \ + cd $$ocwd ; \ done - clean: +@@ -55,60 +55,60 @@ clean: for dir in ipv6logconv ipv6logstats ipv6calcweb ipv6calc man lib md5 getopt; do \ -- pushd $$dir && make clean; popd; \ -+ ocwd=`pwd`; \ -+ cd $$dir; \ -+ make $@ ; \ -+ cd $$ocwd ; \ + ocwd=`pwd`; \ + cd $$dir; \ +- make $@ ; \ ++ ${MAKE} $@ ; \ + cd $$ocwd ; \ done install: -@@ -56,7 +65,10 @@ install: +- make test +- make installonly ++ ${MAKE} test ++ ${MAKE} installonly installonly: for dir in ipv6logconv ipv6logstats ipv6calcweb ipv6calc man lib md5 getopt; do \ -- pushd $$dir && make install; popd; \ -+ ocwd=`pwd`; \ -+ cd $$dir; \ -+ make install ; \ -+ cd $$ocwd ; \ + ocwd=`pwd`; \ + cd $$dir; \ +- make install; \ ++ ${MAKE} install; \ + cd $$ocwd ; \ done getopt-make: -@@ -91,15 +103,24 @@ db-ipv4-assignment-make: +- cd getopt && make ++ cd getopt && ${MAKE} + + md5-make: +- cd md5 && make ++ cd md5 && ${MAKE} + + lib-make: md5-make db-ieee-oui-make db-ieee-iab-make db-ipv4-assignment-make db-ipv6-assignment-make +- cd lib && make ++ cd lib && ${MAKE} + + ipv6logconv-make: lib-make +- cd ipv6logconv && make ++ cd ipv6logconv && ${MAKE} + + ipv6logstats-make: lib-make +- cd ipv6logstats && make ++ cd ipv6logstats && ${MAKE} + + ipv6calc-make: lib-make +- cd ipv6calc && make ++ cd ipv6calc && ${MAKE} + + ipv6calcweb-make: +- cd ipv6calcweb && make ++ cd ipv6calcweb && ${MAKE} + + db-ieee-oui-make: +- cd databases/ieee-oui && make ++ cd databases/ieee-oui && ${MAKE} + + db-ieee-iab-make: +- cd databases/ieee-iab && make ++ cd databases/ieee-iab && ${MAKE} + + db-ipv4-assignment-make: +- cd databases/ipv4-assignment && make ++ cd databases/ipv4-assignment && ${MAKE} + + db-ipv6-assignment-make: +- cd databases/ipv6-assignment && make ++ cd databases/ipv6-assignment && ${MAKE} update: - for dir in databases/ieee-oui databases/ieee-iab databases/ipv4-assignment; do \ -- pushd $$dir && make update; popd; \ -+ ocwd=`pwd`; \ -+ cd $$dir; \ -+ make $@ ; \ -+ cd $$ocwd ; \ + for dir in databases/ieee-oui databases/ieee-iab databases/ipv4-assignment databases/ipv6-assignment; do \ + ocwd=`pwd`; \ + cd $$dir; \ +- make $@ ; \ ++ ${MAKE} $@ ; \ + cd $$ocwd ; \ done - static: ipv6logconv-make ipv6logstats-make ipv6calc-make +@@ -116,7 +116,7 @@ static: ipv6logconv-make ipv6logstats-m for dir in ipv6logconv ipv6logstats ipv6calc; do \ -- pushd $$dir && make static; popd; \ -+ ocwd=`pwd`; \ -+ cd $$dir; \ -+ make $@ ; \ -+ cd $$ocwd ; \ + ocwd=`pwd`; \ + cd $$dir; \ +- make $@ ; \ ++ ${MAKE} $@ ; \ + cd $$ocwd ; \ done - test: +@@ -124,6 +124,6 @@ test: for dir in ipv6logconv ipv6logstats ipv6calcweb ipv6calc man lib; do \ -- pushd $$dir && make test; popd; \ -+ ocwd=`pwd`; \ -+ cd $$dir; \ -+ make $@ ; \ -+ cd $$ocwd ; \ + ocwd=`pwd`; \ + cd $$dir; \ +- make $@ ; \ ++ ${MAKE} $@ ; \ + cd $$ocwd ; \ done |