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

16 files changed, 63 insertions, 63 deletions

diff --git a/chinese/BBMan/Makefile b/chinese/BBMan/Makefile
index cdbbe03bd80f..e57e6389f409 100644
--- a/chinese/BBMan/Makefile
+++ b/chinese/BBMan/Makefile
@@ -37,6 +37,6 @@ do-build:
 	cd ${WRKSRC} && ${CXX} main.cpp `${WX_CONFIG} --libs --cxxflags` -I${LOCALBASE}/include ${CFLAGS} -o BBMan
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/BBMan ${TARGETDIR}/bin/BBMan
+	${INSTALL_PROGRAM} ${WRKSRC}/BBMan ${PREFIX}/bin/BBMan
 
 .include <bsd.port.post.mk>
diff --git a/chinese/auto-tw-l10n/Makefile b/chinese/auto-tw-l10n/Makefile
index e3bb7841df9d..157a0721609d 100644
--- a/chinese/auto-tw-l10n/Makefile
+++ b/chinese/auto-tw-l10n/Makefile
@@ -31,8 +31,8 @@ pre-install:
 	@${FIND} ${WRKSRC} -name "*.in" -delete
 
 do-install:
-	${MKDIR} ${TARGETDIR}/share/skel/zh_TW.Big5
-	${CP} ${WRKSRC}/* ${TARGETDIR}/share/skel/zh_TW.Big5
+	${MKDIR} ${PREFIX}/share/skel/zh_TW.Big5
+	${CP} ${WRKSRC}/* ${PREFIX}/share/skel/zh_TW.Big5
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/chinese/bg5pdf/Makefile b/chinese/bg5pdf/Makefile
index b284e96d005b..9bac5b5480cf 100644
--- a/chinese/bg5pdf/Makefile
+++ b/chinese/bg5pdf/Makefile
@@ -30,8 +30,8 @@ do-build:
 
 do-install:
 	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/bg5pdf ${TARGETDIR}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/gbpdf ${TARGETDIR}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bg5pdf ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/gbpdf ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bg5pdflib.so ${PYTHON_SITELIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/test.big5 ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/test.big5.pdf ${EXAMPLESDIR}
diff --git a/chinese/bg5ps/Makefile b/chinese/bg5ps/Makefile
index 05527121dca2..36826771f77f 100644
--- a/chinese/bg5ps/Makefile
+++ b/chinese/bg5ps/Makefile
@@ -21,10 +21,10 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/bg5ps ${TARGETDIR}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/ttf2psm ${TARGETDIR}/bin
-	${INSTALL_DATA} ${WRKSRC}/bg5ps.conf ${TARGETDIR}/etc/bg5ps.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/gb2312-bg5ps.conf ${TARGETDIR}/etc/gb2312-bg5ps.conf.sample
+	${INSTALL_SCRIPT} ${WRKSRC}/bg5ps ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/ttf2psm ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/bg5ps.conf ${PREFIX}/etc/bg5ps.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/gb2312-bg5ps.conf ${PREFIX}/etc/gb2312-bg5ps.conf.sample
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
diff --git a/chinese/big5width/Makefile b/chinese/big5width/Makefile
index 1a38b536a7e4..7de793bc2c24 100644
--- a/chinese/big5width/Makefile
+++ b/chinese/big5width/Makefile
@@ -14,7 +14,7 @@ DISTFILES=	# none
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	Unicode width dirty fix for Big5 font (${LANG} locale)
 
-BASELOCALEDIR=	${DESTDIR}/usr/share/locale
+BASELOCALEDIR=	/usr/share/locale
 LOCALEDIR=	${PREFIX}/share/locale
 LANG=		zh_TW.UTF-8
 
diff --git a/chinese/dictd-database/Makefile b/chinese/dictd-database/Makefile
index 34ca0398b149..11859b9d6932 100644
--- a/chinese/dictd-database/Makefile
+++ b/chinese/dictd-database/Makefile
@@ -26,11 +26,11 @@ PKGMESSAGE=	${WRKSRC}/pkg-message
 DICTFILES=	cedict pydict moecomp netterm
 
 do-install:
-	${SED} 's|%%PREFIX%%|${TARGETDIR}|g' ${MSG_FILE} > ${PKGMESSAGE}
-	@${MKDIR} ${TARGETDIR}/lib/dict
+	${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
+	@${MKDIR} ${PREFIX}/lib/dict
 	for f in ${DICTFILES}; do \
-	  ${INSTALL_DATA} ${WRKSRC}/$${f}.dict.dz ${TARGETDIR}/lib/dict; \
-	  ${INSTALL_DATA} ${WRKSRC}/$${f}.index ${TARGETDIR}/lib/dict; \
+	  ${INSTALL_DATA} ${WRKSRC}/$${f}.dict.dz ${PREFIX}/lib/dict; \
+	  ${INSTALL_DATA} ${WRKSRC}/$${f}.index ${PREFIX}/lib/dict; \
 	done
 
 post-install:
diff --git a/chinese/fortunetw/Makefile b/chinese/fortunetw/Makefile
index 448e30835f35..a1ae595272d2 100644
--- a/chinese/fortunetw/Makefile
+++ b/chinese/fortunetw/Makefile
@@ -20,14 +20,14 @@ NO_BUILD=	yes
 STRCMD=		/usr/games/strfile
 
 do-install:
-	@${MKDIR} ${TARGETDIR}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/bsdchat ${TARGETDIR}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/folksong ${TARGETDIR}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/liuyong ${TARGETDIR}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/stephehchow ${TARGETDIR}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/tangshi ${TARGETDIR}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/xiaoxing ${TARGETDIR}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/yijing ${TARGETDIR}/share/games/fortune
+	@${MKDIR} ${PREFIX}/share/games/fortune
+	@${INSTALL_DATA} ${WRKSRC}/bsdchat ${PREFIX}/share/games/fortune
+	@${INSTALL_DATA} ${WRKSRC}/folksong ${PREFIX}/share/games/fortune
+	@${INSTALL_DATA} ${WRKSRC}/liuyong ${PREFIX}/share/games/fortune
+	@${INSTALL_DATA} ${WRKSRC}/stephehchow ${PREFIX}/share/games/fortune
+	@${INSTALL_DATA} ${WRKSRC}/tangshi ${PREFIX}/share/games/fortune
+	@${INSTALL_DATA} ${WRKSRC}/xiaoxing ${PREFIX}/share/games/fortune
+	@${INSTALL_DATA} ${WRKSRC}/yijing ${PREFIX}/share/games/fortune
 
 pre-install:
 .if !exists(${STRCMD})
@@ -36,22 +36,22 @@ pre-install:
 .endif
 
 post-install:
-	@${STRCMD} ${TARGETDIR}/share/games/fortune/bsdchat
-	@${STRCMD} ${TARGETDIR}/share/games/fortune/folksong
-	@${STRCMD} ${TARGETDIR}/share/games/fortune/liuyong
-	@${STRCMD} ${TARGETDIR}/share/games/fortune/stephehchow
-	@${STRCMD} ${TARGETDIR}/share/games/fortune/tangshi
-	@${STRCMD} ${TARGETDIR}/share/games/fortune/xiaoxing
-	@${STRCMD} ${TARGETDIR}/share/games/fortune/yijing
+	@${STRCMD} ${PREFIX}/share/games/fortune/bsdchat
+	@${STRCMD} ${PREFIX}/share/games/fortune/folksong
+	@${STRCMD} ${PREFIX}/share/games/fortune/liuyong
+	@${STRCMD} ${PREFIX}/share/games/fortune/stephehchow
+	@${STRCMD} ${PREFIX}/share/games/fortune/tangshi
+	@${STRCMD} ${PREFIX}/share/games/fortune/xiaoxing
+	@${STRCMD} ${PREFIX}/share/games/fortune/yijing
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Usage:"
-	@${ECHO_MSG} "${STRCMD} ${TARGETDIR}/share/games/fortune/bsdchat"
-	@${ECHO_MSG} "${STRCMD} ${TARGETDIR}/share/games/fortune/folksong"
-	@${ECHO_MSG} "${STRCMD} ${TARGETDIR}/share/games/fortune/liuyong"
-	@${ECHO_MSG} "${STRCMD} ${TARGETDIR}/share/games/fortune/stephehchow"
-	@${ECHO_MSG} "${STRCMD} ${TARGETDIR}/share/games/fortune/tangshi"
-	@${ECHO_MSG} "${STRCMD} ${TARGETDIR}/share/games/fortune/xiaoxing"
-	@${ECHO_MSG} "${STRCMD} ${TARGETDIR}/share/games/fortune/yijing"
+	@${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/bsdchat"
+	@${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/folksong"
+	@${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/liuyong"
+	@${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/stephehchow"
+	@${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/tangshi"
+	@${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/xiaoxing"
+	@${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/yijing"
 	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile
index 4383213c5b91..64684ad5f808 100644
--- a/chinese/libchewing/Makefile
+++ b/chinese/libchewing/Makefile
@@ -19,6 +19,6 @@ USE_GCC=	3.2+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-DATADIR=	${TARGETDIR}/share/chewing
+DATADIR=	${PREFIX}/share/chewing
 
 .include <bsd.port.mk>
diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile
index 33ce2f6f9f3f..5f23d26d3031 100644
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--disable-bimsphone-module \
 		--disable-static \
-		--with-conf-dir=${TARGETDIR}/etc/${PORTNAME}
+		--with-conf-dir=${PREFIX}/etc/${PORTNAME}
 # oxim requires qinputcontextplugin.h which only exists in Debian package
 CONFIGURE_ARGS+=--disable-qt-immodule
 
@@ -102,12 +102,12 @@ PLIST_SUB+=	NLS=""
 #.endif
 
 post-patch:
-	${REINPLACE_CMD} 's|%%PREFIX%%|${TARGETDIR}|' \
+	${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' \
 			${WRKSRC}/src/gtk-immodule/gtkintl.h
 
 post-install:
 .if !defined(WITHOUT_GTK2)
-	@gtk-query-immodules-2.0 > ${TARGETDIR}/etc/gtk-2.0/gtk.immodules
+	@gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
 .endif
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO} To display this message again, type ${PKG_INFO} -D ${PKGNAME}
diff --git a/chinese/telnet/Makefile b/chinese/telnet/Makefile
index 21b9cf113a4f..c725d7a9704f 100644
--- a/chinese/telnet/Makefile
+++ b/chinese/telnet/Makefile
@@ -52,7 +52,7 @@ pre-build:
 	@cd ${WRKSRC}/libtelnet && ${MAKE}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/telnet ${TARGETDIR}/bin/zh-telnet
+	@${INSTALL_PROGRAM} ${WRKSRC}/telnet ${PREFIX}/bin/zh-telnet
 	@${INSTALL_MAN} ${WRKSRC}/telnet.1 ${MAN1PREFIX}/man/man1/${MAN1}
 
 .include <bsd.port.post.mk>
diff --git a/chinese/vflib/Makefile b/chinese/vflib/Makefile
index b9a7f062da1a..8ca3658befda 100644
--- a/chinese/vflib/Makefile
+++ b/chinese/vflib/Makefile
@@ -27,7 +27,7 @@ BUILD_DEPENDS=	xmkmf:${X_IMAKE_PORT}
 VFLIB_VERSION=	2.25.6
 PLIST_SUB=	VFLIB_VERSION=${VFLIB_VERSION}
 
-DATADIR=	${TARGETDIR}/share/VFlib
+DATADIR=	${PREFIX}/share/VFlib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-freetype \
 		--with-freetype-includedir=${LOCALBASE}/include/freetype1/freetype \
@@ -49,11 +49,11 @@ post-patch:
 
 post-install:
 	@(cd ${WRKSRC}/tools; \
-		${INSTALL_SCRIPT} fmtest disol kban vfperf vftest ${TARGETDIR}/bin)
+		${INSTALL_SCRIPT} fmtest disol kban vfperf vftest ${PREFIX}/bin)
 	@(cd ${WRKSRC}; \
 		${MKDIR} ${DATADIR}/${VFLIB_VERSION} ;\
 		${CP} COPYING COPYING.LIB README.txt.JP_EUC \
 		${DATADIR}/${VFLIB_VERSION})
-	${MV} ${DATADIR}/${VFLIB_VERSION}/VF.h ${TARGETDIR}/include
+	${MV} ${DATADIR}/${VFLIB_VERSION}/VF.h ${PREFIX}/include
 
 .include <bsd.port.post.mk>
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index e463d9647207..ddd49fb8710a 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -33,7 +33,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-install:
-		gtk-query-immodules-2.0 > ${TARGETDIR}/etc/gtk-2.0/gtk.immodules
+		gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
 
 .include <bsd.port.pre.mk>
 
diff --git a/chinese/xemacs/Makefile b/chinese/xemacs/Makefile
index 470c7a90876a..6d768ea0bb28 100644
--- a/chinese/xemacs/Makefile
+++ b/chinese/xemacs/Makefile
@@ -27,7 +27,7 @@ USE_XPM=	yes
 STRIP=
 HAS_CONFIGURE=	yes
 XEMACS_ARCH=	${MACHINE_ARCH}--freebsd
-CONFIGURE_ARGS=	${XEMACS_ARCH} --prefix=${TARGETDIR} \
+CONFIGURE_ARGS=	${XEMACS_ARCH} --prefix=${PREFIX} \
 		--with-mule \
 		--with-xfs \
 		--with-clash-detection \
@@ -81,21 +81,21 @@ CONFIGURE_ARGS+=	--with-xface=no --with-offix=no
 
 post-install:
 .for file in b2m ctags etags gnuclient ${DISTNAME}
-	strip ${TARGETDIR}/bin/${file}
+	strip ${PREFIX}/bin/${file}
 .endfor
 # ``make install'' does not set the permissions like pkg_add does.
 	${CHMOD} 1777 /var/run/emacs/lock
-	${CHMOD} 755 ${TARGETDIR}/lib/xemacs/site-lisp
-	${CHMOD} 755 ${TARGETDIR}/share/emacs/site-lisp
-	${RM} -f ${TARGETDIR}/bin/send-pr
-	${RM} -f ${TARGETDIR}/lib/xemacs-20.4/lisp/mule/mule-init.el.orig
-# Install xemacs20.sh into ${TARGETDIR}/etc/rc.d
-	@if [ ! -d ${TARGETDIR}/etc/rc.d ]; then ${MKDIR} ${TARGETDIR}/etc/rc.d; fi
-	${INSTALL_SCRIPT} ${FILESDIR}/xemacs20.sh ${TARGETDIR}/etc/rc.d
+	${CHMOD} 755 ${PREFIX}/lib/xemacs/site-lisp
+	${CHMOD} 755 ${PREFIX}/share/emacs/site-lisp
+	${RM} -f ${PREFIX}/bin/send-pr
+	${RM} -f ${PREFIX}/lib/xemacs-20.4/lisp/mule/mule-init.el.orig
+# Install xemacs20.sh into ${PREFIX}/etc/rc.d
+	@if [ ! -d ${PREFIX}/etc/rc.d ]; then ${MKDIR} ${PREFIX}/etc/rc.d; fi
+	${INSTALL_SCRIPT} ${FILESDIR}/xemacs20.sh ${PREFIX}/etc/rc.d
 # Install Chinese Big5 related files.
-	@${MKDIR} ${TARGETDIR}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5
-	@${INSTALL_DATA} ${FILESDIR}/Emacs ${TARGETDIR}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5
-	@${INSTALL_DATA} ${FILESDIR}/sample.emacs ${TARGETDIR}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5
+	@${MKDIR} ${PREFIX}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5
+	@${INSTALL_DATA} ${FILESDIR}/Emacs ${PREFIX}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5
+	@${INSTALL_DATA} ${FILESDIR}/sample.emacs ${PREFIX}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5
 # Display XIM usages.
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/chinese/xpdf/Makefile b/chinese/xpdf/Makefile
index d2e910636054..b3ad27d27ab0 100644
--- a/chinese/xpdf/Makefile
+++ b/chinese/xpdf/Makefile
@@ -45,6 +45,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/xpdf-chinese-traditional/${i} ${DATADIR}/chinese-traditional
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/dot.xpdfrc ${DATADIR}/chinese-traditional
-	@${SETENV} PKG_PREFIX=${TARGETDIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/chinese/xsim/Makefile b/chinese/xsim/Makefile
index da34e58bf618..ad3c5659b7db 100644
--- a/chinese/xsim/Makefile
+++ b/chinese/xsim/Makefile
@@ -40,7 +40,7 @@ post-patch:
 	@${REINPLACE_CMD} "s/-O2/${CFLAGS}/g" ${WRKSRC}/configure
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/xsim.sh ${TARGETDIR}/bin/xsim
+	${INSTALL_DATA} ${WRKDIR}/xsim.sh ${PREFIX}/bin/xsim
 	@${MKDIR} ${DATADIR}/dat
 	@${CP} -R ${WRKDIR}/usr/local/xsim/dat/* ${DATADIR}/dat
 	@${CAT} ${PKGMESSAGE}
diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile
index 1d79a1dd08a3..2a1139c9db14 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -30,14 +30,14 @@ SUB_FILES=	pkg-message
 MAN1=		zhcon.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,/etc,${TARGETDIR}/etc,' ${WRKSRC}/doc/zhcon.1.in
+	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}/etc,' ${WRKSRC}/doc/zhcon.1.in
 	@${REINPLACE_CMD} -Ee 's,/dev/vga,/dev/ttyv0,g' ${WRKSRC}/src/display/fbdev.cpp
 	@${REINPLACE_CMD} -Ee 's,endian,sys/endian,g' ${WRKSRC}/src/display/fblinear4.cpp \
 		${WRKSRC}/src/display/fblinear8.cpp ${WRKSRC}/src/display/fblinear16.cpp \
 		${WRKSRC}/src/display/fblinear24.cpp
-	@${REINPLACE_CMD} -e '5 s,#,,; s,/usr/lib,${TARGETDIR}/lib,' ${WRKSRC}/src/zhcon.conf
-	@${REINPLACE_CMD} -e 's,"/etc,"${TARGETDIR}/etc,'  ${WRKSRC}/src/zhcon.cpp
-	@${REINPLACE_CMD} -Ee 's,(\s*=\s*)("?)/usr/local([^"]*)("?),\1\2${TARGETDIR}\3\4,g' \
+	@${REINPLACE_CMD} -e '5 s,#,,; s,/usr/lib,${PREFIX}/lib,' ${WRKSRC}/src/zhcon.conf
+	@${REINPLACE_CMD} -e 's,"/etc,"${PREFIX}/etc,'  ${WRKSRC}/src/zhcon.cpp
+	@${REINPLACE_CMD} -Ee 's,(\s*=\s*)("?)/usr/local([^"]*)("?),\1\2${PREFIX}\3\4,g' \
 		-e '/_nl_expand_alias/s,\(0\),\(\),g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 .if defined(WITH_BIG5)
 	@${REINPLACE_CMD} -e '11 s,gb2312,big5,' ${WRKSRC}/src/zhcon.conf