Upgrade to 1.1.0.

No response from:	maintainer

12 files changed, 44 insertions, 164 deletions

diff --git a/net/libnet/Makefile b/net/libnet/Makefile
index 654b37767513..6453e5379d8e 100644
--- a/net/libnet/Makefile
+++ b/net/libnet/Makefile
@@ -6,35 +6,29 @@
 #
 
 PORTNAME=	libnet
-PORTVERSION=	1.0.2a
+PORTVERSION=	1.1.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
 
 MAINTAINER=	shipley@dis.org
 COMMENT=	A C library for creating IP packets
 
-MAN3=		libnet.3
-
-USE_AUTOCONF=	yes
+USE_AUTOMAKE=	yes
+CONFIGURE_ENV=	ACLOCAL=${ACLOCAL}
 
-WRKSRC=		${WRKDIR}/Libnet-${PORTVERSION}
+WRKSRC=		${WRKDIR}/Libnet-latest
 MAN3=		libnet.3
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/libnet.3 ${PREFIX}/man/man3
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/libnet
-	@${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
+.for i in BUGS CHANGELOG DESIGN_NOTES MIGRATION PACKET_BUILDING PORTED RAWSOCKET_NON_SEQUITUR SUPPORTED_PROTOCOLS TODO
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/libnet
 .endfor
 .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}/example/${i} ${PREFIX}/share/doc/libnet/examples
-.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/libnet/distinfo b/net/libnet/distinfo
index 301a594219c1..e4561c0e44cd 100644
--- a/net/libnet/distinfo
+++ b/net/libnet/distinfo
@@ -1 +1 @@
-MD5 (libnet-1.0.2a.tar.gz) = ddf53f0f484184390e8c2a1bd0853667
+MD5 (libnet-1.1.0.tar.gz) = b46e650d9d0e7ad5ef9439c7cd281922
diff --git a/net/libnet/files/patch-aa b/net/libnet/files/patch-aa
index 57137897cbc7..e3cbfc1d0bfb 100644
--- a/net/libnet/files/patch-aa
+++ b/net/libnet/files/patch-aa
@@ -1,29 +1,11 @@
---- 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
--dnl if test -z $CFLAGS; then 
--    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
--    CFLAGS="$CCOPTS"
--dnl fi
-+    if test -z "$CFLAGS"; then 
-+        CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
-+        CFLAGS="$CCOPTS"
-+    fi
- fi
- 
- 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)
+--- configure.in.orig	Tue Aug  6 07:26:03 2002
++++ configure.in	Mon Mar 17 17:36:47 2003
+@@ -134,7 +134,7 @@
+     AC_DEFINE(LIBNET_BSD_BYTE_SWAP)
+     AC_DEFINE(HAVE_SOCKADDR_SA_LEN)
+     LIBNET_CONFIG_DEFINES="-DLIBNET_BSDISH_OS -DLIBNET_BSD_BYTE_SWAP -DHAVE_SOCKADDR_SA_LEN"
+-    AC_MSG_RESULT(Note: support/bpf-lkm/etherspoof contains the lkm source required to spoof ethernet frames)
++    dnl AC_MSG_RESULT(Note: support/bpf-lkm/etherspoof contains the lkm source required to spoof ethernet frames)
      ln -sf FreeBSD support/bpf-lkm/etherspoof
      ;;
  
diff --git a/net/libnet/files/patch-ab b/net/libnet/files/patch-ab
deleted file mode 100644
index 9106f9921b2a..000000000000
--- a/net/libnet/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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)
- 
- 
diff --git a/net/libnet/files/patch-ac b/net/libnet/files/patch-ac
deleted file mode 100644
index f46b75aa79ca..000000000000
--- a/net/libnet/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/libnet/libnet-functions.h.orig	Fri Jun  7 00:31:29 2002
-+++ include/libnet/libnet-functions.h	Fri Jun  7 00:31:41 2002
-@@ -74,7 +74,7 @@
-     int,                /* severity */
-     char *,             /* error message */
-     ...                 /* varargs */
--    );
-+    ) __printflike(2, 3);
- 
- 
- /*
diff --git a/net/libnet/pkg-plist b/net/libnet/pkg-plist
index 212baac7b536..752a4628880d 100644
--- a/net/libnet/pkg-plist
+++ b/net/libnet/pkg-plist
@@ -1,23 +1,19 @@
-bin/libnet-config
 include/libnet.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
 lib/libnet.a
-lib/libpwrite.a
+share/doc/libnet/BUGS
 share/doc/libnet/CHANGELOG
-share/doc/libnet/CHANGELOG-NEWFUNCTIONS
-share/doc/libnet/COPYING
-share/doc/libnet/README
-share/doc/libnet/TODO-1.0
-share/doc/libnet/TODO-1.1
-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/DESIGN_NOTES
+share/doc/libnet/MIGRATION
+share/doc/libnet/PACKET_BUILDING
+share/doc/libnet/PORTED
+share/doc/libnet/RAWSOCKET_NON_SEQUITUR
+share/doc/libnet/SUPPORTED_PROTOCOLS
+share/doc/libnet/TODO
 share/doc/libnet/ancillary/README.asn.1
 share/doc/libnet/ancillary/README.bpf
 share/doc/libnet/ancillary/README.legacy-applications
@@ -25,6 +21,5 @@ 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
diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile
index 654b37767513..6453e5379d8e 100644
--- a/net/libnet10/Makefile
+++ b/net/libnet10/Makefile
@@ -6,35 +6,29 @@
 #
 
 PORTNAME=	libnet
-PORTVERSION=	1.0.2a
+PORTVERSION=	1.1.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
 
 MAINTAINER=	shipley@dis.org
 COMMENT=	A C library for creating IP packets
 
-MAN3=		libnet.3
-
-USE_AUTOCONF=	yes
+USE_AUTOMAKE=	yes
+CONFIGURE_ENV=	ACLOCAL=${ACLOCAL}
 
-WRKSRC=		${WRKDIR}/Libnet-${PORTVERSION}
+WRKSRC=		${WRKDIR}/Libnet-latest
 MAN3=		libnet.3
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/libnet.3 ${PREFIX}/man/man3
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/libnet
-	@${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
+.for i in BUGS CHANGELOG DESIGN_NOTES MIGRATION PACKET_BUILDING PORTED RAWSOCKET_NON_SEQUITUR SUPPORTED_PROTOCOLS TODO
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/libnet
 .endfor
 .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}/example/${i} ${PREFIX}/share/doc/libnet/examples
-.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/libnet10/distinfo b/net/libnet10/distinfo
index 301a594219c1..e4561c0e44cd 100644
--- a/net/libnet10/distinfo
+++ b/net/libnet10/distinfo
@@ -1 +1 @@
-MD5 (libnet-1.0.2a.tar.gz) = ddf53f0f484184390e8c2a1bd0853667
+MD5 (libnet-1.1.0.tar.gz) = b46e650d9d0e7ad5ef9439c7cd281922
diff --git a/net/libnet10/files/patch-aa b/net/libnet10/files/patch-aa
index 57137897cbc7..e3cbfc1d0bfb 100644
--- a/net/libnet10/files/patch-aa
+++ b/net/libnet10/files/patch-aa
@@ -1,29 +1,11 @@
---- 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
--dnl if test -z $CFLAGS; then 
--    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
--    CFLAGS="$CCOPTS"
--dnl fi
-+    if test -z "$CFLAGS"; then 
-+        CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
-+        CFLAGS="$CCOPTS"
-+    fi
- fi
- 
- 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)
+--- configure.in.orig	Tue Aug  6 07:26:03 2002
++++ configure.in	Mon Mar 17 17:36:47 2003
+@@ -134,7 +134,7 @@
+     AC_DEFINE(LIBNET_BSD_BYTE_SWAP)
+     AC_DEFINE(HAVE_SOCKADDR_SA_LEN)
+     LIBNET_CONFIG_DEFINES="-DLIBNET_BSDISH_OS -DLIBNET_BSD_BYTE_SWAP -DHAVE_SOCKADDR_SA_LEN"
+-    AC_MSG_RESULT(Note: support/bpf-lkm/etherspoof contains the lkm source required to spoof ethernet frames)
++    dnl AC_MSG_RESULT(Note: support/bpf-lkm/etherspoof contains the lkm source 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
deleted file mode 100644
index 9106f9921b2a..000000000000
--- a/net/libnet10/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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)
- 
- 
diff --git a/net/libnet10/files/patch-ac b/net/libnet10/files/patch-ac
deleted file mode 100644
index f46b75aa79ca..000000000000
--- a/net/libnet10/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/libnet/libnet-functions.h.orig	Fri Jun  7 00:31:29 2002
-+++ include/libnet/libnet-functions.h	Fri Jun  7 00:31:41 2002
-@@ -74,7 +74,7 @@
-     int,                /* severity */
-     char *,             /* error message */
-     ...                 /* varargs */
--    );
-+    ) __printflike(2, 3);
- 
- 
- /*
diff --git a/net/libnet10/pkg-plist b/net/libnet10/pkg-plist
index 212baac7b536..752a4628880d 100644
--- a/net/libnet10/pkg-plist
+++ b/net/libnet10/pkg-plist
@@ -1,23 +1,19 @@
-bin/libnet-config
 include/libnet.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
 lib/libnet.a
-lib/libpwrite.a
+share/doc/libnet/BUGS
 share/doc/libnet/CHANGELOG
-share/doc/libnet/CHANGELOG-NEWFUNCTIONS
-share/doc/libnet/COPYING
-share/doc/libnet/README
-share/doc/libnet/TODO-1.0
-share/doc/libnet/TODO-1.1
-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/DESIGN_NOTES
+share/doc/libnet/MIGRATION
+share/doc/libnet/PACKET_BUILDING
+share/doc/libnet/PORTED
+share/doc/libnet/RAWSOCKET_NON_SEQUITUR
+share/doc/libnet/SUPPORTED_PROTOCOLS
+share/doc/libnet/TODO
 share/doc/libnet/ancillary/README.asn.1
 share/doc/libnet/ancillary/README.bpf
 share/doc/libnet/ancillary/README.legacy-applications
@@ -25,6 +21,5 @@ 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