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, 20 insertions, 22 deletions

diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index 5f02e516fb03..df29c098209c 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -3,7 +3,7 @@
 # Date created:				July 7th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.9 1998/06/26 01:41:19 asami Exp $
+# $Id: Makefile,v 1.10 1998/06/26 11:50:40 vanilla Exp $
 #
 
 DISTNAME=	Storable-0.6@2
@@ -16,7 +16,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 USE_PERL5=	YES
 
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Storable.3
 
 do-configure:
diff --git a/devel/p5-Storable/pkg-plist b/devel/p5-Storable/pkg-plist
index b41e5fa60917..7f381228d9a0 100644
--- a/devel/p5-Storable/pkg-plist
+++ b/devel/p5-Storable/pkg-plist
@@ -1,20 +1,18 @@
-lib/perl5/man/man3/Storable.3.gz
-lib/perl5/site_perl/Storable.pm
-lib/perl5/site_perl/auto/Storable/_freeze.al
-lib/perl5/site_perl/auto/Storable/_store.al
-lib/perl5/site_perl/auto/Storable/_store_fd.al
-lib/perl5/site_perl/auto/Storable/autosplit.ix
-lib/perl5/site_perl/auto/Storable/freeze.al
-lib/perl5/site_perl/auto/Storable/nfreeze.al
-lib/perl5/site_perl/auto/Storable/nstore.al
-lib/perl5/site_perl/auto/Storable/nstore_fd.al
-lib/perl5/site_perl/auto/Storable/retrieve.al
-lib/perl5/site_perl/auto/Storable/retrieve_fd.al
-lib/perl5/site_perl/auto/Storable/store.al
-lib/perl5/site_perl/auto/Storable/store_fd.al
-lib/perl5/site_perl/auto/Storable/thaw.al
-lib/perl5/site_perl/i386-freebsd/auto/Storable/Storable.bs
-lib/perl5/site_perl/i386-freebsd/auto/Storable/Storable.so
-lib/perl5/site_perl/i386-freebsd/auto/Storable/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Storable
-@dirrm lib/perl5/site_perl/auto/Storable
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Storable.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/_freeze.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/_store.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/_store_fd.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/freeze.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/nfreeze.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/nstore.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/nstore_fd.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/retrieve.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/retrieve_fd.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/store.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/store_fd.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/thaw.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/Storable.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/Storable.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable