Make this work and de-install properly with perl5 + perl5-current.

Include code in the Makefile to show how to use the installed .packlist
to dynamically generate a PLIST for this package.  I couldn't use the
solution proposed on tech-pkg since eperl installed some stuff in
${PERL5_SITELIB} under perl-5.00404, but in ${PERL_SITEARCH} under
perl-5.6.0.  I imagine other modules will also show this difficulty
since the Makefile for eperl was generated by ExtUtils::MakeMaker, so I
think the .packlist way is the right thing to do.

5 files changed, 100 insertions, 15 deletions

diff --git a/textproc/eperl/Makefile b/textproc/eperl/Makefile
index bb747538de5..74429685ff7 100644
--- a/textproc/eperl/Makefile
+++ b/textproc/eperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/12/05 16:14:53 tv Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/15 01:12:15 jlam Exp $
 #
 
 DISTNAME=	eperl-2.2.14
@@ -8,15 +8,46 @@ MASTER_SITES=	http://www.engelschall.com/sw/eperl/distrib/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.engelschall.com/sw/eperl/
 
-DEPENDS=	libperl-5.00404:../../lang/libperl
+BUILD_DEPENDS+=	autoreconf:../../devel/autoconf
+DEPENDS=	libperl-5.*:../../lang/libperl
 
-GNU_CONFIGURE=	yes
+USE_PERL5=	# defined
+PERL=		${LOCALBASE}/bin/perl
+
+GNU_CONFIGURE=	# defined
 ALL_TARGET=	all libeperl.a
 
+PLIST_SRC=	${WRKDIR}/.PLIST_SRC
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf
+
 post-build:
-	@cd ${WRKSRC}/mod/Parse && ${PREFIX}/bin/perl Makefile.PL && ${MAKE}
+	cd ${WRKSRC}/mod/Parse && ${PERL} Makefile.PL && ${MAKE}
 
 post-install:
-	@cd ${WRKSRC}/mod/Parse && ${MAKE} 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,${LOCALBASE}/,," \
+		| 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,${LOCALBASE}/,," \
+		| ${SED} -e "s,/[^/]*$$,," | sort -ur \
+		| ${SED} -e "s,^,@unexec rmdir -p %D/," \
+		| ${SED} -e "s,$$, 2>/dev/null || true," \
+		>> ${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
+
+P5_SITEARCH!=	eval `${PERL} -V:installsitearch`; echo $${installsitearch}
+P5_PACKLIST=	${P5_SITEARCH}/auto/Parse/ePerl/.packlist
diff --git a/textproc/eperl/files/patch-sum b/textproc/eperl/files/patch-sum
index 8fb53a80a00..2ba8458ed94 100644
--- a/textproc/eperl/files/patch-sum
+++ b/textproc/eperl/files/patch-sum
@@ -1,3 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:12 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/15 01:12:16 jlam Exp $
 
 MD5 (patch-aa) = 263d674032944399a2b843242245d1a5
+MD5 (patch-ab) = 2cbc783b0bfd8f05c32eef30ac34e2a2
+MD5 (patch-ac) = 82c888efe0f1e301e13a47f3f0c733b5
diff --git a/textproc/eperl/patches/patch-ab b/textproc/eperl/patches/patch-ab
new file mode 100644
index 00000000000..d42be0fdac9
--- /dev/null
+++ b/textproc/eperl/patches/patch-ab
@@ -0,0 +1,44 @@
+$NetBSD: patch-ab,v 1.1 2000/08/15 01:12:16 jlam Exp $
+
+--- configure.in.orig	Wed Dec 31 03:22:16 1997
++++ configure.in	Sat Aug 12 04:26:23 2000
+@@ -42,7 +42,7 @@
+ AC_ARG_WITH(perl,dnl
+ [  --with-perl=PATH        force the usage of a specific installed Perl],
+ perlprog=$with_perl
+-perlvers=`$perlprog -v | grep version | sed -e 's/.* version //' -e 's/ built.*//' -e 's/ with.*//'`
++perlvers=`$perlprog -v | grep "This is perl" | sed -e 's/.* version //' -e 's/.* v//' -e 's/ built.*//' -e 's/ with.*//'`
+ ,
+ TMPFILE=/tmp/x.$$
+ rm -f $TMPFILE
+@@ -53,7 +53,7 @@
+          if test -f "$dir/$perl"; then
+              if test -x "$dir/$perl"; then
+                  perl="$dir/$perl"
+-                 version=`$perl -v | grep version | sed -e 's/.* version //' -e 's/ built.*//' -e 's/ with.*//'`
++                 version=`$perl -v | grep "This is perl" | sed -e 's/.* version //' -e 's/.* v//' -e 's/ built.*//' -e 's/ with.*//'`
+                  versionnum="`echo $version | sed -e 's/\.//g' -e 's/_//g'`"
+                  versionnum=`expr $versionnum - $c`
+                  echo "$versionnum $version $perl" >>$TMPFILE
+@@ -69,7 +69,7 @@
+ PATH_PERL=$perlprog
+ AC_MSG_RESULT([$perlprog v$perlvers])
+ case $perlvers in
+-    5.003* | 5.004* | 5.005* | 5.006* )
++    5.003* | 5.004* | 5.005* | 5.006* | 5.[[1-9]]* )
+         ;;
+     * ) echo ""
+         echo "Latest Perl found on your system is $perlvers,"
+@@ -86,6 +86,12 @@
+ 	    perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/_//'` ;; 
+     5.00[[3-6]] ) 
+ 	    perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/$/00/'` ;; 
++    5.[[1-9]].[[0-9]][[0-9]] )
++	    perlvnum=`echo $perlvers | sed -e 's/\./10/' -e 's/\.//'` ;;
++    5.[[1-9]].[[0-9]] )
++	    perlvnum=`echo $perlvers | sed -e 's/\./10/' -e 's/\./0/'` ;;
++    5.[[1-9]] )
++	    perlvnum=`echo $perlvers | sed -e 's/\./10/' -e 's/$/00/'` ;;
+ 	* ) 
+ 	    perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/_//'` ;; 
+ esac
diff --git a/textproc/eperl/patches/patch-ac b/textproc/eperl/patches/patch-ac
new file mode 100644
index 00000000000..14aee26c91f
--- /dev/null
+++ b/textproc/eperl/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2000/08/15 01:12:16 jlam Exp $
+
+--- eperl_perl5.c.orig	Sun Aug  2 10:33:55 1998
++++ eperl_perl5.c	Sat Aug 12 04:34:39 2000
+@@ -39,6 +39,11 @@
+ #include "eperl_perl5_sm.h"
+ #include "eperl_proto.h"
+ 
++#if AC_perl_vnum >= 510600
++#define PERL_POLLUTE 1
++#include <embedvar.h>		/* declaration of curstash */
++#endif
++
+ #ifdef HAVE_PERL_DYNALOADER
+ 
+ extern void boot_DynaLoader _((CV* cv));
diff --git a/textproc/eperl/pkg/PLIST b/textproc/eperl/pkg/PLIST
index 748810fd055..6647522e810 100644
--- a/textproc/eperl/pkg/PLIST
+++ b/textproc/eperl/pkg/PLIST
@@ -1,11 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 1999/04/08 18:51:58 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/08/15 01:12:16 jlam Exp $
 bin/eperl
-lib/perl5/man/man3/Parse::ePerl.3
-lib/perl5/site_perl/Parse/ePerl.pm
-lib/perl5/site_perl/auto/Parse/ePerl/autosplit.ix
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Parse/ePerl/.packlist
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Parse/ePerl/ePerl.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Parse/ePerl/ePerl.so
 man/man1/eperl.1
 share/eperl/00README
 share/eperl/demo.cgipm.iphtml
@@ -32,6 +26,4 @@ share/eperl/demo.table.iphtml
 share/eperl/demo.table.phtml
 share/eperl/demo.text.iphtml
 share/eperl/demo.text.phtml
-@dirrm lib/perl5/site_perl/auto/Parse/ePerl
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Parse/ePerl
 @dirrm share/eperl