Update to libnet-1.0.1b and portlint

No response from:	Maintainer

8 files changed, 138 insertions, 76 deletions

diff --git a/net/libnet/Makefile b/net/libnet/Makefile
index 6dc6d237105c..bf5011876143 100644
--- a/net/libnet/Makefile
+++ b/net/libnet/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	libnet
-PORTVERSION=	0.99g
+PORTVERSION=	1.0.1b
 CATEGORIES=	net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	shipley@dis.org
 
@@ -17,27 +16,24 @@ MAN3=		libnet.3
 
 GNU_CONFIGURE=	yes
 
-#NOPROFILE=	true
-
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} <= 300000
-BROKEN=		does not build
-.endif
-
-WRKSRC=		${WRKDIR}/Libnet-0.99g
+WRKSRC=         ${WRKDIR}/Libnet-${PORTVERSION}
+MAN3=		libnet.3
 
 post-install:
+	${INSTALL_MAN} ${WRKSRC}/doc/libnet.3 ${PREFIX}/man/man3
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/PORTS ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README.bpf ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README.asn.1 ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README.bpf ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README.examples ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README.linux ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README.rawsockets ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README.stubs ${PREFIX}/share/doc/libnet
+	@${MKDIR} ${PREFIX}/share/doc/libnet/html
+	@${MKDIR} ${PREFIX}/share/doc/libnet/html/examples
+.for i in CHANGELOG CHANGELOG-NEWFUNCTIONS COPYING README README.asn.1 README.bpf README.legacy-applications README.libnet-config README.linux README.rawsockets TODO-1.0 TODO-1.1
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/libnet
+.endfor
+.for i in 1.html 2.html 3.html 4.html 5.html 6.html 7.html contrib.html fig-3a.gif figure-1.gif figure-2.gif figure-3.gif figure-3a.gif lrm.html
+	${INSTALL_DATA} ${WRKSRC}/doc/html/${i} ${PREFIX}/share/doc/libnet/html
+.endfor
+.for i in libnet-example-1.c libnet-example-2.c libnet-example-3.c libnet-example-4.c
+	${INSTALL_DATA} ${WRKSRC}/doc/html/examples/${i} ${PREFIX}/share/doc/libnet/html/examples
+.endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/libnet/distinfo b/net/libnet/distinfo
index 449784947c45..bfc76cf8354b 100644
--- a/net/libnet/distinfo
+++ b/net/libnet/distinfo
@@ -1 +1 @@
-MD5 (libnet-0.99g.tgz) = 81ef8df7abf319276db41cbe16cb277c
+MD5 (libnet-1.0.1b.tar.gz) = 6eed9efc6c806911721b8830f18b5237
diff --git a/net/libnet/files/patch-aa b/net/libnet/files/patch-aa
index 8dcc13cfaa46..bbdf71b6d0c8 100644
--- a/net/libnet/files/patch-aa
+++ b/net/libnet/files/patch-aa
@@ -1,20 +1,31 @@
---- configure.orig	Sat Jan 30 13:25:07 1999
-+++ configure	Thu Oct  7 19:31:17 1999
-@@ -1216,7 +1216,7 @@
- EOF
+--- configure.orig	Wed Oct 27 11:47:27 1999
++++ configure	Sat Apr 22 04:01:09 2000
+@@ -903,7 +903,7 @@
  
-     MAN_PREFIX="$prefix/man/man3/"
+ if test $ac_cv_prog_gcc = yes; then
+     CCOPTS='-O3 -funroll-loops -fomit-frame-pointer -Wall'
+-    CFLAGS="$CCOPTS"
++    CFLAGS?="$CCOPTS"
+ fi
+ 
+ # Check whether --with-pf_packet or --without-pf_packet was given.
+@@ -1497,8 +1497,8 @@
+ 
+     LIBNET_CONFIG_DEFINES="-DLIBNET_BSDISH_OS -DLIBNET_BSD_BYTE_SWAP \
+         -DHAVE_SOCKADDR_SA_LEN"
+-    MAN_PREFIX="$prefix/man/man3/"
 -    LIB_PREFIX="$prefix/lib/aout"
++    MAN_PREFIX="$prefix/man/"
 +    LIB_PREFIX="$prefix/lib/"
      INC_PREFIX="$prefix/include/"
-     ln -sf FreeBSD support/bpf-lkm/etherspoof
-     ;;
-@@ -1231,7 +1231,7 @@
- EOF
+     BIN_PREFIX="$prefix/bin/"
+     echo "$ac_t""Note: support/bpf-lkm/etherspoof contains the lkm source \
+@@ -1517,7 +1517,7 @@
  
+     LIBNET_CONFIG_DEFINES="-DLIBNET_BSDISH_OS -DLIBNET_BSD_BYTE_SWAP"
      MAN_PREFIX="$prefix/man/man3/"
 -    LIB_PREFIX="$prefix/lib/aout"
 +    LIB_PREFIX="$prefix/lib/"
      INC_PREFIX="$prefix/include/"
+     BIN_PREFIX="$prefix/bin/"
      ;;
- 
diff --git a/net/libnet/pkg-plist b/net/libnet/pkg-plist
index 3b6abcd7fa31..91658979404f 100644
--- a/net/libnet/pkg-plist
+++ b/net/libnet/pkg-plist
@@ -1,20 +1,44 @@
 bin/libnet-config
 include/libnet.h
-include/libnet/libnet-headers.h
+include/libnet/libnet-asn1.h
 include/libnet/libnet-functions.h
+include/libnet/libnet-headers.h
+include/libnet/libnet-macros.h
 include/libnet/libnet-ospf.h
 include/libnet/libnet-structures.h
-include/libnet/libnet-macros.h
-include/libnet/libnet-asn1.h
-lib/libpwrite
 lib/libnet.a
-share/doc/libnet/PORTS
+lib/libpwrite
+share/doc/libnet/CHANGELOG
+share/doc/libnet/CHANGELOG-NEWFUNCTIONS
+share/doc/libnet/COPYING
 share/doc/libnet/README
 share/doc/libnet/README.asn.1
 share/doc/libnet/README.bpf
-share/doc/libnet/README.examples
+share/doc/libnet/README.legacy-applications
+share/doc/libnet/README.libnet-config
 share/doc/libnet/README.linux
 share/doc/libnet/README.rawsockets
-share/doc/libnet/README.stubs
+share/doc/libnet/TODO-1.0
+share/doc/libnet/TODO-1.1
+share/doc/libnet/html/1.html
+share/doc/libnet/html/2.html
+share/doc/libnet/html/3.html
+share/doc/libnet/html/4.html
+share/doc/libnet/html/5.html
+share/doc/libnet/html/6.html
+share/doc/libnet/html/7.html
+share/doc/libnet/html/contrib.html
+share/doc/libnet/html/examples/libnet-example-1.c
+share/doc/libnet/html/examples/libnet-example-2.c
+share/doc/libnet/html/examples/libnet-example-3.c
+share/doc/libnet/html/examples/libnet-example-4.c
+share/doc/libnet/html/fig-3a.gif
+share/doc/libnet/html/figure-1.gif
+share/doc/libnet/html/figure-2.gif
+share/doc/libnet/html/figure-3.gif
+share/doc/libnet/html/figure-3a.gif
+share/doc/libnet/html/lrm.html
+@dirrm share/doc/libnet/html/examples
+@dirrm share/doc/libnet/html
 @dirrm share/doc/libnet
 @dirrm include/libnet
diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile
index 6dc6d237105c..bf5011876143 100644
--- a/net/libnet10/Makefile
+++ b/net/libnet10/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	libnet
-PORTVERSION=	0.99g
+PORTVERSION=	1.0.1b
 CATEGORIES=	net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	shipley@dis.org
 
@@ -17,27 +16,24 @@ MAN3=		libnet.3
 
 GNU_CONFIGURE=	yes
 
-#NOPROFILE=	true
-
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} <= 300000
-BROKEN=		does not build
-.endif
-
-WRKSRC=		${WRKDIR}/Libnet-0.99g
+WRKSRC=         ${WRKDIR}/Libnet-${PORTVERSION}
+MAN3=		libnet.3
 
 post-install:
+	${INSTALL_MAN} ${WRKSRC}/doc/libnet.3 ${PREFIX}/man/man3
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/PORTS ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README.bpf ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README.asn.1 ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README.bpf ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README.examples ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README.linux ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README.rawsockets ${PREFIX}/share/doc/libnet
-	${INSTALL_MAN} ${WRKSRC}/doc/README.stubs ${PREFIX}/share/doc/libnet
+	@${MKDIR} ${PREFIX}/share/doc/libnet/html
+	@${MKDIR} ${PREFIX}/share/doc/libnet/html/examples
+.for i in CHANGELOG CHANGELOG-NEWFUNCTIONS COPYING README README.asn.1 README.bpf README.legacy-applications README.libnet-config README.linux README.rawsockets TODO-1.0 TODO-1.1
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/libnet
+.endfor
+.for i in 1.html 2.html 3.html 4.html 5.html 6.html 7.html contrib.html fig-3a.gif figure-1.gif figure-2.gif figure-3.gif figure-3a.gif lrm.html
+	${INSTALL_DATA} ${WRKSRC}/doc/html/${i} ${PREFIX}/share/doc/libnet/html
+.endfor
+.for i in libnet-example-1.c libnet-example-2.c libnet-example-3.c libnet-example-4.c
+	${INSTALL_DATA} ${WRKSRC}/doc/html/examples/${i} ${PREFIX}/share/doc/libnet/html/examples
+.endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/libnet10/distinfo b/net/libnet10/distinfo
index 449784947c45..bfc76cf8354b 100644
--- a/net/libnet10/distinfo
+++ b/net/libnet10/distinfo
@@ -1 +1 @@
-MD5 (libnet-0.99g.tgz) = 81ef8df7abf319276db41cbe16cb277c
+MD5 (libnet-1.0.1b.tar.gz) = 6eed9efc6c806911721b8830f18b5237
diff --git a/net/libnet10/files/patch-aa b/net/libnet10/files/patch-aa
index 8dcc13cfaa46..bbdf71b6d0c8 100644
--- a/net/libnet10/files/patch-aa
+++ b/net/libnet10/files/patch-aa
@@ -1,20 +1,31 @@
---- configure.orig	Sat Jan 30 13:25:07 1999
-+++ configure	Thu Oct  7 19:31:17 1999
-@@ -1216,7 +1216,7 @@
- EOF
+--- configure.orig	Wed Oct 27 11:47:27 1999
++++ configure	Sat Apr 22 04:01:09 2000
+@@ -903,7 +903,7 @@
  
-     MAN_PREFIX="$prefix/man/man3/"
+ if test $ac_cv_prog_gcc = yes; then
+     CCOPTS='-O3 -funroll-loops -fomit-frame-pointer -Wall'
+-    CFLAGS="$CCOPTS"
++    CFLAGS?="$CCOPTS"
+ fi
+ 
+ # Check whether --with-pf_packet or --without-pf_packet was given.
+@@ -1497,8 +1497,8 @@
+ 
+     LIBNET_CONFIG_DEFINES="-DLIBNET_BSDISH_OS -DLIBNET_BSD_BYTE_SWAP \
+         -DHAVE_SOCKADDR_SA_LEN"
+-    MAN_PREFIX="$prefix/man/man3/"
 -    LIB_PREFIX="$prefix/lib/aout"
++    MAN_PREFIX="$prefix/man/"
 +    LIB_PREFIX="$prefix/lib/"
      INC_PREFIX="$prefix/include/"
-     ln -sf FreeBSD support/bpf-lkm/etherspoof
-     ;;
-@@ -1231,7 +1231,7 @@
- EOF
+     BIN_PREFIX="$prefix/bin/"
+     echo "$ac_t""Note: support/bpf-lkm/etherspoof contains the lkm source \
+@@ -1517,7 +1517,7 @@
  
+     LIBNET_CONFIG_DEFINES="-DLIBNET_BSDISH_OS -DLIBNET_BSD_BYTE_SWAP"
      MAN_PREFIX="$prefix/man/man3/"
 -    LIB_PREFIX="$prefix/lib/aout"
 +    LIB_PREFIX="$prefix/lib/"
      INC_PREFIX="$prefix/include/"
+     BIN_PREFIX="$prefix/bin/"
      ;;
- 
diff --git a/net/libnet10/pkg-plist b/net/libnet10/pkg-plist
index 3b6abcd7fa31..91658979404f 100644
--- a/net/libnet10/pkg-plist
+++ b/net/libnet10/pkg-plist
@@ -1,20 +1,44 @@
 bin/libnet-config
 include/libnet.h
-include/libnet/libnet-headers.h
+include/libnet/libnet-asn1.h
 include/libnet/libnet-functions.h
+include/libnet/libnet-headers.h
+include/libnet/libnet-macros.h
 include/libnet/libnet-ospf.h
 include/libnet/libnet-structures.h
-include/libnet/libnet-macros.h
-include/libnet/libnet-asn1.h
-lib/libpwrite
 lib/libnet.a
-share/doc/libnet/PORTS
+lib/libpwrite
+share/doc/libnet/CHANGELOG
+share/doc/libnet/CHANGELOG-NEWFUNCTIONS
+share/doc/libnet/COPYING
 share/doc/libnet/README
 share/doc/libnet/README.asn.1
 share/doc/libnet/README.bpf
-share/doc/libnet/README.examples
+share/doc/libnet/README.legacy-applications
+share/doc/libnet/README.libnet-config
 share/doc/libnet/README.linux
 share/doc/libnet/README.rawsockets
-share/doc/libnet/README.stubs
+share/doc/libnet/TODO-1.0
+share/doc/libnet/TODO-1.1
+share/doc/libnet/html/1.html
+share/doc/libnet/html/2.html
+share/doc/libnet/html/3.html
+share/doc/libnet/html/4.html
+share/doc/libnet/html/5.html
+share/doc/libnet/html/6.html
+share/doc/libnet/html/7.html
+share/doc/libnet/html/contrib.html
+share/doc/libnet/html/examples/libnet-example-1.c
+share/doc/libnet/html/examples/libnet-example-2.c
+share/doc/libnet/html/examples/libnet-example-3.c
+share/doc/libnet/html/examples/libnet-example-4.c
+share/doc/libnet/html/fig-3a.gif
+share/doc/libnet/html/figure-1.gif
+share/doc/libnet/html/figure-2.gif
+share/doc/libnet/html/figure-3.gif
+share/doc/libnet/html/figure-3a.gif
+share/doc/libnet/html/lrm.html
+@dirrm share/doc/libnet/html/examples
+@dirrm share/doc/libnet/html
 @dirrm share/doc/libnet
 @dirrm include/libnet