- 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)

14 files changed, 34 insertions, 34 deletions

diff --git a/textproc/bib2html/Makefile b/textproc/bib2html/Makefile
index 7bdff9999b6..5f904fabecc 100644
--- a/textproc/bib2html/Makefile
+++ b/textproc/bib2html/Makefile
@@ -23,26 +23,26 @@ NO_BUILD=	yes
 
 post-patch:
 	@${SED} -e \
-		's:= "$$0";:= "${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML";:g' \
+		's:= "$$0";:= "${PREFIX}/${SITE_PERL_REL}/Bib2HTML";:g' \
 		< ${WRKSRC}/bib2html.pl > ${WRKSRC}/bib2html
 	@${SED} -e \
-		's:= "$$0";:= "${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML";:g' \
+		's:= "$$0";:= "${PREFIX}/${SITE_PERL_REL}/Bib2HTML";:g' \
 		< ${WRKSRC}/bib2xml.pl > ${WRKSRC}/bib2xml
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/bib2html ${TARGETDIR}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bib2xml ${TARGETDIR}/bin
-	@${MKDIR} ${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML
+	${INSTALL_SCRIPT} ${WRKSRC}/bib2html ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bib2xml ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/${SITE_PERL_REL}/Bib2HTML
 	@cd ${WRKSRC}/Bib2HTML && ${FIND} . | \
 		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} \
-		${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML
-	${FIND} ${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML -type f | \
+		${PREFIX}/${SITE_PERL_REL}/Bib2HTML
+	${FIND} ${PREFIX}/${SITE_PERL_REL}/Bib2HTML -type f | \
 		${XARGS} ${CHMOD} ${LIBMODE}
-	${FIND} ${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML -type d | \
+	${FIND} ${PREFIX}/${SITE_PERL_REL}/Bib2HTML -type d | \
 		${XARGS} ${CHMOD} a+rx
-	@${FIND} ${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML -type f | \
-		${SED} "s,^${TARGETDIR}/,," >> ${TMPPLIST}
-	@${FIND} ${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML -type d | ${SORT} -r | \
-		${SED} "s,^${TARGETDIR}/,@dirrm ," >> ${TMPPLIST}
+	@${FIND} ${PREFIX}/${SITE_PERL_REL}/Bib2HTML -type f | \
+		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
+	@${FIND} ${PREFIX}/${SITE_PERL_REL}/Bib2HTML -type d | ${SORT} -r | \
+		${SED} "s,^${PREFIX}/,@dirrm ," >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/textproc/csvdiff/Makefile b/textproc/csvdiff/Makefile
index 1ccfcae9c11..eaa6d762567 100644
--- a/textproc/csvdiff/Makefile
+++ b/textproc/csvdiff/Makefile
@@ -25,7 +25,7 @@ PORTDOCS=	CHANGES README TODO
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \
-		${TARGETDIR}/bin/${PORTNAME}
+		${PREFIX}/bin/${PORTNAME}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
diff --git a/textproc/dbacl/Makefile b/textproc/dbacl/Makefile
index 43abfe077ea..f8aff1087e0 100644
--- a/textproc/dbacl/Makefile
+++ b/textproc/dbacl/Makefile
@@ -35,8 +35,8 @@ pre-install:
 do-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/src && \
-		${INSTALL_PROGRAM} ${PROGRAMS} ${TARGETDIR}/bin && \
-		${INSTALL_SCRIPT} ${SCRIPTS} ${TARGETDIR}/bin
+		${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/bin && \
+		${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin
 	cd ${WRKSRC}/man && \
 		${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 && \
 	cd ${WRKSRC}/doc && \
diff --git a/textproc/diffstat/Makefile b/textproc/diffstat/Makefile
index e5807aaf285..e2fa5c33fe8 100644
--- a/textproc/diffstat/Makefile
+++ b/textproc/diffstat/Makefile
@@ -21,7 +21,7 @@ MAN1=		diffstat.1
 PLIST_FILES=	bin/diffstat
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/diffstat ${TARGETDIR}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/diffstat ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/textproc/lemmatizer2/Makefile b/textproc/lemmatizer2/Makefile
index 8a7c5b2ba00..930da817598 100644
--- a/textproc/lemmatizer2/Makefile
+++ b/textproc/lemmatizer2/Makefile
@@ -21,7 +21,7 @@ COMMENT=	Russian / German / English lemmatizer library
 BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
 LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 
-DB_DIR?=	${DESTDIR}/var/db/lemmatizer
+DB_DIR?=	/var/db/lemmatizer
 
 DIST_SUBDIR=	${PORTNAME}
 
@@ -32,7 +32,7 @@ pre-fetch:
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
 	@${ECHO} "      DB_DIR=directory        Set alternate directory for database files"
-	@${ECHO} "                              (default is ${DESTDIR}/var/db/lemmatizer)"
+	@${ECHO} "                              (default is /var/db/lemmatizer)"
 	@${ECHO} ""
 
 do-configure:
diff --git a/textproc/metaf2xml/Makefile b/textproc/metaf2xml/Makefile
index 2278aa0ffa4..89677054b0a 100644
--- a/textproc/metaf2xml/Makefile
+++ b/textproc/metaf2xml/Makefile
@@ -15,17 +15,17 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Parses METAR, TAF, and SYNOP messages and stores the components in XML
 
-MAKE_ARGS=	CGI_BIN_DIR=${TARGETDIR}/www/metaf2xml/cgi-bin \
-		HTDOCS_DIR=${TARGETDIR}/www/metaf2xml/htdocs \
-		METAF2XML=${TARGETDIR} \
-		METAF2XML_LIB=${TARGETDIR}/${SITE_PERL_REL} \
+MAKE_ARGS=	CGI_BIN_DIR=${PREFIX}/www/metaf2xml/cgi-bin \
+		HTDOCS_DIR=${PREFIX}/www/metaf2xml/htdocs \
+		METAF2XML=${PREFIX} \
+		METAF2XML_LIB=${PREFIX}/${SITE_PERL_REL} \
 		METAF2XML_XSL=${DATADIR}
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
 
 pre-install:
-	${MKDIR} ${TARGETDIR}/www/metaf2xml/cgi-bin \
-		${TARGETDIR}/www/metaf2xml/htdocs
+	${MKDIR} ${PREFIX}/www/metaf2xml/cgi-bin \
+		${PREFIX}/www/metaf2xml/htdocs
 
 do-install:
 	cd ${WRKSRC}; ${MAKE} ${MAKE_ARGS} install-all
diff --git a/textproc/nltk/Makefile b/textproc/nltk/Makefile
index 722c6683d50..0fe692b8bea 100644
--- a/textproc/nltk/Makefile
+++ b/textproc/nltk/Makefile
@@ -27,8 +27,8 @@ BROKEN=		Coredump during build on alpha 4.x
 
 post-install:
 	@${FIND} ${PYTHON_SITELIBDIR}/nltk ! -type d | \
-		${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST}
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${PYTHON_SITELIBDIR}/nltk -type d | ${SORT} -r | \
-		${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST}
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/textproc/nltk_lite/Makefile b/textproc/nltk_lite/Makefile
index 79d80debe25..c0f3498543b 100644
--- a/textproc/nltk_lite/Makefile
+++ b/textproc/nltk_lite/Makefile
@@ -31,8 +31,8 @@ PLIST_SUB+=	EGG_INFO_FILE=""
 
 post-install:
 	@${FIND} ${PYTHON_SITELIBDIR}/nltk_lite ! -type d | \
-		${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST}
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${PYTHON_SITELIBDIR}/nltk_lite -type d | ${SORT} -r | \
-		${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST}
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/textproc/po4a/Makefile b/textproc/po4a/Makefile
index 8d96efcaaf6..92a72d7fb2b 100644
--- a/textproc/po4a/Makefile
+++ b/textproc/po4a/Makefile
@@ -26,7 +26,7 @@ USE_PERL5=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Locale::Po4a::TransTractor.3 \
  		Locale::Po4a::LaTeX.3 \
  		Locale::Po4a::Pod.3 \
diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile
index 8313612697c..8d07d4b1000 100644
--- a/textproc/py-pygments/Makefile
+++ b/textproc/py-pygments/Makefile
@@ -21,7 +21,7 @@ USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	Pygments
 
 .if !defined(NOPORTDOCS)
-DOCSDIR=	${TARGETDIR}/share/doc/py-${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 FIND_DOCS=	. -type f
 MAN1=	pygmentize.1
 MANCOMPRESSED=	no
diff --git a/textproc/rst.el/Makefile b/textproc/rst.el/Makefile
index 692fc9f81e3..2efac896255 100644
--- a/textproc/rst.el/Makefile
+++ b/textproc/rst.el/Makefile
@@ -24,7 +24,7 @@ EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	${WRKSRC}/rst.el
 
-ELISPDIR=	${TARGETDIR}/${EMACS_SITE_LISPDIR}
+ELISPDIR=	${PREFIX}/${EMACS_SITE_LISPDIR}
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/ruby-sary/Makefile b/textproc/ruby-sary/Makefile
index 06dce5aaff3..1d4a7ffa263 100644
--- a/textproc/ruby-sary/Makefile
+++ b/textproc/ruby-sary/Makefile
@@ -32,7 +32,7 @@ DOCS_JA=	${RUBY_RD_FILES:M*.ja.rd} \
 		${RUBY_RD_HTML_FILES:M*.ja.html}
 
 post-install: doc-install
-	${INSTALL_SCRIPT} ${WRKSRC}/rsary.rb ${TARGETDIR}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/rsary.rb ${PREFIX}/bin/
 
 doc-install:
 .if !defined(NOPORTDOCS)
diff --git a/textproc/srilm/Makefile b/textproc/srilm/Makefile
index 6c15f20b226..3027c4b0cbf 100644
--- a/textproc/srilm/Makefile
+++ b/textproc/srilm/Makefile
@@ -87,7 +87,7 @@ post-patch:
 do-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/bin/freebsd && \
-		${INSTALL_PROGRAM} ${PROGRAMS} ${TARGETDIR}/bin && \
+		${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/bin && \
 		${INSTALL_SCRIPT} ${GAWK_SCRIPTS} ${EXAMPLESDIR} && \
 	cd ${WRKSRC}/man/man1 && \
 		${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 && \
diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile
index f5643ca1ab2..acce20f0bbc 100644
--- a/textproc/xxdiff/Makefile
+++ b/textproc/xxdiff/Makefile
@@ -46,7 +46,7 @@ pre-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} QMAKESPEC=${SPEC} ${MAKE} -f Makefile.bootstrap ${MAKE_ARGS} Makefile)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/xxdiff ${TARGETDIR}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/xxdiff ${PREFIX}/bin/
 .if !defined(NOPORTDOCS)
 	@${INSTALL} -d ${DOCSDIR} ${SSDIR}
 	${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/