Update for perl version 5.00501. Requires latest bsd.port.mk. I'm

going to be a little verbose here about the changes so people who fix
up the rest of the stuff can have an idea what to do.

(1) Manpages are moved to version-specific subdirectories.  Since they
    are all defined in MAN? macros, I just needed to add
    ${PERL_VERSION} to the end of MAN*PREFIX and delete them from the
    PLIST.

(2) Most of the module files are moved to version-specific
    subdirectories.  This is usually accomplished by adding
    "%%PERL_VER%%/" right after "site_perl/" in the PLIST.  However,
    some things didn't move, and some moved more than one level (like,
    all the way into "site_perl/%%PERL_VER%%/auto/FooBar") so some
    fishing, err, find'ing was necessary.

(3) Fix up dependencies.  See (2) above.

(4) While I was there, I changed some "@dirrm foobar"'s to "@unexec
    rmdir %D/foobar 2>/dev/null || true", so there won't be any
    warnings if a directory can't be removed due to other modules
    sharing it.

Now all of devel/p5-* will install and deinstall without a single
warning.  I hope others will follow suit. :)

2 files changed, 25 insertions, 31 deletions

diff --git a/devel/p5-Filter/Makefile b/devel/p5-Filter/Makefile
index c3b8eb49539a..8b448d27ab15 100644
--- a/devel/p5-Filter/Makefile
+++ b/devel/p5-Filter/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 26th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/27 01:37:45 jfitz Exp $
+# $Id: Makefile,v 1.2 1998/02/18 18:21:36 vanilla Exp $
 #
 
 DISTNAME=	Filter-1.14
@@ -16,7 +16,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 USE_PERL5=	YES
 
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Filter::Util::Call.3 Filter::Util::Exec.3 Filter::cpp.3 \
 		Filter::decrypt.3 Filter::exec.3 Filter::sh.3 Filter::tee.3
 
diff --git a/devel/p5-Filter/pkg-plist b/devel/p5-Filter/pkg-plist
index 671360522481..970c7bf6ad1b 100644
--- a/devel/p5-Filter/pkg-plist
+++ b/devel/p5-Filter/pkg-plist
@@ -1,29 +1,23 @@
-lib/perl5/man/man3/Filter::Util::Call.3.gz
-lib/perl5/man/man3/Filter::Util::Exec.3.gz
-lib/perl5/man/man3/Filter::cpp.3.gz
-lib/perl5/man/man3/Filter::decrypt.3.gz
-lib/perl5/man/man3/Filter::exec.3.gz
-lib/perl5/man/man3/Filter::sh.3.gz
-lib/perl5/man/man3/Filter::tee.3.gz
-lib/perl5/site_perl/Filter/Util/Call.pm
-lib/perl5/site_perl/Filter/Util/Exec.pm
-lib/perl5/site_perl/Filter/cpp.pm
-lib/perl5/site_perl/Filter/decrypt.pm
-lib/perl5/site_perl/Filter/exec.pm
-lib/perl5/site_perl/Filter/sh.pm
-lib/perl5/site_perl/Filter/tee.pm
-lib/perl5/site_perl/i386-freebsd/auto/Filter/Util/Call/Call.bs
-lib/perl5/site_perl/i386-freebsd/auto/Filter/Util/Call/Call.so
-lib/perl5/site_perl/i386-freebsd/auto/Filter/Util/Exec/Exec.bs
-lib/perl5/site_perl/i386-freebsd/auto/Filter/Util/Exec/Exec.so
-lib/perl5/site_perl/i386-freebsd/auto/Filter/decrypt/decrypt.bs
-lib/perl5/site_perl/i386-freebsd/auto/Filter/decrypt/decrypt.so
-lib/perl5/site_perl/i386-freebsd/auto/Filter/tee/tee.bs
-lib/perl5/site_perl/i386-freebsd/auto/Filter/tee/tee.so
-lib/perl5/site_perl/i386-freebsd/auto/Filter/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Filter/Util/Call
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Filter/Util/Exec
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Filter/Util
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Filter/decrypt
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Filter/tee
-@dirrm lib/perl5/site_perl/Filter/Util
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/Util/Call.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/Util/Exec.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/cpp.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/decrypt.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/exec.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/sh.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/tee.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Call/Call.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Call/Call.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Exec/Exec.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Exec/Exec.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/decrypt/decrypt.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/decrypt/decrypt.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/tee/tee.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/tee/tee.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Call
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Exec
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/decrypt
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/tee
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/Util
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter