Convert packages to use PERL5_PACKLIST (part 1). These were the easy

ones to do, and each compiled and installed/de-installed apparently
correctly.

As a side effect of the dynamic PLIST, we no longer need to have separate
-static and -shared PLISTs.  It's now easier than ever to make a perl5
package for NetBSD :)

2 files changed, 6 insertions, 30 deletions

diff --git a/textproc/eperl/Makefile b/textproc/eperl/Makefile
index cbd7fbf7a3f..da71e49c84b 100644
--- a/textproc/eperl/Makefile
+++ b/textproc/eperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/08/24 08:20:44 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/27 07:11:21 jlam Exp $
 #
 
 DISTNAME=	eperl-2.2.14
@@ -12,42 +12,19 @@ BUILD_DEPENDS+=	autoreconf:../../devel/autoconf
 DEPENDS=	libperl-5.*:../../lang/libperl
 
 USE_PERL5=	# defined
-PERL=		${LOCALBASE}/bin/perl
-P5_PACKLIST=	${P5_SITEARCH}/auto/Parse/ePerl/.packlist
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Parse/ePerl/.packlist
 
 GNU_CONFIGURE=	# defined
 ALL_TARGET=	all libeperl.a
 
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-
 pre-configure:
 	cd ${WRKSRC} && autoreconf
 
 post-build:
-	cd ${WRKSRC}/mod/Parse && ${PERL} Makefile.PL && ${MAKE}
+	cd ${WRKSRC}/mod/Parse; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+	cd ${WRKSRC}/mod/Parse; ${MAKE_PROGRAM}
 
 post-install:
-	cd ${WRKSRC}/mod/Parse && ${MAKE} install
-	${RM} -f ${PLIST_SRC}
-	${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC}
-	#
-	# Add the installed files to the PLIST.
-	#
-	( ${CAT} ${P5_PACKLIST}; for f in ${P5_PACKLIST}; do echo $$f; done ) \
-		| ${SED} -e "s,/./,/,g" -e "s,${PREFIX}/,," \
-		| sort -u \
-		>> ${PLIST_SRC}
-	#
-	# We're not sure which directories are empty and can be deleted, so
-	# try them all, but ignore failures.
-	#
-	( ${CAT} ${P5_PACKLIST}; for f in ${P5_PACKLIST}; do echo $$f; done ) \
-		| ${SED} -e "s,/./,/,g" -e "s,${PREFIX}/,," \
-			-e "s,^,@unexec rmdir -p %D/," \
-			-e "s,/[^/]*$$, 2>/dev/null || true," \
-		| sort -ur \
-		>> ${PLIST_SRC}
+	cd ${WRKSRC}/mod/Parse; ${MAKE_PROGRAM} install
 
 .include "../../mk/bsd.pkg.mk"
-
-P5_SITEARCH!=	eval `${PERL} -V:installsitearch`; echo $${installsitearch}
diff --git a/textproc/eperl/pkg/PLIST b/textproc/eperl/pkg/PLIST
index 952655cf689..94879fe2a3b 100644
--- a/textproc/eperl/pkg/PLIST
+++ b/textproc/eperl/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/08/24 08:20:44 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/08/27 07:11:21 jlam Exp $
 bin/eperl
 man/man1/eperl.1
 share/eperl/00README
@@ -27,4 +27,3 @@ share/eperl/demo.table.phtml
 share/eperl/demo.text.iphtml
 share/eperl/demo.text.phtml
 @dirrm share/eperl
-@comment The following lines are automatically generated from the .packlist files.