Index: head/net/libnet/Makefile
===================================================================
--- head/net/libnet/Makefile	(revision 361797)
+++ head/net/libnet/Makefile	(revision 361798)
@@ -1,71 +1,60 @@
 # Created by: shipley@dis.org
 # $FreeBSD$
 
 PORTNAME=	libnet
 PORTVERSION=	1.1.6
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF/libnet-dev
-MASTER_SITE_SUBDIR=	distfiles
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	C library for creating IP packets
 
-USES=		libtool
-USE_LDCONFIG=	yes
-USE_CSTD=	gnu89
+LICENSE=	BSD2CLAUSE
+
+OPTIONS_DEFINE=	BPF DOCS EXAMPLES
+OPTIONS_DEFAULT=BPF
+BPF_DESC=	link layer bpf
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-link-layer=${LIBNET_LINK}
 INSTALL_TARGET=	install-strip
+USE_CSTD=	gnu89
+USE_LDCONFIG=	yes
+USES=		libtool
 
-SHORT_VER=	11
-SHORT_NAME=	${PORTNAME}${SHORT_VER}
+SHORT_NAME=	${PORTNAME}11
 DOCSDIR=	${PREFIX}/share/doc/${SHORT_NAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${SHORT_NAME}
 USE_LDCONFIG=	${PREFIX}/lib/${SHORT_NAME}
-PLIST_SUB=	SVER=${SHORT_VER} SNAME=${SHORT_NAME} VERSION=${PORTVERSION}
+PLIST_SUB=	SNAME=${SHORT_NAME} VERSION=${PORTVERSION}
 
 DOCS=		README doc/CHANGELOG doc/CONTRIB doc/COPYING \
 		doc/DESIGN_NOTES doc/MIGRATION doc/PACKET_BUILDING doc/PORTED \
 		doc/RAWSOCKET_NON_SEQUITUR doc/TODO
 EXAMPLES=	sample/*.c
 
-OPTIONS_DEFINE=	EXAMPLES DOCS BPF
-OPTIONS_DEFAULT=	BPF
-BPF_DESC=	link layer bpf
+BPF_CONFIGURE_OFF=	--with-link-layer=none
+BPF_CONFIGURE_ON=	--with-link-layer=bpf
 
-.include <bsd.port.options.mk>
-
-LIBNET_LINK=	none
-
-.if ${PORT_OPTIONS:MBPF}
-LIBNET_LINK=	bpf
-.endif
-
 post-patch:
-	${REINPLACE_CMD} \
-	 -e 's|@LIBNET_CONFIG_LIBS@|@LIBNET_CONFIG_LIBS@ -L@prefix@/lib/${SHORT_NAME}|' \
-	 -e 's|@LIBNET_CONFIG_CFLAGS@|@LIBNET_CONFIG_CFLAGS@ -I@prefix@/include/${SHORT_NAME}|' \
-		${WRKSRC}/libnet-config.in
-	${REINPLACE_CMD} -e 's|^includedir =.*|includedir = @includedir@/${SHORT_NAME}|' \
+	@${REINPLACE_CMD} \
+		 -e 's|@LIBNET_CONFIG_LIBS@|@LIBNET_CONFIG_LIBS@ -L@prefix@/lib/${SHORT_NAME}|' \
+		 -e 's|@LIBNET_CONFIG_CFLAGS@|@LIBNET_CONFIG_CFLAGS@ -I@prefix@/include/${SHORT_NAME}|' \
+			${WRKSRC}/libnet-config.in
+	@${REINPLACE_CMD} -e 's|^includedir =.*|includedir = @includedir@/${SHORT_NAME}|' \
 		${WRKSRC}/include/Makefile.in \
 		${WRKSRC}/include/libnet/Makefile.in
-	${REINPLACE_CMD} -e 's|^libdir =.*|libdir = @libdir@/${SHORT_NAME}|' \
+	@${REINPLACE_CMD} -e 's|^libdir =.*|libdir = @libdir@/${SHORT_NAME}|' \
 		-e 's|^libnet_la_LDFLAGS =\(.*\)|libnet_la_LDFLAGS =\1 -soname=libnet-${SHORT_NAME}.so.1|' \
 		${WRKSRC}/src/Makefile.in
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/libnet-config ${STAGEDIR}${PREFIX}/bin/${SHORT_NAME}-config
-	@cd ${STAGEDIR}${PREFIX}/lib && \
-		${LN} -sf ${SHORT_NAME}/libnet-${PORTVERSION}.so.1
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
-.endif
+	${LN} -fs ${SHORT_NAME}/libnet.so.1 ${STAGEDIR}${PREFIX}/lib/libnet-${PORTVERSION}.so.1
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
Index: head/net/libnet/pkg-descr
===================================================================
--- head/net/libnet/pkg-descr	(revision 361797)
+++ head/net/libnet/pkg-descr	(revision 361798)
@@ -1,19 +1,18 @@
 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.
 
 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.
 
 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 distributed under the BSD license.
-
-WWW: http://www.packetfactory.net/projects/libnet/
+WWW: http://sourceforge.net/projects/libnet-dev/
+WWW: https://github.com/sam-github/libnet