Update ipv6calc to 0.46. Changes:

- IPv4 database updated (20030906)
- add support of LACNIC registry
- add output format "octal"

 Print octal representation of a given IPv6 address:
  (useful for djbdns/tinydns)
  3ffe:ffff::1 ->
    \77\376\377\377\0\0\0\0\0\0\0\0\0\0\0\1
  --printfulluncompressed 3ffe:ffff::1 ->
    \077\376\377\377\000\000\000\000\000\000\000\000\000\000\000\001

 Available format options:
  --printfulluncompressed: Print in full uncompressed format

- New program "ipv6logstats" for parsing web server logs to get some
  IPv4/IPv6 distribution data and build time line charts. See examples for
  more.

- add input types:
        "ipv4hex" (hexadecimal IPv4 address)
        "ipv4revhex" (reverse hexadecimal IPv4 address)
- add support of spaces in MAC/EUI-48 addresses

- General bugfixing

4 files changed, 17 insertions, 15 deletions

diff --git a/net/ipv6calc/Makefile b/net/ipv6calc/Makefile
index 0b1640f8389..d9b3863ec49 100644
--- a/net/ipv6calc/Makefile
+++ b/net/ipv6calc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 22:51:15 grant Exp $
+# $NetBSD: Makefile,v 1.17 2003/10/14 23:46:46 hubertf Exp $
 
-DISTNAME=	ipv6calc-0.45
-PKGREVISION=	1
+DISTNAME=	ipv6calc-0.46
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
 
diff --git a/net/ipv6calc/PLIST b/net/ipv6calc/PLIST
index 132bc15d668..b5fc1f080aa 100644
--- a/net/ipv6calc/PLIST
+++ b/net/ipv6calc/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/04/21 21:06:54 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/10/14 23:46:46 hubertf Exp $
 bin/ipv6calc
 bin/ipv6logconv
+bin/ipv6logstats
diff --git a/net/ipv6calc/distinfo b/net/ipv6calc/distinfo
index 26f673a7c34..83448cc915e 100644
--- a/net/ipv6calc/distinfo
+++ b/net/ipv6calc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2003/02/06 14:34:57 tron Exp $
+$NetBSD: distinfo,v 1.10 2003/10/14 23:46:46 hubertf Exp $
 
-SHA1 (ipv6calc-0.45.tar.gz) = 0215a7e19246bde252c30ab715b0e1a8c419769a
-Size (ipv6calc-0.45.tar.gz) = 297967 bytes
-SHA1 (patch-aa) = 773b4a88f5f2cbf5fafa9875314f5e73bce8bd8b
+SHA1 (ipv6calc-0.46.tar.gz) = d4d03adda9b26cbca906fcfb3fa3658c251cced9
+Size (ipv6calc-0.46.tar.gz) = 338497 bytes
+SHA1 (patch-aa) = 891f1c3cf286d2d21403721475540fc7dc29d6ef
 SHA1 (patch-ab) = 0d09d6f7e1857640a7c81e4a8345106210555a79
diff --git a/net/ipv6calc/patches/patch-aa b/net/ipv6calc/patches/patch-aa
index 2ab112839dc..cfafbc3566f 100644
--- a/net/ipv6calc/patches/patch-aa
+++ b/net/ipv6calc/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2003/01/11 08:46:41 salo Exp $
+$NetBSD: patch-aa,v 1.7 2003/10/14 23:46:46 hubertf Exp $
 
---- Makefile.in.orig	Sun Oct 27 14:30:02 2002
-+++ Makefile.in	Sat Jan 11 09:37:05 2003
-@@ -53,10 +53,9 @@
+--- Makefile.in.orig	Sat Sep  6 15:15:17 2003
++++ Makefile.in
+@@ -55,11 +55,10 @@ install:
  		make installonly
  
  installonly:
@@ -10,9 +10,11 @@ $NetBSD: patch-aa,v 1.6 2003/01/11 08:46:41 salo Exp $
 -		install -m 755 ipv6calc/ipv6calc $(root)/bin/
 -		mkdir -p $(root)/usr/bin/
 -		install -m 755 ipv6logconv/ipv6logconv $(root)/usr/bin/
-+		${BSD_INSTALL_PROGRAM_DIR} $(root)/bin
-+		${BSD_INSTALL_PROGRAM} ipv6calc/ipv6calc $(root)/bin/
-+		${BSD_INSTALL_PROGRAM} ipv6logconv/ipv6logconv $(root)/bin/
+-		install -m 755 ipv6logstats/ipv6logstats $(root)/usr/bin/
++		${BSD_INSTALL_PROGRAM_DIR} $(PREFIX)/bin
++		${BSD_INSTALL_PROGRAM} ipv6calc/ipv6calc $(PREFIX)/bin
++		${BSD_INSTALL_PROGRAM} ipv6logconv/ipv6logconv $(PREFIX)/bin
++		${BSD_INSTALL_PROGRAM} ipv6logstats/ipv6logstats $(PREFIX)/bin
  
  getopt-make:
  		cd getopt/ && make