Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/openoffice.org-2/Makefile,v
--- Makefile	13 Dec 2009 08:40:10 -0000	1.321
+++ Makefile	7 Jan 2010 23:57:38 -0000
@@ -121,7 +121,8 @@ 
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+SUB_LIST=	EXECBASE=${EXECBASE} INSTALLATION_BASEDIR=${INSTALLATION_BASEDIR} OOOTAG=${OOOTAG} OOOVERSION=${OOOVERSION}
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
@@ -270,13 +271,6 @@ 
 	@${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
-	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
-			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
-			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
-			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}