6 files changed, 86 insertions, 94 deletions

diff --git a/databases/p5-DBI-137/Makefile b/databases/p5-DBI-137/Makefile
index deef08f41545..055f38f12f57 100644
--- a/databases/p5-DBI-137/Makefile
+++ b/databases/p5-DBI-137/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	DBI
-PORTVERSION=	1.34
-PORTREVISION=	1
+PORTVERSION=	1.35
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBI
@@ -16,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	The perl5 Database Interface.  Required for DBD::* modules
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/RPC/PlServer.pm:${PORTSDIR}/net/p5-PlRPC
+BUILD_DEPENDS=	${SITE_PERL}/RPC/PlServer.pm:${PORTSDIR}/net/p5-PlRPC
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
@@ -33,7 +32,6 @@ MAN3=		Bundle::DBI.3 \
 		DBI::DBD.3 \
 		DBI::DBD::Metadata.3 \
 		DBI::FAQ.3 \
-		DBI::Format.3 \
 		DBI::Profile.3 \
 		DBI::ProfileData.3 \
 		DBI::ProfileDumper.3 \
@@ -42,6 +40,5 @@ MAN3=		Bundle::DBI.3 \
 		DBI::PurePerl.3 \
 		DBI::W32ODBC.3 \
 		Win32::DBIODBC.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBI-137/distinfo b/databases/p5-DBI-137/distinfo
index ead3c8c734b4..5b260098a9b8 100644
--- a/databases/p5-DBI-137/distinfo
+++ b/databases/p5-DBI-137/distinfo
@@ -1 +1 @@
-MD5 (DBI-1.34.tar.gz) = f0056760bea3d5697c21d64358617895
+MD5 (DBI-1.35.tar.gz) = 8ede0b8817ac8b0db6cc5db36109060c
diff --git a/databases/p5-DBI-137/pkg-plist b/databases/p5-DBI-137/pkg-plist
index e22058017172..e1f8a338bcec 100644
--- a/databases/p5-DBI-137/pkg-plist
+++ b/databases/p5-DBI-137/pkg-plist
@@ -1,43 +1,42 @@
 bin/dbiprof
 bin/dbiproxy
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/ExampleP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/NullP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/Proxy.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/Sponge.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Changes.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Const/GetInfo/ANSI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Const/GetInfo/ODBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Const/GetInfoReturn.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Const/GetInfoType.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/DBD.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/DBD/Metadata.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/FAQ.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Format.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Profile.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/ProfileData.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/ProfileDumper.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/ProfileDumper/Apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/ProxyServer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/PurePerl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/W32ODBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Win32/DBIODBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DBI.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DBI.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DBIXS.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/Driver.xst
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/Driver_xst.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/dbd_xsh.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/dbi_sql.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/dbipport.h
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/ProfileDumper
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/DBD
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Const/GetInfo
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Const
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Win32 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/DBI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBD/ExampleP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBD/NullP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Proxy.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Sponge.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Changes.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfo/ANSI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfo/ODBC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfoReturn.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfoType.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/DBD.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/DBD/Metadata.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/FAQ.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Profile.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/ProfileData.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/ProfileDumper.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/ProfileDumper/Apache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/ProxyServer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/PurePerl.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/W32ODBC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Win32/DBIODBC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/DBI.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/DBI.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/DBIXS.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/Driver.xst
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/Driver_xst.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/dbd_xsh.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/dbi_sql.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/dbipport.h
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBD
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI/ProfileDumper
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI/DBD
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfo
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Win32 2>/dev/null || true
diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index deef08f41545..055f38f12f57 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	DBI
-PORTVERSION=	1.34
-PORTREVISION=	1
+PORTVERSION=	1.35
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBI
@@ -16,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	The perl5 Database Interface.  Required for DBD::* modules
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/RPC/PlServer.pm:${PORTSDIR}/net/p5-PlRPC
+BUILD_DEPENDS=	${SITE_PERL}/RPC/PlServer.pm:${PORTSDIR}/net/p5-PlRPC
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
@@ -33,7 +32,6 @@ MAN3=		Bundle::DBI.3 \
 		DBI::DBD.3 \
 		DBI::DBD::Metadata.3 \
 		DBI::FAQ.3 \
-		DBI::Format.3 \
 		DBI::Profile.3 \
 		DBI::ProfileData.3 \
 		DBI::ProfileDumper.3 \
@@ -42,6 +40,5 @@ MAN3=		Bundle::DBI.3 \
 		DBI::PurePerl.3 \
 		DBI::W32ODBC.3 \
 		Win32::DBIODBC.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBI/distinfo b/databases/p5-DBI/distinfo
index ead3c8c734b4..5b260098a9b8 100644
--- a/databases/p5-DBI/distinfo
+++ b/databases/p5-DBI/distinfo
@@ -1 +1 @@
-MD5 (DBI-1.34.tar.gz) = f0056760bea3d5697c21d64358617895
+MD5 (DBI-1.35.tar.gz) = 8ede0b8817ac8b0db6cc5db36109060c
diff --git a/databases/p5-DBI/pkg-plist b/databases/p5-DBI/pkg-plist
index e22058017172..e1f8a338bcec 100644
--- a/databases/p5-DBI/pkg-plist
+++ b/databases/p5-DBI/pkg-plist
@@ -1,43 +1,42 @@
 bin/dbiprof
 bin/dbiproxy
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/ExampleP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/NullP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/Proxy.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/Sponge.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Changes.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Const/GetInfo/ANSI.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Const/GetInfo/ODBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Const/GetInfoReturn.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Const/GetInfoType.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/DBD.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/DBD/Metadata.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/FAQ.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Format.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Profile.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/ProfileData.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/ProfileDumper.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/ProfileDumper/Apache.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/ProxyServer.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/PurePerl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/W32ODBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Win32/DBIODBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DBI.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DBI.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DBIXS.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/Driver.xst
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/Driver_xst.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/dbd_xsh.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/dbi_sql.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/dbipport.h
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/ProfileDumper
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/DBD
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Const/GetInfo
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Const
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Win32 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/DBI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBD/ExampleP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBD/NullP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Proxy.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Sponge.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Changes.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfo/ANSI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfo/ODBC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfoReturn.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfoType.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/DBD.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/DBD/Metadata.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/FAQ.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/Profile.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/ProfileData.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/ProfileDumper.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/ProfileDumper/Apache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/ProxyServer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/PurePerl.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBI/W32ODBC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Win32/DBIODBC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/DBI.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/DBI.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/DBIXS.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/Driver.xst
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/Driver_xst.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/dbd_xsh.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/dbi_sql.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/dbipport.h
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBD
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI/ProfileDumper
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI/DBD
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfo
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Win32 2>/dev/null || true