diff -Nurd -x'*~' ipv6calc-0.50.orig/LICENSE ipv6calc-0.50/LICENSE
--- ipv6calc-0.50.orig/LICENSE	2002-03-27 17:58:25.000000000 -0500
+++ ipv6calc-0.50/LICENSE	2005-11-09 02:58:11.000000000 -0500
@@ -12,12 +12,6 @@
 	related file is
 	- librfc1884.c
 
-   * code for getopt (needed by OpenBSD)
-	related files are:
-	- getopt/getopt.c
-	- getopt/getopt.h
-	- getopt/getopt1.c
-
    -> see directory "samplecode" in the source file for original versions
 
    * source data of databases
diff -Nurd -x'*~' ipv6calc-0.50.orig/Makefile.in ipv6calc-0.50/Makefile.in
--- ipv6calc-0.50.orig/Makefile.in	2005-09-15 13:29:19.000000000 -0400
+++ ipv6calc-0.50/Makefile.in	2006-03-29 01:26:39.000000000 -0500
@@ -10,23 +10,23 @@
 # Compiler and Linker Options
 COPTS = -O2 -Wall -g
 
-CFLAGS	= $(COPTS) -Igetopt/
+CFLAGS	= $(COPTS)
 
 CC	= gcc
 
-GETOBJS	= getopt/getopt.o getopt/getopt1.o md5/md5.o
+GETOBJS	= md5/md5.o
 
-all:		md5-make getopt-make ipv6calc ipv6logconv ipv6logstats
+all:		md5-make ipv6calc ipv6logconv ipv6logstats
 
 .c.o:
 		$(CC) $(CFLAGS) -c $<
 
 
-ipv6logconv:	getopt-make lib-make ipv6logconv-make
+ipv6logconv:	lib-make ipv6logconv-make
 
-ipv6logstats:	getopt-make lib-make ipv6logstats-make
+ipv6logstats:	lib-make ipv6logstats-make
 
-ipv6calc:	getopt-make lib-make ipv6calc-make ipv6calcweb-make
+ipv6calc:	lib-make ipv6calc-make ipv6calcweb-make
 
 distclean:
 		make clean
@@ -64,7 +64,7 @@
 		make installonly
 
 installonly:
-		for dir in ipv6logconv ipv6logstats ipv6calcweb ipv6calc man lib md5 getopt; do \
+		for dir in ipv6logconv ipv6logstats ipv6calc man lib; do \
 			ocwd=`pwd`; \
 			cd $$dir; \
 			make install; \
diff -Nurd -x'*~' ipv6calc-0.50.orig/ipv6calc/Makefile.in ipv6calc-0.50/ipv6calc/Makefile.in
--- ipv6calc-0.50.orig/ipv6calc/Makefile.in	2005-09-15 13:29:19.000000000 -0400
+++ ipv6calc-0.50/ipv6calc/Makefile.in	2005-11-09 02:58:11.000000000 -0500
@@ -10,9 +10,9 @@
 # Compiler and Linker Options
 COPTS = -O2 -Wall -g
 
-CFLAGS	= $(COPTS) -I../getopt/ -I../ -I../lib/
+CFLAGS	= $(COPTS) -I../ -I../lib/
 
-GETOBJS = ../getopt/getopt.o ../getopt/getopt1.o ../md5/md5.o
+GETOBJS = ../md5/md5.o
 
 CC	= gcc
 
diff -Nurd -x'*~' ipv6calc-0.50.orig/ipv6logconv/Makefile.in ipv6calc-0.50/ipv6logconv/Makefile.in
--- ipv6calc-0.50.orig/ipv6logconv/Makefile.in	2005-09-15 13:35:02.000000000 -0400
+++ ipv6calc-0.50/ipv6logconv/Makefile.in	2005-11-09 02:58:11.000000000 -0500
@@ -10,9 +10,9 @@
 # Compiler and Linker Options
 COPTS = -O2 -Wall -g -D__EXTENSIONS__
 
-CFLAGS	= $(COPTS) -I../getopt/ -I../ -I../lib/
+CFLAGS	= $(COPTS) -I../ -I../lib/
 
-GETOBJS = ../getopt/getopt.o ../getopt/getopt1.o
+GETOBJS = 
 
 CC	= gcc
 
@@ -51,4 +51,4 @@
 install:	ipv6logconv
 		mkdir -p $(root)@bindir@
 		install -m 755 ipv6logconv $(root)@bindir@
-	
+
diff -Nurd -x'*~' ipv6calc-0.50.orig/ipv6logconv/test_ipv6logconv.sh ipv6calc-0.50/ipv6logconv/test_ipv6logconv.sh
--- ipv6calc-0.50.orig/ipv6logconv/test_ipv6logconv.sh	2005-09-15 13:49:02.000000000 -0400
+++ ipv6calc-0.50/ipv6logconv/test_ipv6logconv.sh	2006-03-29 01:46:25.000000000 -0500
@@ -70,6 +70,10 @@
 #set -x
 ## main ##
 echo "Run 'ipv6logconv' function tests..." >&2
+if [ $UID = 0 ]; then
+  echo "WARNING: skipping ipv6logconv test! (cannot run it as root)"
+  exit 0
+fi
 
 if [ "$1" != "bulk" ]; then
 	testscenarios | grep -v "^#" | while read line; do
diff -Nurd -x'*~' ipv6calc-0.50.orig/ipv6logstats/Makefile.in ipv6calc-0.50/ipv6logstats/Makefile.in
--- ipv6calc-0.50.orig/ipv6logstats/Makefile.in	2005-09-15 13:35:02.000000000 -0400
+++ ipv6calc-0.50/ipv6logstats/Makefile.in	2005-11-09 02:58:11.000000000 -0500
@@ -10,9 +10,9 @@
 # Compiler and Linker Options
 COPTS = -O2 -Wall -g -D__EXTENSIONS__
 
-CFLAGS	= $(COPTS) -I../getopt/ -I../ -I../lib/
+CFLAGS	= $(COPTS) -I../ -I../lib/
 
-GETOBJS = ../getopt/getopt.o ../getopt/getopt1.o
+GETOBJS = 
 
 CC	= gcc
 
diff -Nurd -x'*~' ipv6calc-0.50.orig/ipv6logstats/test_ipv6logstats.sh ipv6calc-0.50/ipv6logstats/test_ipv6logstats.sh
--- ipv6calc-0.50.orig/ipv6logstats/test_ipv6logstats.sh	2003-06-15 09:33:41.000000000 -0400
+++ ipv6calc-0.50/ipv6logstats/test_ipv6logstats.sh	2006-03-29 01:46:33.000000000 -0500
@@ -20,6 +20,10 @@
 #set -x
 ## main ##
 echo "Run 'ipv6logstats' function tests..."
+if [ $UID = 0 ]; then
+  echo "WARNING: skipping ipv6logstats test! (cannot run it as root)"
+  exit 0
+fi
 
 #testscenarios
 testscenarios | ./ipv6logstats
diff -Nurd -x'*~' ipv6calc-0.50.orig/lib/Makefile ipv6calc-0.50/lib/Makefile
--- ipv6calc-0.50.orig/lib/Makefile	2005-09-15 13:29:19.000000000 -0400
+++ ipv6calc-0.50/lib/Makefile	2005-11-09 02:58:11.000000000 -0500
@@ -11,7 +11,7 @@
 #  -D__EXTENSIONS__ is for Solaris & strtok_r
 COPTS = -O2 -Wall -D__EXTENSIONS__
 
-CFLAGS	= $(COPTS) -I../ -I../getopt/ -I../md5/
+CFLAGS	= $(COPTS) -I../ -I../md5/
 
 CC	= gcc
 AR	= ar