Use variables SITE_PERL and SITE_PERL_REL where appropriate.

5 files changed, 21 insertions, 25 deletions

diff --git a/devel/p5-Class-Tom/Makefile b/devel/p5-Class-Tom/Makefile
index 1a0d8ea668b8..108c73b71cda 100644
--- a/devel/p5-Class-Tom/Makefile
+++ b/devel/p5-Class-Tom/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-SITE_PERL=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}
 PERL_CONFIGURE=	yes
 
 MAN3=		Class::Tom.3
diff --git a/devel/p5-ConfigReader/Makefile b/devel/p5-ConfigReader/Makefile
index 67f9f1aed350..bc4b3ead024c 100644
--- a/devel/p5-ConfigReader/Makefile
+++ b/devel/p5-ConfigReader/Makefile
@@ -20,10 +20,9 @@ USE_PERL5=	YES
 NO_BUILD=	YES
 
 do-install:
-		@ ${MKDIR} ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/ConfigReader/
-		@ ${INSTALL_DATA} ${WRKSRC}/DirectiveStyle.pm ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/ConfigReader/
-		@ ${INSTALL_DATA} ${WRKSRC}/Spec.pm ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/ConfigReader/
-		@ ${INSTALL_DATA} ${WRKSRC}/Values.pm ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/ConfigReader/
-		@ ${INSTALL_DATA} ${WRKSRC}/ConfigReader.pod ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
+	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/ConfigReader/
+	${INSTALL_DATA} ${WRKSRC}/DirectiveStyle.pm ${WRKSRC}/Spec.pm \
+		${WRKSRC}/Values.pm ${PREFIX}/${SITE_PERL_REL}/ConfigReader/
+	${INSTALL_DATA} ${WRKSRC}/ConfigReader.pod ${PREFIX}/${SITE_PERL_REL}/
 
 .include <bsd.port.mk>
diff --git a/devel/p5-File-ReadBackwards/Makefile b/devel/p5-File-ReadBackwards/Makefile
index a0fa9672e6b9..2cc2242e8cb8 100644
--- a/devel/p5-File-ReadBackwards/Makefile
+++ b/devel/p5-File-ReadBackwards/Makefile
@@ -17,7 +17,6 @@ COMMENT=	File::ReadBackwards -- read a file backwards by lines
 BUILD_DEPENDS=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-SITE_PERL=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}
 PERL_CONFIGURE=	yes
 
 MAN3=		File::ReadBackwards.3
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index e2641a984d53..bd47987e412d 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -23,7 +23,7 @@ NO_BUILD=	YES
 PLIST_FILES=	%%SITE_PERL%%/PV.pm
 
 do-install:
-	${MKDIR} -m 755 ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
-	${INSTALL_DATA} ${WRKSRC}/PV.pm ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
+	${MKDIR} -m 755 ${PREFIX}/${SITE_PERL_REL}/
+	${INSTALL_DATA} ${WRKSRC}/PV.pm ${PREFIX}/${SITE_PERL_REL}/
 
 .include <bsd.port.mk>
diff --git a/devel/perlconsole/Makefile b/devel/perlconsole/Makefile
index 8a22a78f4f01..a39679c60e2f 100644
--- a/devel/perlconsole/Makefile
+++ b/devel/perlconsole/Makefile
@@ -8,18 +8,17 @@
 PORTNAME=	perlconsole
 PORTVERSION=	0.4
 CATEGORIES=	devel
-MASTER_SITES=	http://www.cpan.org/modules/by-module/Test/SUKRIA/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	../../authors/id/S/SU/SUKRIA
 
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	A light program that lets you evaluate Perl code interactively
 
-RUN_DEPENDS=	${BASEP}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
-		${BASEP}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		${BASEP}/Module/Refresh.pm:${PORTSDIR}/devel/p5-Module-Refresh \
-		${BASEP}/Lexical/Persistence.pm:${PORTSDIR}/devel/p5-Lexical-Persistence \
-		${BASEP}/B/Keywords.pm:${PORTSDIR}/devel/p5-B-Keywords
-
-BASEP=		${SITE_PERL}
+RUN_DEPENDS=	${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
+		${SITE_PERL}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu \
+		${SITE_PERL}/Module/Refresh.pm:${PORTSDIR}/devel/p5-Module-Refresh \
+		${SITE_PERL}/Lexical/Persistence.pm:${PORTSDIR}/devel/p5-Lexical-Persistence \
+		${SITE_PERL}/B/Keywords.pm:${PORTSDIR}/devel/p5-B-Keywords
 
 USE_PERL5=	yes
 PERL_CONFIGURE=	5.8.0+
@@ -29,12 +28,12 @@ PORTDOCS=	README \
 		CHANGES
 
 PLIST_FILES=	bin/perlconsole \
-		lib/perl5/${PERL_VER}/PerlConsole/Commands.pm \
-		lib/perl5/${PERL_VER}/PerlConsole/Console.pm \
-		lib/perl5/${PERL_VER}/PerlConsole/Preferences.pm \
-		lib/perl5/${PERL_VER}/PerlConsole.pm
+		${SITE_PERL_REL}/PerlConsole/Commands.pm \
+		${SITE_PERL_REL}/PerlConsole/Console.pm \
+		${SITE_PERL_REL}/PerlConsole/Preferences.pm \
+		${SITE_PERL_REL}/PerlConsole.pm
 
-PLIST_DIRS=	lib/perl5/${PERL_VER}/PerlConsole
+PLIST_DIRS=	${SITE_PERL_REL}/PerlConsole
 
 do-install:
 .if !defined(NOPORTDOCS)
@@ -43,11 +42,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
-	${MKDIR} ${PREFIX}/lib/perl5/${PERL_VER}/PerlConsole/
+	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/PerlConsole/
 	${CP} -R ${WRKSRC}/lib/PerlConsole/ \
-		${PREFIX}/lib/perl5/${PERL_VER}/PerlConsole/
+		${PREFIX}/${SITE_PERL_REL}/PerlConsole/
 	${CP} ${WRKSRC}/lib/PerlConsole.pm \
-		${PREFIX}/lib/perl5/${PERL_VER}/PerlConsole.pm
+		${PREFIX}/${SITE_PERL_REL}/PerlConsole.pm
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
 
 .include <bsd.port.mk>