From f8530be76920a350540eaae41ce22fc60d744e1a Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 31 Mar 2014 22:26:09 +0000
Subject: - Remove temp file on deinstall[1] - Unshun all installation commands
 - Make PREFIX-clean

Poked by:	bdrewery [1]
Sponsored by:	Absolight
---
 lang/perl5.14/Makefile | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'lang/perl5.14/Makefile')

diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index 462c1bc8213e..36558733d19f 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -41,7 +41,7 @@ PERL_VERSION=	5.14.4
 PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
 SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
-SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
+SITE_PERL?=	${PREFIX}/${SITE_PERL_REL}
 
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
@@ -110,8 +110,8 @@ MANDIRS+=	${MAN3PREFIX}
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 		PERL_VER=${PERL_VER} \
 		PERL_ARCH=${PERL_ARCH} \
-		MAN3=${MAN3PREFIX:S|^${LOCALBASE}/||}/man/man3 \
-		SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||}
+		MAN3=${MAN3PREFIX:S|^${PREFIX}/||}/man/man3 \
+		SITE_PERL=${SITE_PERL:S|^${PREFIX}/||}
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	-Doptimize="-g" -DDEBUGGING
@@ -197,25 +197,25 @@ post-patch:
 .endif
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
-	@${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3
+	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto
+	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine
+	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys
+	${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
+	${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
 	${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc
 .if ${OSVERSION} >= 900022
 	${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
 .endif
 .for files in ${BSDPAN_FILES}
-	@${MKDIR} ${STAGEDIR}${BSDPAN_DEST}/${files:H}
+	${MKDIR} ${STAGEDIR}${BSDPAN_DEST}/${files:H}
 	${INSTALL_DATA} \
 		${BSDPAN_WRKSRC}/${files} ${STAGEDIR}${BSDPAN_DEST}/${files}
 .endfor
 
 test: build
-	@(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness)
+	(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness)
 
 regression-test: test
 
-- 
cgit v1.2.3