4 files changed, 9 insertions, 21 deletions

diff --git a/mail/dcc-dccd/Makefile b/mail/dcc-dccd/Makefile
index d49c06fe9fb6..de8fce713f15 100644
--- a/mail/dcc-dccd/Makefile
+++ b/mail/dcc-dccd/Makefile
@@ -23,9 +23,6 @@ MANCOMPRESSED=	yes
 MAN8=		cdcc.8 dbclean.8 dblist.8 dcc.8 dccd.8 dccifd.8 dccm.8 \
 		dccproc.8 dccsight.8
 
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-
 USE_RC_SUBR=
 
 #
@@ -70,10 +67,11 @@ PLIST_SUB+=	DCCUSER="${DCCUSER}"
 #
 CONFIGURE_ARGS=	--with-uid=${DCCUSER} --bindir=${PREFIX}/bin --mandir=${MANPREFIX}/man --with-configsuffix=.sample
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-SUB_FILES=		pkg-message
-SUB_LIST+=		WRKSRC=${WRKSRC}
+SUB_FILES=		pkg-install pkg-deinstall pkg-message
+SUB_LIST+=		WRKSRC=${WRKSRC} DCCUSER=${DCCUSER} DCCUID=${DCCUID} \
+			DCCGROUP=${DCCGROUP} DCCGID=${DCCGID} DCCHOME=${DCCHOME}
 
 ## /var/dcc home support
 #
@@ -86,7 +84,6 @@ DCCHOME=		${PREFIX}/dcc
 PLIST_SUB+=		WITH_ALT_HOME="@comment "
 .endif
 
-SUB_LIST+=		DCCHOME=${DCCHOME}
 CONFIGURE_ARGS+=	--homedir=${DCCHOME}
 
 ## dccm milter support
@@ -172,22 +169,13 @@ PLIST_SUB+=	WITH_DCCGREY=""
 PLIST_SUB+=	WITH_DCCGREY="@comment "
 .endif
 
-## Substitutions in pkg-install and pkg-deinstall
-#
-SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%DCCUSER%%|${DCCUSER}|g' -e 's|%%DCCUID%%|${DCCUID}|g' \
-		-e 's|%%DCCGROUP%%|${DCCGROUP}|g' -e 's|%%DCCGID%%|${DCCGID}|g' \
-		-e 's|%%DCCHOME%%|${DCCHOME}|g'
+.include <bsd.port.pre.mk>
 
 pre-everything::
 	@${ECHO_MSG} ' '
 	@${ECHO_MSG} 'A description of ALT_HOME may be found in the port's Makefile.'
 	@${ECHO_MSG} ' '
 
-post-build:
-	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-install >${PKGINSTALL}
-	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-deinstall >${PKGDEINSTALL}
-
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 	${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
diff --git a/mail/dcc-dccd/pkg-deinstall b/mail/dcc-dccd/files/pkg-deinstall.in
index 2b35b92205c6..59a4b03e0d5a 100644
--- a/mail/dcc-dccd/pkg-deinstall
+++ b/mail/dcc-dccd/files/pkg-deinstall.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/mail/dcc-dccd/files/Attic/pkg-deinstall.in,v 1.1 2010-01-31 03:45:21 pgollucci Exp $
 
 if [ "$2" != "POST-DEINSTALL" ]; then
 	exit 0
diff --git a/mail/dcc-dccd/pkg-install b/mail/dcc-dccd/files/pkg-install.in
index 18f998043c3d..dfa2f2d89e95 100644
--- a/mail/dcc-dccd/pkg-install
+++ b/mail/dcc-dccd/files/pkg-install.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/mail/dcc-dccd/files/pkg-install.in,v 1.1 2010-01-31 03:45:21 pgollucci Exp $
 
 PREFIX=${PKG_PREFIX:-%%PREFIX%%}
 
diff --git a/mail/dcc-dccd/pkg-plist b/mail/dcc-dccd/pkg-plist
index 5662f3fcc987..7b975a8b5b11 100644
--- a/mail/dcc-dccd/pkg-plist
+++ b/mail/dcc-dccd/pkg-plist
@@ -54,10 +54,10 @@ dcc/libexec/wlist
 %%WITH_ALT_HOME%%@cwd /var
 @comment -------------------------
 @comment The next group of three-line sets install/remove the config files
-@comment 
+@comment
 @comment **** on uninstall, delete the config file if it matches the sample file
 @unexec if cmp -s %D/dcc/dcc_conf %D/dcc/dcc_conf.sample; then rm -f %D/dcc/dcc_conf; fi
-@comment 
+@comment
 @comment **** the sample file is unilaterally installed/removed
 dcc/dcc_conf.sample
 @comment