From c62daa8aca59f1e7d3d3f7d4a76478fa2d8c063a Mon Sep 17 00:00:00 2001 From: hubertf Date: Tue, 8 Nov 2005 21:50:15 +0000 Subject: So this package was broken because the author messed up autoconf @foo@. Makes me wonder how this ever worked. Anyways: Update ipv6calc to 0.50 (in the wrong hope that it was fixed, but I had to do the work myself, *sigh*). Changes: * nothing important as far as I could spot from the large & useless ChangeLog file * No longer requite "root" (env-var) to be passed to the pkg * hack to make autoconf stuff going, dumping on author to fix properly Sorry for being in rant mode... --- net/ipv6calc/Makefile | 7 +- net/ipv6calc/distinfo | 14 ++-- net/ipv6calc/patches/patch-aa | 147 ++++++++++++++++++++++++++++-------------- net/ipv6calc/patches/patch-ab | 18 ++++-- net/ipv6calc/patches/patch-ac | 15 +++++ net/ipv6calc/patches/patch-ad | 15 +++++ 6 files changed, 153 insertions(+), 63 deletions(-) create mode 100644 net/ipv6calc/patches/patch-ac create mode 100644 net/ipv6calc/patches/patch-ad (limited to 'net/ipv6calc') diff --git a/net/ipv6calc/Makefile b/net/ipv6calc/Makefile index 423eea6aa2e..32eff040632 100644 --- a/net/ipv6calc/Makefile +++ b/net/ipv6calc/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:24 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/11/08 21:50:15 hubertf Exp $ # -DISTNAME= ipv6calc-0.48 +DISTNAME= ipv6calc-0.50 CATEGORIES= net MASTER_SITES= ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ MAINTAINER= hubertf@NetBSD.org -HOMEPAGE= http://www.bieringer.de/linux/IPv6/ipv6calc/ +HOMEPAGE= http://www.deepspace6.net/projects/ipv6calc.html COMMENT= Manipulates IPv6 addresses # This package does not set or evaluate USE_INET6, but it should still @@ -15,7 +15,6 @@ COMMENT= Manipulates IPv6 addresses GNU_CONFIGURE= YES USE_TOOLS+= gmake -MAKE_ENV+= root=${PREFIX} INSTALL_TARGET= installonly .include "../../mk/bsd.pkg.mk" diff --git a/net/ipv6calc/distinfo b/net/ipv6calc/distinfo index def8f57f246..6c18969edd5 100644 --- a/net/ipv6calc/distinfo +++ b/net/ipv6calc/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.12 2005/02/24 12:13:50 agc Exp $ +$NetBSD: distinfo,v 1.13 2005/11/08 21:50:15 hubertf Exp $ -SHA1 (ipv6calc-0.48.tar.gz) = 49a46b49f8ba0badaae9d900645a9e98f2933895 -RMD160 (ipv6calc-0.48.tar.gz) = 5043f084411d677ad3cbe50dab03143bfd33fd7d -Size (ipv6calc-0.48.tar.gz) = 456796 bytes -SHA1 (patch-aa) = 0b15bca3b30bc6848618915439af0cfec53516d8 -SHA1 (patch-ab) = 1ee4112744e6c66c87b5b73ef028da7a77d3c689 +SHA1 (ipv6calc-0.50.tar.gz) = 06610ce8d02ae82388ead4af644d1be85d4aa689 +RMD160 (ipv6calc-0.50.tar.gz) = 9e62afae35d26ae2ed6f398623cd3bf7e62479ed +Size (ipv6calc-0.50.tar.gz) = 503695 bytes +SHA1 (patch-aa) = 8709f2dc352e490980174e4c51c2d1238300437b +SHA1 (patch-ab) = 89faf0a4c36436d3cafca49c7ffbdce0d090daab +SHA1 (patch-ac) = 2ee60ab9d96346b413b2903d1e93df759a8a3cc1 +SHA1 (patch-ad) = 743ee3db6ca7159f8f2db9c1b9032e3771a311f2 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 diff --git a/net/ipv6calc/patches/patch-ab b/net/ipv6calc/patches/patch-ab index 413f7e1739d..d30edc49657 100644 --- a/net/ipv6calc/patches/patch-ab +++ b/net/ipv6calc/patches/patch-ab @@ -1,13 +1,21 @@ -$NetBSD: patch-ab,v 1.2 2004/11/23 21:32:11 hubertf Exp $ +$NetBSD: patch-ab,v 1.3 2005/11/08 21:50:15 hubertf Exp $ ---- ipv6calc/Makefile.in.orig 2004-11-21 17:03:12.000000000 +0100 +--- ipv6calc/Makefile.in.orig 2005-09-15 19:29:19.000000000 +0200 +++ ipv6calc/Makefile.in -@@ -35,7 +35,7 @@ libipv6calc.a: - cd ../ && make lib-make +@@ -1,2 +1,9 @@ ++### HACK ATTACK --- FIXME, PETER!!! - HF ### ++prefix= @prefix@ ++exec_prefix = @exec_prefix@ ++### HACK ATTACK --- FIXME, PETER!!! - HF ### ++ ++ ++ + # Project : ipv6calc/ipv6calc + # File : Makefile[.in] +@@ -36,5 +43,5 @@ libipv6calc.a: ipv6calc: $(OBJS) libipv6calc.a ../lib/ipv6calcoptions.h - $(CC) -o ipv6calc $(OBJS) $(GETOBJS) -lipv6calc -L../lib/ + $(CC) -o ipv6calc $(OBJS) $(GETOBJS) -lipv6calc -L../lib/ $(LDFLAGS) static: ipv6calc - $(CC) -o ipv6calc-static $(OBJS) $(GETOBJS) -lipv6calc -L../lib/ -static diff --git a/net/ipv6calc/patches/patch-ac b/net/ipv6calc/patches/patch-ac new file mode 100644 index 00000000000..ea9c7be9459 --- /dev/null +++ b/net/ipv6calc/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1 2005/11/08 21:50:15 hubertf Exp $ + +--- ipv6logstats/Makefile.in.orig 2005-09-15 19:35:02.000000000 +0200 ++++ ipv6logstats/Makefile.in +@@ -1,2 +1,10 @@ ++### HACK ATTACK --- FIXME, PETER!!! - HF ### ++prefix= @prefix@ ++exec_prefix = @exec_prefix@ ++### HACK ATTACK --- FIXME, PETER!!! - HF ### ++ ++ ++ ++ + # Project : ipv6calc/ipv6logstats + # File : Makefile diff --git a/net/ipv6calc/patches/patch-ad b/net/ipv6calc/patches/patch-ad new file mode 100644 index 00000000000..790bb2f76b1 --- /dev/null +++ b/net/ipv6calc/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1 2005/11/08 21:50:15 hubertf Exp $ + +--- ipv6logconv/Makefile.in.orig 2005-09-15 19:35:02.000000000 +0200 ++++ ipv6logconv/Makefile.in +@@ -1,2 +1,10 @@ ++### HACK ATTACK --- FIXME, PETER!!! - HF ### ++prefix= @prefix@ ++exec_prefix = @exec_prefix@ ++### HACK ATTACK --- FIXME, PETER!!! - HF ### ++ ++ ++ ++ + # Project : ipv6calc/ipv6logconv + # File : Makefile -- cgit v1.2.3