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

11 files changed, 52 insertions, 55 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 608c583dd5b..3411d69ebaf 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -629,45 +629,45 @@ pre-install:
 	if ! /usr/sbin/pw groupshow ${EXIM_GROUP}; then /usr/sbin/pw groupadd ${EXIM_GROUP} -g 125; fi
 	if ! /usr/sbin/pw usershow ${EXIM_USER}; then /usr/sbin/pw useradd ${EXIM_USER} -g ${EXIM_GROUP} -u 125 \
 	-h - -d /var/spool/exim -s /nonexistent -c "Exim User"; fi
-	@[ -d "${DESTDIR}/etc" ] || ${MKDIR} "${DESTDIR}/etc"
-	@${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	@[ -d "/etc" ] || ${MKDIR} "/etc"
+	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
 .if !defined(WITHOUT_DAEMON)
-	@${MKDIR} ${DESTDIR}${PREFIX}/etc/periodic/daily
+	@${MKDIR} ${PREFIX}/etc/periodic/daily
 .for script in ${DAILY_SCRIPTS}
-	@${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${DESTDIR}${PREFIX}/etc/periodic/daily/${script}
+	@${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${PREFIX}/etc/periodic/daily/${script}
 .endfor
 .endif
-	@[ -f ${DESTDIR}${PREFIX}/etc/exim/configure ] || \
-		${CP} ${DESTDIR}${PREFIX}/etc/exim/configure.default ${DESTDIR}${PREFIX}/etc/exim/configure
+	@[ -f ${PREFIX}/etc/exim/configure ] || \
+		${CP} ${PREFIX}/etc/exim/configure.default ${PREFIX}/etc/exim/configure
 .for manfile in ${MAN8}
-	@${INSTALL_MAN} ${WRKSRC}/doc/${manfile} ${DESTDIR}${MAN8PREFIX}/man/man8
+	@${INSTALL_MAN} ${WRKSRC}/doc/${manfile} ${MAN8PREFIX}/man/man8
 .endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DESTDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${DESTDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES.clamd ${DESTDIR}${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES.clamd ${DOCSDIR}
 .for docfile in ${PORTDOC_BASE}
-	@${INSTALL_DATA} ${WRKSRC}/${docfile} ${DESTDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
 .endfor
 .for docfile in ${PORTDOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${DESTDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${DOCSDIR}
 .endfor
-	@${MKDIR} ${DESTDIR}${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR}
 .for example in ${PORT_EXAMPLES}
-	@${INSTALL_SCRIPT} ${WRKSRC}/build-${OPSYS}-${ARCH}/${example} ${DESTDIR}${EXAMPLESDIR}
+	@${INSTALL_SCRIPT} ${WRKSRC}/build-${OPSYS}-${ARCH}/${example} ${EXAMPLESDIR}
 .endfor
 .endif
 .if defined(WITH_SA_EXIM)
 	@${INSTALL_DATA} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf \
-		${DESTDIR}${PREFIX}/etc/exim/sa-exim.conf.default
-	@[ -f ${DESTDIR}${PREFIX}/etc/exim/sa-exim.conf ] || \
-	    ${CP} ${DESTDIR}${PREFIX}/etc/exim/sa-exim.conf.default \
-	    ${DESTDIR}${PREFIX}/etc/exim/sa-exim.conf
+		${PREFIX}/etc/exim/sa-exim.conf.default
+	@[ -f ${PREFIX}/etc/exim/sa-exim.conf ] || \
+	    ${CP} ${PREFIX}/etc/exim/sa-exim.conf.default \
+	    ${PREFIX}/etc/exim/sa-exim.conf
 .endif
 	@${CAT} ${PKGMESSAGE}
-	@${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .else
 
diff --git a/mail/exim/pkg-install b/mail/exim/pkg-install
index ee9dbcead7f..616ff41effd 100644
--- a/mail/exim/pkg-install
+++ b/mail/exim/pkg-install
@@ -12,11 +12,10 @@
 #
 
 PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-PKG_DESTDIR=${PKG_DESTDIR:=}
 
 user=%%EXIM_USER%%
 group=%%EXIM_GROUP%%
-logdir=$PKG_DESTDIR%%LOGDIR%%
+logdir=%%LOGDIR%%
 
 if [ "$2" = "PRE-INSTALL" ]; then
 	if ! /usr/bin/id ${user} > /dev/null; then
@@ -31,7 +30,7 @@ if [ "$2" = "PRE-INSTALL" ]; then
 fi
 
 if [ "$2" = "POST-INSTALL" ]; then
-	cf=$PKG_DESTDIR$PKG_PREFIX/etc/exim/configure
+	cf=$PKG_PREFIX/etc/exim/configure
 	if [ -e $cf ]; then
 		if /usr/bin/grep -q '^[^#]*hostlist.*relay_from_hosts.*=.*127.0.0.1' $cf
 		    then
@@ -49,7 +48,7 @@ if [ "$2" = "POST-INSTALL" ]; then
 			echo "============================================================"
 		fi
 	fi
-	if ! /usr/bin/grep -qs "^exim_enable" $PKG_DESTDIR/etc/rc.conf
+	if ! /usr/bin/grep -qs "^exim_enable" /etc/rc.conf
 	    then
 		echo
 		echo "Don't forget to add 'exim_enable=\"YES\"' to rc.conf(5)"
diff --git a/mail/exipick/Makefile b/mail/exipick/Makefile
index 542ead87a7b..fc9af7ee646 100644
--- a/mail/exipick/Makefile
+++ b/mail/exipick/Makefile
@@ -29,8 +29,7 @@ do-build:
 		${WRKSRC}/${DISTNAME} > ${WRKSRC}/${PORTNAME}.pl
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \
-		${DESTDIR}${PREFIX}/bin/${PORTNAME}
+	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
index bdec0d4c40d..554a0afb56b 100644
--- a/mail/mailgraph/Makefile
+++ b/mail/mailgraph/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool	\
 
 NO_BUILD=	yes
 
-DATADIR?=	${DESTDIR}/var/db/mailgraph
+DATADIR?=		/var/db/mailgraph
 MAILGRAPH_USER?=	${WWWOWN}
 MAILGRAPH_GROUP?=	${WWWGRP}
 
@@ -48,11 +48,11 @@ post-patch:
 	@${SED} 's|%%DATADIR%%|${DATADIR}|g' ${MSG_FILE} > ${PKGMESSAGE}
 
 do-install:
-	${MKDIR} ${TARGETDIR}/www/cgi-bin
+	${MKDIR} ${PREFIX}/www/cgi-bin
 	${MKDIR} ${DATADIR}
 	@${CHOWN} -R ${MAILGRAPH_USER}:${MAILGRAPH_GROUP} ${DATADIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/mailgraph.pl ${TARGETDIR}/sbin
-	@${INSTALL_SCRIPT} ${WRKSRC}/mailgraph.cgi ${TARGETDIR}/www/cgi-bin
+	@${INSTALL_SCRIPT} ${WRKSRC}/mailgraph.pl ${PREFIX}/sbin
+	@${INSTALL_SCRIPT} ${WRKSRC}/mailgraph.cgi ${PREFIX}/www/cgi-bin
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	for f in ${DOCS}; do \
diff --git a/mail/mboxstats/Makefile b/mail/mboxstats/Makefile
index 6b06e355dec..e091d5a7f31 100644
--- a/mail/mboxstats/Makefile
+++ b/mail/mboxstats/Makefile
@@ -28,6 +28,6 @@ post-patch:
 	@${REINPLACE_CMD} -Ee 's,(stat|mmap|lseek|off)64,\1,g' ${WRKSRC}/br.h ${WRKSRC}/br.cpp
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mboxstats ${TARGETDIR}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/mboxstats ${PREFIX}/bin
 
 .include <bsd.port.post.mk>
diff --git a/mail/nullpop/Makefile b/mail/nullpop/Makefile
index aefa3dafdce..6189a46c44f 100644
--- a/mail/nullpop/Makefile
+++ b/mail/nullpop/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	pankov_p@mail.ru
 COMMENT=	A POP3 server that allows logins, but never returns any email
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--libexecdir="${TARGETDIR}/bin"
+CONFIGURE_ARGS+=--libexecdir="${PREFIX}/bin"
 
 PLIST_FILES=	bin/nullpop
 MAN8=		nullpop.8
diff --git a/mail/pflogsumm/Makefile b/mail/pflogsumm/Makefile
index 5f050e6c6fd..4f6c6595872 100644
--- a/mail/pflogsumm/Makefile
+++ b/mail/pflogsumm/Makefile
@@ -28,7 +28,7 @@ MAN1=		pflogsumm.1
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \
-		${TARGETDIR}/bin/${PORTNAME}
+		${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index 18c943a095e..9109f76c21c 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -33,7 +33,7 @@ MYSUBDIR?=
 .endif
 
 PREFIX?=	${QMAIL_PREFIX}
-QMPREFIX?=	${TARGETDIR}/${MYSUBDIR}
+QMPREFIX?=	${PREFIX}/${MYSUBDIR}
 
 NO_MTREE=	yes
 
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 474b1efb5c0..843f613c688 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -123,7 +123,7 @@ CONFLICTS2!=	${MAKE_PKGNAMES} | grep -v "${PORTNAME}${PKGNAMESUFFIX}-8."
 CONFLICTS+=	${CONFLICTS2}
 
 # Build site.config.m4
-.if exists(${DESTDIR}/etc/mail/mailer.conf)
+.if exists(/etc/mail/mailer.conf)
 SITE+=	${FILESDIR}/site.config.m4
 .endif
 .if !defined(SENDMAIL_WITHOUT_IPV6)
@@ -143,9 +143,9 @@ USE_OPENSSL=	yes
 .endif
 
 # install directly if no mailwrapper support
-.if ! exists(${DESTDIR}/etc/mail/mailer.conf)
-PREFIX?=	${DESTDIR}/usr
-MANPREFIX?=	${DESTDIR}/usr/share
+.if ! exists(/etc/mail/mailer.conf)
+PREFIX?=	/usr
+MANPREFIX?=	/usr/share
 PLIST_SUB+=	ETCPORT="@comment "
 .else
 PLIST_SUB+=	ETCPORT=""
@@ -290,7 +290,7 @@ post-install:
 	${LN} -sf libmilter.so.${MILTER_SOVER} ${PREFIX}/lib/libmilter.so
 .endif
 .endif
-.if exists(${DESTDIR}/etc/mail/mailer.conf)
+.if exists(/etc/mail/mailer.conf)
 	${INSTALL_SCRIPT} ${WRKSRC}/sm-client.sh \
 		${LOCALBASE}/etc/rc.d/sm-client.sh.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/sendmail.sh \
@@ -332,7 +332,7 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/CYRUS_LOOKUP ${DOCSDIR}/CYRUS_LOOKUP
 .endif
 .endif
-.if exists(${DESTDIR}/etc/mail/mailer.conf)
+.if exists(/etc/mail/mailer.conf)
 	@${CAT} ${PKGMESSAGE}
 
 mailer.base:
@@ -343,9 +343,9 @@ mailer.base:
 	-e "s=^newaliases[ 	]*/.*$$=newaliases	${BASEMAIL}=" \
 	-e "s=^hoststat[ 	]*/.*$$=hoststat	${BASEMAIL}=" \
 	-e "s=^purgestat[ 	]*/.*$$=purgestat	${BASEMAIL}=" \
-	 ${DESTDIR}/etc/mail/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new
-	${MV} ${DESTDIR}/etc/mail/mailer.conf.new \
-		${DESTDIR}/etc/mail/mailer.conf
+	 /etc/mail/mailer.conf > /etc/mail/mailer.conf.new
+	${MV} /etc/mail/mailer.conf.new \
+		/etc/mail/mailer.conf
 
 mailer.conf:
 	@${SED} \
@@ -355,21 +355,21 @@ mailer.conf:
 	-e "s=^newaliases[ 	]*/.*$$=newaliases	${SENDMAIL}=" \
 	-e "s=^hoststat[ 	]*/.*$$=hoststat	${SENDMAIL}=" \
 	-e "s=^purgestat[ 	]*/.*$$=purgestat	${SENDMAIL}=" \
-	 ${DESTDIR}/etc/mail/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new
-	${MV} ${DESTDIR}/etc/mail/mailer.conf.new \
-		${DESTDIR}/etc/mail/mailer.conf
+	 /etc/mail/mailer.conf > /etc/mail/mailer.conf.new
+	${MV} /etc/mail/mailer.conf.new \
+		/etc/mail/mailer.conf
 .endif
 
 # create sumbit.cf on older systems
 #
-submit.cf:	${DESTDIR}/etc/mail/submit.cf
+submit.cf:	/etc/mail/submit.cf
 
-${DESTDIR}/etc/mail/submit.mc:
+/etc/mail/submit.mc:
 	${INSTALL_DATA} ${PREFIX}/share/sendmail/cf/cf/submit.mc \
-		${DESTDIR}/etc/mail/submit.mc
+		/etc/mail/submit.mc
 
-${DESTDIR}/etc/mail/submit.cf:	${DESTDIR}/etc/mail/submit.mc
-	@( cd ${DESTDIR}/etc/mail && ${MAKE} \
+/etc/mail/submit.cf:	/etc/mail/submit.mc
+	@( cd /etc/mail && ${MAKE} \
 		SENDMAIL_CF_DIR=${PREFIX}/share/sendmail/cf \
 		SENDMAIL_MC=submit )
 
@@ -394,7 +394,7 @@ tls-install:
 help:
 	@${ECHO_CMD} "# additional targets:"
 	@${ECHO_CMD} "#"
-	@${ECHO_CMD} "# configure ${DESTDIR}/etc/mail/mailer.conf"
+	@${ECHO_CMD} "# configure /etc/mail/mailer.conf"
 	@${ECHO_CMD} "# for sendmail from ports"
 	@${ECHO_CMD} "make mailer.conf"
 	@${ECHO_CMD} "# for sendmail in the base"
@@ -420,7 +420,7 @@ SITE+=	${FILESDIR}/site.config.m4.tls
 SITE+=	${FILESDIR}/site.config.m4.local
 .endif
 
-.if exists(${DESTDIR}/etc/mail/mailer.conf) && ${PREFIX} == "/usr"
+.if exists(/etc/mail/mailer.conf) && ${PREFIX} == "/usr"
 pre-everything::
 	@${ECHO_CMD} "#"
 	@${ECHO_CMD} "# You can't override the base sendmail this way."
diff --git a/mail/swaks/Makefile b/mail/swaks/Makefile
index 8c4418d731a..6357ac47b18 100644
--- a/mail/swaks/Makefile
+++ b/mail/swaks/Makefile
@@ -47,8 +47,7 @@ do-build:
 		${WRKSRC}/${DISTNAME} > ${WRKSRC}/${PORTNAME}.pl
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \
-		${DESTDIR}${PREFIX}/bin/${PORTNAME}
+	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile
index 65f048d161b..f64ec22a254 100644
--- a/mail/zmailer/Makefile
+++ b/mail/zmailer/Makefile
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX}/ \
 
 MAN1=		rmail.1zm vacation.1zm zmailer.1zm zmsh.1zm mboxpath.1zm mailq.1zm \
 		mailrm.1zm newaliases.1zm
-MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		ZMailer::mailq.3
 MAN5=		aliases.5zm mailq-m.5zm zdbases.conf.5zm zmailer.conf.5zm
 MAN8=		hold.8zm router.8zm scheduler.8zm sendmail.8zm sm.8zm smtp.8zm \