From 42542fb07642b8336e808272918f3ae46aa67e0b Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 4 Aug 2007 11:41:30 +0000
Subject: - Remove the DESTDIR modifications from individual ports as we have a
 new,   fully chrooted DESTDIR, which does not need such any more.

Sponsored by:	Google Summer of Code 2007
Approved by:	portmgr (pav)
---
 japanese/mecab/Makefile     |  4 ++--
 japanese/p5-manual/Makefile |  2 +-
 japanese/perl5/Makefile     | 26 +++++++++++++-------------
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'japanese')

diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index bb79f7c0a271..19896c6fc9a6 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -48,8 +48,8 @@ post-configure:
 	${CP} ${WRKSRC}/mecabrc ${WRKSRC}/mecabrc.dist
 
 post-install:
-	@if [ ! -f ${TARGETDIR}/etc/mecabrc ]; then \
-		${INSTALL_DATA} ${TARGETDIR}/etc/mecabrc.dist ${TARGETDIR}/etc/mecabrc; \
+	@if [ ! -f ${PREFIX}/etc/mecabrc ]; then \
+		${INSTALL_DATA} ${PREFIX}/etc/mecabrc.dist ${PREFIX}/etc/mecabrc; \
 	fi
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/japanese/p5-manual/Makefile b/japanese/p5-manual/Makefile
index a809302b2cfe..5dc8961d316b 100644
--- a/japanese/p5-manual/Makefile
+++ b/japanese/p5-manual/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl5 japanese manual
 
 NO_BUILD=	yes
-MANPREFIX=	${TARGETDIR}/man/ja
+MANPREFIX=	${PREFIX}/man/ja
 
 CAT1=		a2p.1 perl.1 perlapi.1 perlbook.1 perlbot.1 perlcall.1 \
 		perldata.1 perldebug.1 perldiag.1 perlembed.1 perlform.1 \
diff --git a/japanese/perl5/Makefile b/japanese/perl5/Makefile
index 4ed86535e938..b3ca7655bcb0 100644
--- a/japanese/perl5/Makefile
+++ b/japanese/perl5/Makefile
@@ -44,7 +44,7 @@ COMMENT=	Pattern Extraction and Recognition Language + Japanese patches
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
-CONFIGURE_ARGS=		-sde -Dprefix=${TARGETDIR} -Duseshrplib \
+CONFIGURE_ARGS=		-sde -Dprefix=${PREFIX} -Duseshrplib \
 			-Dlibperl=libperl.so.${PERL_SHLIBVER}
 
 JPERL_VER=	5.005
@@ -110,7 +110,7 @@ MAN3=	AnyDBM_File.3 AutoLoader.3 AutoSplit.3 B.3 B::Asmdata.3 \
 	strict.3 subs.3 vars.3 \
 	I18N::Japanese.3
 
-MAN3PREFIX=	${TARGETDIR}/lib/perl5/${JPERL_VERSION}/
+MAN3PREFIX=	${PREFIX}/lib/perl5/${JPERL_VERSION}/
 
 test:
 	@(cd ${WRKSRC}; make test)
@@ -121,16 +121,16 @@ post-patch:
 .endfor
 
 post-install:
-	@strip ${TARGETDIR}/bin/perl${JPERL_VERSION}
-	@strip ${TARGETDIR}/bin/sperl${JPERL_VERSION}
-	@${RM} ${TARGETDIR}/bin/perl ${TARGETDIR}/bin/suidperl
-	@${LN} -sf ${TARGETDIR}/bin/perl${JPERL_VERSION} ${TARGETDIR}/bin/perl
-	@${LN} -sf ${TARGETDIR}/bin/perl${JPERL_VERSION} ${TARGETDIR}/bin/perl5
-	@${LN} -fs ${TARGETDIR}/bin/perl${JPERL_VERSION} ${TARGETDIR}/bin/jperl5
-	@${LN} -fs ${TARGETDIR}/bin/perl${JPERL_VERSION} ${TARGETDIR}/bin/jperl${JPERL_VERSION}
-	@${LN} -fs ${TARGETDIR}/bin/sperl${JPERL_VERSION} ${TARGETDIR}/bin/suidperl
-	@${LN} -fs ${TARGETDIR}/bin/sperl${JPERL_VERSION} ${TARGETDIR}/bin/jsuidperl
-	@${LN} -fs ${TARGETDIR}/lib/perl5/${JPERL_VERSION}/${MACHINE_ARCH}-freebsd/CORE/libperl.so.${PERL_SHLIBVER} ${TARGETDIR}/lib/perl5/${JPERL_VERSION}/${MACHINE_ARCH}-freebsd/CORE/libperl.so
-	@PKG_PREFIX=${TARGETDIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@strip ${PREFIX}/bin/perl${JPERL_VERSION}
+	@strip ${PREFIX}/bin/sperl${JPERL_VERSION}
+	@${RM} ${PREFIX}/bin/perl ${PREFIX}/bin/suidperl
+	@${LN} -sf ${PREFIX}/bin/perl${JPERL_VERSION} ${PREFIX}/bin/perl
+	@${LN} -sf ${PREFIX}/bin/perl${JPERL_VERSION} ${PREFIX}/bin/perl5
+	@${LN} -fs ${PREFIX}/bin/perl${JPERL_VERSION} ${PREFIX}/bin/jperl5
+	@${LN} -fs ${PREFIX}/bin/perl${JPERL_VERSION} ${PREFIX}/bin/jperl${JPERL_VERSION}
+	@${LN} -fs ${PREFIX}/bin/sperl${JPERL_VERSION} ${PREFIX}/bin/suidperl
+	@${LN} -fs ${PREFIX}/bin/sperl${JPERL_VERSION} ${PREFIX}/bin/jsuidperl
+	@${LN} -fs ${PREFIX}/lib/perl5/${JPERL_VERSION}/${MACHINE_ARCH}-freebsd/CORE/libperl.so.${PERL_SHLIBVER} ${PREFIX}/lib/perl5/${JPERL_VERSION}/${MACHINE_ARCH}-freebsd/CORE/libperl.so
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
-- 
cgit v1.2.3