Update this port and close the PR that has been open for a

long time.  Maintainer has not responded to the PR at all.

PR: 28656
Submitted by:	cnh@netVmg.com

5 files changed, 63 insertions, 70 deletions

diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile
index 38e9af65148c..91f477bfa0f7 100644
--- a/net/libnet10/Makefile
+++ b/net/libnet10/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libnet
-PORTVERSION=	1.0.1b
+PORTVERSION=	1.0.2a
 CATEGORIES=	net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
 
@@ -14,7 +14,7 @@ MAINTAINER=	shipley@dis.org
 
 MAN3=		libnet.3
 
-GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 
 WRKSRC=		${WRKDIR}/Libnet-${PORTVERSION}
 MAN3=		libnet.3
@@ -23,16 +23,16 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/libnet.3 ${PREFIX}/man/man3
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${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
+	@${MKDIR} ${PREFIX}/share/doc/libnet/examples
+	@${MKDIR} ${PREFIX}/share/doc/libnet/ancillary
+.for i in CHANGELOG CHANGELOG-NEWFUNCTIONS COPYING README 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
+.for i in README.asn.1 README.bpf README.legacy-applications README.libnet-config README.linux README.rawsockets
+	${INSTALL_DATA} ${WRKSRC}/doc/Ancillary/${i} ${PREFIX}/share/doc/libnet/ancillary
 .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
+	${INSTALL_DATA} ${WRKSRC}/example/${i} ${PREFIX}/share/doc/libnet/examples
 .endfor
 .endif
 
diff --git a/net/libnet10/distinfo b/net/libnet10/distinfo
index bfc76cf8354b..301a594219c1 100644
--- a/net/libnet10/distinfo
+++ b/net/libnet10/distinfo
@@ -1 +1 @@
-MD5 (libnet-1.0.1b.tar.gz) = 6eed9efc6c806911721b8830f18b5237
+MD5 (libnet-1.0.2a.tar.gz) = ddf53f0f484184390e8c2a1bd0853667
diff --git a/net/libnet10/files/patch-aa b/net/libnet10/files/patch-aa
index bbdf71b6d0c8..57137897cbc7 100644
--- a/net/libnet10/files/patch-aa
+++ b/net/libnet10/files/patch-aa
@@ -1,31 +1,29 @@
---- configure.orig	Wed Oct 27 11:47:27 1999
-+++ configure	Sat Apr 22 04:01:09 2000
-@@ -903,7 +903,7 @@
- 
+--- configure.in.orig	Wed Jan 17 12:59:30 2001
++++ configure.in	Mon Jul  2 19:18:50 2001
+@@ -50,10 +50,10 @@
+ dnl Use these compiler flags if we have gcc.
+ dnl
  if test $ac_cv_prog_gcc = yes; then
-     CCOPTS='-O3 -funroll-loops -fomit-frame-pointer -Wall'
+-dnl if test -z $CFLAGS; then 
+-    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
 -    CFLAGS="$CCOPTS"
-+    CFLAGS?="$CCOPTS"
+-dnl fi
++    if test -z "$CFLAGS"; then 
++        CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
++        CFLAGS="$CCOPTS"
++    fi
  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/"
-     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/"
+ dnl
+@@ -163,8 +163,9 @@
+     LIB_PREFIX="$prefix/lib/aout"
      INC_PREFIX="$prefix/include/"
      BIN_PREFIX="$prefix/bin/"
+-    AC_MSG_RESULT(Note: support/bpf-lkm/etherspoof contains the lkm source \
+-required to spoof ethernet frames)
++dnl etherspoof lkm is horrible and only necesary on < RELENG_4
++dnl     AC_MSG_RESULT(Note: support/bpf-lkm/etherspoof contains the lkm source \
++dnl required to spoof ethernet frames)
+     ln -sf FreeBSD support/bpf-lkm/etherspoof
      ;;
+ 
diff --git a/net/libnet10/files/patch-ab b/net/libnet10/files/patch-ab
index 6c877fe42693..9106f9921b2a 100644
--- a/net/libnet10/files/patch-ab
+++ b/net/libnet10/files/patch-ab
@@ -1,11 +1,20 @@
---- Makefile.in.orig	Thu Oct  7 20:17:43 1999
-+++ Makefile.in	Thu Oct  7 20:17:56 1999
-@@ -104,7 +104,7 @@
- 	$(INSTALL) -c -m 0644 $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- 	$(INSTALL) -c -m 0644 $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- 	$(INSTALL) -c -m 0644 $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL) -c -m 0644 $(MAN) $(DESTDIR)$(MAN_PREFIX)
-+	$(INSTALL) -c -m 0644 $(MAN) $(DESTDIR)$(MAN_PREFIX)/man3
- 	$(INSTALL) -c -m 0755 $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
+--- Makefile.in.orig	Mon Feb  5 09:51:41 2001
++++ Makefile.in	Mon Jul  2 19:41:27 2001
+@@ -96,7 +96,7 @@
+ 	$(ENSUREDIR) $(DESTDIR)$(LIB_PREFIX) 755
+ 	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET) 755
+ 	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755
+-	$(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
++#	$(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
+ 	$(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755
+ 	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIB_PREFIX)
+ 	rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a
+@@ -108,7 +108,7 @@
+ 	$(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+ 	$(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+ 	$(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+-	$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
++#	$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
+ 	$(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
+ 
  
- clean:
diff --git a/net/libnet10/pkg-plist b/net/libnet10/pkg-plist
index 91658979404f..212baac7b536 100644
--- a/net/libnet10/pkg-plist
+++ b/net/libnet10/pkg-plist
@@ -7,38 +7,24 @@ include/libnet/libnet-macros.h
 include/libnet/libnet-ospf.h
 include/libnet/libnet-structures.h
 lib/libnet.a
-lib/libpwrite
+lib/libpwrite.a
 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.legacy-applications
-share/doc/libnet/README.libnet-config
-share/doc/libnet/README.linux
-share/doc/libnet/README.rawsockets
 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
+share/doc/libnet/examples/libnet-example-1.c
+share/doc/libnet/examples/libnet-example-2.c
+share/doc/libnet/examples/libnet-example-3.c
+share/doc/libnet/examples/libnet-example-4.c
+share/doc/libnet/ancillary/README.asn.1
+share/doc/libnet/ancillary/README.bpf
+share/doc/libnet/ancillary/README.legacy-applications
+share/doc/libnet/ancillary/README.libnet-config
+share/doc/libnet/ancillary/README.linux
+share/doc/libnet/ancillary/README.rawsockets
+@dirrm share/doc/libnet/ancillary
+@dirrm share/doc/libnet/examples
 @dirrm share/doc/libnet
 @dirrm include/libnet