Install documentation in canonical pkgsrc directories.

Use static PLIST.
Get ride of share/examples/libnet symlink handling in PLIST by '@.*exec'
symbolic link in PLIST are just fine.

Bump PKGREVISION.

2 files changed, 28 insertions, 17 deletions

diff --git a/devel/libnet/Makefile b/devel/libnet/Makefile
index c4a6e3addbe..a9f81e7f1cc 100644
--- a/devel/libnet/Makefile
+++ b/devel/libnet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:31:37 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/08/31 10:08:24 seb Exp $
 #
 
 DISTNAME=	libnet-1.0.1b
-PKGREVISION=	1
+PKGREVISION=	2
 WRKSRC=		${WRKDIR}/${DISTNAME:C/l/L/}
 CATEGORIES=	devel net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
@@ -18,22 +18,14 @@ GNU_CONFIGURE=	# defined
 CONFIGURE_ENV+=	LIBNET_CONFIG_CFLAGS="-I${PREFIX}/include" \
 		LIBNET_CONFIG_LIBS="${LDFLAGS}"
 
-PLIST_SRC=	${WRKDIR}/PLIST
-DOCDIR=		share/doc/libnet
-
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}/doc
 
 post-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libnet
-	@(cd ${WRKSRC}/doc/html; ${GTAR} cf - *.html *.gif */*.c | \
-		(cd ${PREFIX}/${DOCDIR};${GTAR} xf -))
-	@${LN} -s ${PREFIX}/share/doc/libnet/examples \
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/libnet
+	@cd ${WRKSRC}/doc/html && ${PAX} -rw *.html *.gif */*.c	\
+		${PREFIX}/share/doc/html/libnet
+	@${LN} -s ${PREFIX}/share/doc/html/libnet/examples \
 		${PREFIX}/share/examples/libnet
-	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	@(cd ${PREFIX};	\
-	  ${FIND} ${DOCDIR} -type f >> ${PLIST_SRC}; \
-	  ${FIND} ${DOCDIR} -type d| ${SED} -e 's|^|@dirrm |' | ${SORT} -r \
-		>> ${PLIST_SRC})
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libnet/PLIST b/devel/libnet/PLIST
index e778e29f1c7..4e7146a24ae 100644
--- a/devel/libnet/PLIST
+++ b/devel/libnet/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:35 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/08/31 10:08:24 seb Exp $
 bin/libnet-config
 include/libnet.h
 include/libnet/libnet-asn1.h
@@ -13,6 +13,25 @@ lib/libnet.so
 lib/libnet.so.1
 lib/libnet.so.1.0
 man/man3/libnet.3
-@exec ln -s %D/share/doc/libnet/examples %D/share/examples/libnet
-@unexec ${RM} %D/share/examples/libnet
+share/doc/html/libnet/1.html
+share/doc/html/libnet/2.html
+share/doc/html/libnet/3.html
+share/doc/html/libnet/4.html
+share/doc/html/libnet/5.html
+share/doc/html/libnet/6.html
+share/doc/html/libnet/7.html
+share/doc/html/libnet/contrib.html
+share/doc/html/libnet/examples/libnet-example-1.c
+share/doc/html/libnet/examples/libnet-example-2.c
+share/doc/html/libnet/examples/libnet-example-3.c
+share/doc/html/libnet/examples/libnet-example-4.c
+share/doc/html/libnet/fig-3a.gif
+share/doc/html/libnet/figure-1.gif
+share/doc/html/libnet/figure-2.gif
+share/doc/html/libnet/figure-3.gif
+share/doc/html/libnet/figure-3a.gif
+share/doc/html/libnet/lrm.html
+share/examples/libnet
+@dirrm share/doc/html/libnet/examples
+@dirrm share/doc/html/libnet
 @dirrm include/libnet