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

5 files changed, 19 insertions, 19 deletions

diff --git a/ftp/frox/Makefile b/ftp/frox/Makefile
index aa5ea8edfa1a..8673dfc53f3f 100644
--- a/ftp/frox/Makefile
+++ b/ftp/frox/Makefile
@@ -30,8 +30,8 @@ MAN5=		frox.conf.5
 PORTDOCS=	SECURITY CREDITS ChangeLog FAQ.html FAQ-1.html FAQ-2.html \
 		FAQ-3.html FAQ-4.html FAQ-5.html FAQ-6.html FAQ-7.html \
 		FAQ-8.html
-PLIST_FILES=	sbin/frox ${EXAMPLESDIR:S,${TARGETDIR}/,,}/frox.conf
-PLIST_DIRS=	${EXAMPLESDIR:S,${TARGETDIR}/,,}
+PLIST_FILES=	sbin/frox ${EXAMPLESDIR:S,${PREFIX}/,,}/frox.conf
+PLIST_DIRS=	${EXAMPLESDIR:S,${PREFIX}/,,}
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
@@ -73,7 +73,7 @@ CONFIGURE_ARGS+=	--enable-run-as-root
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/frox ${TARGETDIR}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/frox ${PREFIX}/sbin
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/frox.conf ${EXAMPLESDIR}/frox.conf
 	${INSTALL_MAN} ${WRKSRC}/doc/frox.man ${MANPREFIX}/man/man1/frox.1
@@ -86,7 +86,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
 .endfor
 .endif
-	@${STRIP_CMD} ${TARGETDIR}/sbin/frox; \
+	@${STRIP_CMD} ${PREFIX}/sbin/frox; \
 	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/ftp/jftpgw/Makefile b/ftp/jftpgw/Makefile
index 6d9190c46a69..2ba12ef352d8 100644
--- a/ftp/jftpgw/Makefile
+++ b/ftp/jftpgw/Makefile
@@ -26,15 +26,15 @@ MAN1=		jftpgw.1
 USE_RC_SUBR=	jftpgw.sh
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/jftpgw ${TARGETDIR}/sbin/
-		${INSTALL_DATA} ${WRKSRC}/jftpgw.conf.sample ${TARGETDIR}/etc/
-		${INSTALL_MAN} ${WRKSRC}/jftpgw.1 ${TARGETDIR}/man/man1/
-#		${REINPLACE_CMD} -e 's:@PREFIX@:${TARGETDIR}:g' \
+		${INSTALL_PROGRAM} ${WRKSRC}/jftpgw ${PREFIX}/sbin/
+		${INSTALL_DATA} ${WRKSRC}/jftpgw.conf.sample ${PREFIX}/etc/
+		${INSTALL_MAN} ${WRKSRC}/jftpgw.1 ${PREFIX}/man/man1/
+#		${REINPLACE_CMD} -e 's:@PREFIX@:${PREFIX}:g' \
 #			${FILESDIR}/jftpgw.sh.in > ${WRKDIR}/jftpgw.sh
-#		${INSTALL_SCRIPT} ${WRKDIR}/jftpgw.sh ${TARGETDIR}/etc/rc.d
+#		${INSTALL_SCRIPT} ${WRKDIR}/jftpgw.sh ${PREFIX}/etc/rc.d
 .if !defined(NOPORTDOCS)
-		${MKDIR} ${TARGETDIR}/share/doc/jftpgw
-		${INSTALL_DATA} ${WRKSRC}/doc/config.html ${TARGETDIR}/share/doc/jftpgw
+		${MKDIR} ${PREFIX}/share/doc/jftpgw
+		${INSTALL_DATA} ${WRKSRC}/doc/config.html ${PREFIX}/share/doc/jftpgw
 .endif
 
 .include <bsd.port.mk>
diff --git a/ftp/p5-Net-FTPServer/Makefile b/ftp/p5-Net-FTPServer/Makefile
index 89ef334c17e9..5f2355dc7b86 100644
--- a/ftp/p5-Net-FTPServer/Makefile
+++ b/ftp/p5-Net-FTPServer/Makefile
@@ -66,11 +66,11 @@ RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Di
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/root,root/root,wheel/" \
-		-e "s,/usr/sbin,${TARGETDIR}/sbin," \
+		-e "s,/usr/sbin,${PREFIX}/sbin," \
 		${WRKSRC}/Net-FTPServer.spec.PL
 	@${REINPLACE_CMD} -e "s/-g root/-g wheel/" \
-		-e "s,$$.PREFIX./sbin,${TARGETDIR}/sbin," \
-		-e "s,$$.SITEPREFIX./sbin,${TARGETDIR}/sbin," \
+		-e "s,$$.PREFIX./sbin,${PREFIX}/sbin," \
+		-e "s,$$.SITEPREFIX./sbin,${PREFIX}/sbin," \
 		${WRKSRC}/Makefile.PL
 
 post-install:
@@ -80,7 +80,7 @@ post-install:
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
-	@${PERL} -p -e 's,PREFIX,${TARGETDIR},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE}
+	@${PERL} -p -e 's,PREFIX,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/ftp/py-curl/Makefile b/ftp/py-curl/Makefile
index c91fc9fb146f..c7dfd5ebba00 100644
--- a/ftp/py-curl/Makefile
+++ b/ftp/py-curl/Makefile
@@ -23,8 +23,8 @@ USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	pycurl
 USE_OPENSSL=	yes
 
-DOCSDIR=	${TARGETDIR}/share/doc/py-curl
-EXAMPLESDIR=	${TARGETDIR}/share/examples/py-curl
+DOCSDIR=	${PREFIX}/share/doc/py-curl
+EXAMPLESDIR=	${PREFIX}/share/examples/py-curl
 
 post-patch:
 	${REINPLACE_CMD} \
diff --git a/ftp/py-pyftpdlib/Makefile b/ftp/py-pyftpdlib/Makefile
index 59501fa75e1f..dc4ab78933d2 100644
--- a/ftp/py-pyftpdlib/Makefile
+++ b/ftp/py-pyftpdlib/Makefile
@@ -18,8 +18,8 @@ COMMENT=	Python FTP server library
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
-DOCSDIR=	${TARGETDIR}/share/doc/py-${PORTNAME}
-EXAMPLESDIR=	${TARGETDIR}/share/examples/py-${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
+EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
 post-install:
 .if !defined(NOPORTDOCS)