- Update to 1.1.1

- Removed dependency on automake and autoconf
- Use PKGNAMESUFFIX
- Use CONFLICTS to prevent installation over stable version
- Install examples and documentation
- Use DOCSDIR/EXAMPLESDIR
- Reword COMMENT and pkg-descr, add Author tag

PR:		54421
Submitted by:	sergei
Approved by:	maintainer timeout (5 months)

6 files changed, 107 insertions, 57 deletions

diff --git a/net/libnet-devel/Makefile b/net/libnet-devel/Makefile
index 712e8963f49a..654f6d4e4644 100644
--- a/net/libnet-devel/Makefile
+++ b/net/libnet-devel/Makefile
@@ -5,23 +5,34 @@
 # $FreeBSD$
 #
 
-PORTNAME=	libnet-devel
-PORTVERSION=	1.1.0
+PORTNAME=	libnet
+PORTVERSION=	1.1.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
-DISTNAME=	${PORTNAME:S/-devel$//}-${PORTVERSION}
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	smace@freebsd.org
 COMMENT=	A C library for creating IP packets (development version)
 
-WRKSRC=		${WRKDIR}/Libnet-latest
+CONFLICTS=	libnet-1.*
 
-USE_AUTOMAKE=   yes
-USE_AUTOCONF=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-MAN3=		libnet.3
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+DOCS=		README doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING \
+		doc/DESIGN_NOTES doc/MIGRATION doc/PACKET_BUILDING doc/PORTED \
+		doc/RAWSOCKET_NON_SEQUITUR doc/TODO doc/html/*
+EXAMPLES=	sample/*.c
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/libnet-config ${PREFIX}/bin
+	@${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/net/libnet-devel/distinfo b/net/libnet-devel/distinfo
index e4561c0e44cd..06e96516aaee 100644
--- a/net/libnet-devel/distinfo
+++ b/net/libnet-devel/distinfo
@@ -1 +1 @@
-MD5 (libnet-1.1.0.tar.gz) = b46e650d9d0e7ad5ef9439c7cd281922
+MD5 (libnet-1.1.1.tar.gz) = d72d07923bbe7c547b40c55d1a4df79d
diff --git a/net/libnet-devel/files/patch-aa b/net/libnet-devel/files/patch-aa
deleted file mode 100644
index ac6346cb9175..000000000000
--- a/net/libnet-devel/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.in.orig	Mon Aug  5 17:26:03 2002
-+++ configure.in	Tue Jan  7 13:30:32 2003
-@@ -134,8 +134,8 @@
-     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)
--    ln -sf FreeBSD support/bpf-lkm/etherspoof
-+dnl    AC_MSG_RESULT(Note: support/bpf-lkm/etherspoof contains the lkm source required to spoof ethernet frames)
-+dnl    ln -sf FreeBSD support/bpf-lkm/etherspoof
-     ;;
- 
- *netbsd*)
-@@ -219,7 +219,7 @@
- esac
- 
- AC_OUTPUT(Makefile man/Makefile src/Makefile include/Makefile \
--    include/libnet/Makefile sample/Makefile version.h include/libnet.h \
-+    include/libnet/Makefile version.h include/libnet.h \
-     libnet-config, chmod +x libnet-config)
- 
- AC_MSG_RESULT(Please note this is libnet 1.1.x.  Any code written for 1.0.x\
diff --git a/net/libnet-devel/files/patch-ab b/net/libnet-devel/files/patch-ab
deleted file mode 100644
index 0e32083efce1..000000000000
--- a/net/libnet-devel/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.am.orig	Tue Jan  7 13:18:10 2003
-+++ Makefile.am	Tue Jan  7 13:18:14 2003
-@@ -8,6 +8,6 @@
- 
- include $(top_srcdir)/Makefile.am.common
- 
--SUBDIRS = include src man sample
-+SUBDIRS = include src man
- 
- EXTRA_DIST = Makefile.am.common
diff --git a/net/libnet-devel/pkg-descr b/net/libnet-devel/pkg-descr
index 47cc409db578..abe227681c3d 100644
--- a/net/libnet-devel/pkg-descr
+++ b/net/libnet-devel/pkg-descr
@@ -1,23 +1,20 @@
-Libnet  A C library for portable packet creation (development version)
+Libnet is a high-level API (toolkit) allowing the application programmer to
+construct and inject network packets. It provides a portable and simplified
+interface for low-level network packet shaping, handling and injection.
 
-domains of sockets and protocols.
-
-A C library for portable packet creation 
-
-Included are also simple example test programs
-
-Libnet is a collection of routines to help with the construction
-and handling of network packets. It provides a portable framework
-for low-level network packet writing and handling.
+Libnet hides much of the tedium of packet creation from the application
+programmer such as multiplexing, buffer management, arcane packet header
+information, byte-ordering, OS-dependent issues, and much more.
 
 Libnet features portable packet creation interfaces at the IP layer
 and link layer, as well as a host of supplementary and complementary
 functionality.
 
-WWW: http://www.packetfactory.net/projects/libnet/
+Using libnet, quick and simple packet assembly applications can be whipped up
+with little effort.  With a bit more time, more complex programs can be written
+(Traceroute and ping were easily rewritten using libnet and libpcap).
+
+Libnet is distrubuted under the BSD license.
 
-*NOTE*
-Libnet 1.1.x API is not compatible with earlier Libnet 1.0.x.
-This port serves as a development tool to aid in porting applications
-to the new API.
-*NOTE*
+Author:	Mike D. Schiffman <mike at infonexus dot com>
+WWW:	http://www.packetfactory.net/projects/libnet/
diff --git a/net/libnet-devel/pkg-plist b/net/libnet-devel/pkg-plist
index 5ae772ab85c3..c7411cb7ba2e 100644
--- a/net/libnet-devel/pkg-plist
+++ b/net/libnet-devel/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/libnet-config
 include/libnet.h
 include/libnet/libnet-asn1.h
@@ -5,5 +6,78 @@ include/libnet/libnet-functions.h
 include/libnet/libnet-headers.h
 include/libnet/libnet-macros.h
 include/libnet/libnet-structures.h
-lib/libnet.a
+include/libnet/libnet-types.h
 @dirrm include/libnet
+lib/libnet.a
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIB
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/DESIGN_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/MIGRATION
+%%PORTDOCS%%%%DOCSDIR%%/PACKET_BUILDING
+%%PORTDOCS%%%%DOCSDIR%%/PORTED
+%%PORTDOCS%%%%DOCSDIR%%/RAWSOCKET_NON_SEQUITUR
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/acconfig_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/bpf_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/config_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/files.html
+%%PORTDOCS%%%%DOCSDIR%%/getopt_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/globals_func.html
+%%PORTDOCS%%%%DOCSDIR%%/gnuc_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/ifaddrlist_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/in__systm_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-asn1_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-functions_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-functions_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-headers_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-macros_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-structures_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-types_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet_8h-source.html
+%%EXAMPLESDIR%%/arp.c
+%%EXAMPLESDIR%%/bgp4_hdr.c
+%%EXAMPLESDIR%%/bgp4_notification.c
+%%EXAMPLESDIR%%/bgp4_open.c
+%%EXAMPLESDIR%%/bgp4_update.c
+%%EXAMPLESDIR%%/cdp.c
+%%EXAMPLESDIR%%/dhcp_discover.c
+%%EXAMPLESDIR%%/dns.c
+%%EXAMPLESDIR%%/dot1x.c
+%%EXAMPLESDIR%%/fddi_tcp1.c
+%%EXAMPLESDIR%%/fddi_tcp2.c
+%%EXAMPLESDIR%%/get_addr.c
+%%EXAMPLESDIR%%/gre.c
+%%EXAMPLESDIR%%/icmp6_echoreq.c
+%%EXAMPLESDIR%%/icmp_echo_cq.c
+%%EXAMPLESDIR%%/icmp_redirect.c
+%%EXAMPLESDIR%%/icmp_timeexceed.c
+%%EXAMPLESDIR%%/icmp_timestamp.c
+%%EXAMPLESDIR%%/icmp_unreach.c
+%%EXAMPLESDIR%%/ieee.c
+%%EXAMPLESDIR%%/ip.c
+%%EXAMPLESDIR%%/isl.c
+%%EXAMPLESDIR%%/mpls.c
+%%EXAMPLESDIR%%/ntp.c
+%%EXAMPLESDIR%%/ospf_hello.c
+%%EXAMPLESDIR%%/ospf_lsa.c
+%%EXAMPLESDIR%%/ping_of_death.c
+%%EXAMPLESDIR%%/rpc_tcp.c
+%%EXAMPLESDIR%%/rpc_udp.c
+%%EXAMPLESDIR%%/smurf.c
+%%EXAMPLESDIR%%/stp.c
+%%EXAMPLESDIR%%/synflood.c
+%%EXAMPLESDIR%%/synflood6.c
+%%EXAMPLESDIR%%/tcp1.c
+%%EXAMPLESDIR%%/tcp2.c
+%%EXAMPLESDIR%%/tring_tcp1.c
+%%EXAMPLESDIR%%/tring_tcp2.c
+%%EXAMPLESDIR%%/udp1.c
+%%EXAMPLESDIR%%/udp2.c
+@dirrm %%EXAMPLESDIR%%