4 files changed, 18 insertions, 18 deletions

diff --git a/net/libnet/Makefile b/net/libnet/Makefile
index 3aa3ba861b7f..bff6eb8d6488 100644
--- a/net/libnet/Makefile
+++ b/net/libnet/Makefile
@@ -13,7 +13,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A C library for creating IP packets
 
 LATEST_LINK=	${PORTNAME}${SHORT_VER}
-NO_STAGE=	yes
 
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
@@ -29,7 +28,6 @@ EXAMPLESDIR=	${PREFIX}/share/examples/${SHORT_NAME}
 USE_LDCONFIG=	${PREFIX}/lib/${SHORT_NAME}
 PLIST_SUB=	SVER=${SHORT_VER} SNAME=${SHORT_NAME} VERSION=${PORTVERSION}
 
-MAN3=		libnet-functions.h.3 libnet-macros.h.3 libnet.h.3
 DOCS=		README doc/CHANGELOG doc/CONTRIB doc/COPYING \
 		doc/DESIGN_NOTES doc/MIGRATION doc/PACKET_BUILDING doc/PORTED \
 		doc/RAWSOCKET_NON_SEQUITUR doc/TODO
@@ -60,17 +58,17 @@ post-patch:
 		${WRKSRC}/src/Makefile.in
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/libnet-config ${PREFIX}/bin/${SHORT_NAME}-config
-	@cd ${PREFIX}/lib && \
+	${INSTALL_SCRIPT} ${WRKSRC}/libnet-config ${STAGEDIR}${PREFIX}/bin/${SHORT_NAME}-config
+	@cd ${STAGEDIR}${PREFIX}/lib && \
 		${LN} -sf ${SHORT_NAME}/libnet.so libnet-${PORTVERSION}.so.8 && \
 		${LN} -sf libnet-${PORTVERSION}.so.8 libnet-${PORTVERSION}.so
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/libnet/pkg-plist b/net/libnet/pkg-plist
index f6f3c622a014..1cf0189bd2ea 100644
--- a/net/libnet/pkg-plist
+++ b/net/libnet/pkg-plist
@@ -12,6 +12,9 @@ lib/%%SNAME%%/libnet.so
 lib/%%SNAME%%/libnet.so.8
 lib/libnet-%%VERSION%%.so
 lib/libnet-%%VERSION%%.so.8
+man/man3/libnet-functions.h.3.gz
+man/man3/libnet-macros.h.3.gz
+man/man3/libnet.h.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIB
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile
index 7fc023c483e7..640485913647 100644
--- a/net/libnet10/Makefile
+++ b/net/libnet10/Makefile
@@ -14,8 +14,6 @@ PKGNAMESUFFIX=	10
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A C library for creating IP packets
 
-NO_STAGE=	yes
-
 CFLAGS+=	-fPIC
 
 USE_AUTOTOOLS=	autoconf
@@ -23,7 +21,7 @@ WRKSRC=		${WRKDIR}/Libnet-${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 MAN3=		libnet${PKGNAMESUFFIX}.3
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's|bpf0|null|' ${WRKSRC}/configure
@@ -33,18 +31,18 @@ post-patch:
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/libnet.3 \
-		${MANPREFIX}/man/man3/libnet${PKGNAMESUFFIX}.3
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/ancillary ${DOCSDIR}/examples
+		${STAGEDIR}${MANPREFIX}/man/man3/libnet${PKGNAMESUFFIX}.3
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/ancillary ${STAGEDIR}${DOCSDIR}/examples
 .for i in CHANGELOG CHANGELOG-NEWFUNCTIONS COPYING README TODO-1.0 TODO-1.1
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}/
 .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} ${DOCSDIR}/ancillary
+	${INSTALL_DATA} ${WRKSRC}/doc/Ancillary/${i} ${STAGEDIR}${DOCSDIR}/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} ${DOCSDIR}/examples
+	${INSTALL_DATA} ${WRKSRC}/example/${i} ${STAGEDIR}${DOCSDIR}/examples/
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/libnet10/pkg-plist b/net/libnet10/pkg-plist
index 50e22574bac5..c60efade59e6 100644
--- a/net/libnet10/pkg-plist
+++ b/net/libnet10/pkg-plist
@@ -8,6 +8,7 @@ include/libnet10/libnet/libnet-ospf.h
 include/libnet10/libnet/libnet-structures.h
 lib/libnet10/libnet.a
 lib/libnet10/libpwrite.a
+man/man3/libnet10.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG-NEWFUNCTIONS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING