Use PLIST_SUBST to replace ${PLATFORM} in PLIST.

2 files changed, 34 insertions, 37 deletions

diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index aeb48c0aebb..b5660fe17d1 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/02/20 20:10:12 soren Exp $
+# $NetBSD: Makefile,v 1.13 2000/03/03 02:30:44 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1999/04/08 07:49:18 dima Exp $
 
 PKGNAME=	acroread-4.05
@@ -45,13 +45,10 @@ post-patch:
 	${CHMOD} -R o+rwx ${WRKSRC}
 .endif
 
-PLIST_SRC=	${WRKDIR}/PLIST-src
+PLIST_SUBST+=	PLATFORM=${PLATFORM}
 
 NS_PLUGINS_DIR=	${PREFIX}/lib/netscape/plugins
 
-pre-install:
-	${SED} -e 's|@PLATFORM@|${PLATFORM}|g' ${PKGDIR}/PLIST > ${PLIST_SRC}
-
 do-install:
 	@${MKDIR} ${PREFIX}/Acrobat4
 	@ReadInstallDir=${PREFIX}/Acrobat4 ${WRKSRC}/INSTALL
@@ -63,8 +60,8 @@ post-install:
 	     ${PREFIX}/bin/acroread && ${RM} acroread.orig
 	${CHMOD} +x ${PREFIX}/bin/acroread
 	${LN} -f ${PREFIX}/bin/acroread ${PREFIX}/bin/acroread4
-	${INSTALL_PROGRAM_DIR} ${NS_PLUGINS_DIR}
-	${INSTALL_PROGRAM} ${PREFIX}/Acrobat4/Browsers/${PLATFORM}/nppdf.so \
+	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
+	${INSTALL_DATA} ${PREFIX}/Acrobat4/Browsers/${PLATFORM}/nppdf.so \
 		${NS_PLUGINS_DIR}
 	@${ECHO_MSG} "Be sure to read the license agreement in"
 	@${ECHO_MSG} "${PREFIX}/Acrobat4/Reader/License.pdf"
diff --git a/print/acroread/pkg/PLIST b/print/acroread/pkg/PLIST
index 6364659302b..460e7170925 100644
--- a/print/acroread/pkg/PLIST
+++ b/print/acroread/pkg/PLIST
@@ -1,29 +1,29 @@
-@comment $NetBSD: PLIST,v 1.5 2000/02/20 20:10:13 soren Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/03/03 02:30:46 jlam Exp $
 Acrobat4/ReadMe
-Acrobat4/Browsers/@PLATFORM@/nppdf.so
+Acrobat4/Browsers/${PLATFORM}/nppdf.so
 Acrobat4/Browsers/netscape
 Acrobat4/Reader/AcroVersion
 Acrobat4/Reader/Acrobat.pdf
 Acrobat4/Reader/License.pdf
 Acrobat4/Reader/MapTypes.pdf
 Acrobat4/Reader/help/reader.pdf
-Acrobat4/Reader/@PLATFORM@/app-defaults/AcroRead
-Acrobat4/Reader/@PLATFORM@/bin/acroread
-Acrobat4/Reader/@PLATFORM@/lib/XKeysymDB
-Acrobat4/Reader/@PLATFORM@/lib/libAGM.so
-Acrobat4/Reader/@PLATFORM@/lib/libAGM.so.3.0
-Acrobat4/Reader/@PLATFORM@/lib/libCoolType.so
-Acrobat4/Reader/@PLATFORM@/lib/libCoolType.so.1.0
-Acrobat4/Reader/@PLATFORM@/lib/libICC.so
-Acrobat4/Reader/@PLATFORM@/lib/libICC.so.1.0
-Acrobat4/Reader/@PLATFORM@/lib/libreadcore.so
-Acrobat4/Reader/@PLATFORM@/lib/libreadcore.so.4.0
-Acrobat4/Reader/@PLATFORM@/plug_ins/AcroForm.api
-Acrobat4/Reader/@PLATFORM@/plug_ins/Highlight.api
-Acrobat4/Reader/@PLATFORM@/plug_ins/JavaScripts/AFStrENU.js
-Acrobat4/Reader/@PLATFORM@/plug_ins/JavaScripts/AForm.js
-Acrobat4/Reader/@PLATFORM@/plug_ins/ewh.api
-Acrobat4/Reader/@PLATFORM@/plug_ins/wwwlink.api
+Acrobat4/Reader/${PLATFORM}/app-defaults/AcroRead
+Acrobat4/Reader/${PLATFORM}/bin/acroread
+Acrobat4/Reader/${PLATFORM}/lib/XKeysymDB
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
+Acrobat4/Reader/${PLATFORM}/lib/libICC.so
+Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1.0
+Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so
+Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4.0
+Acrobat4/Reader/${PLATFORM}/plug_ins/AcroForm.api
+Acrobat4/Reader/${PLATFORM}/plug_ins/Highlight.api
+Acrobat4/Reader/${PLATFORM}/plug_ins/JavaScripts/AFStrENU.js
+Acrobat4/Reader/${PLATFORM}/plug_ins/JavaScripts/AForm.js
+Acrobat4/Reader/${PLATFORM}/plug_ins/ewh.api
+Acrobat4/Reader/${PLATFORM}/plug_ins/wwwlink.api
 Acrobat4/Reader/res/splashScreen11R.xbm
 Acrobat4/Reader/res/splashScreen18R.xpm
 Acrobat4/Reader/res/splashScreen21.xbm
@@ -51,22 +51,22 @@ Acrobat4/bin/acroread
 bin/acroread
 bin/acroread4
 lib/netscape/plugins/nppdf.so
-@exec ln -sf ../../Resource/Font/ %D/Acrobat4/Reader/@PLATFORM@/fonts
-@unexec rm -f %D/Acrobat4/Reader/@PLATFORM@/fonts
-@exec ln -sf ../../res %D/Acrobat4/Reader/@PLATFORM@/res
-@unexec rm -f %D/Acrobat4/Reader/@PLATFORM@/res
+@exec ln -sf ../../Resource/Font/ %D/Acrobat4/Reader/${PLATFORM}/fonts
+@unexec rm -f %D/Acrobat4/Reader/${PLATFORM}/fonts
+@exec ln -sf ../../res %D/Acrobat4/Reader/${PLATFORM}/res
+@unexec rm -f %D/Acrobat4/Reader/${PLATFORM}/res
 @dirrm Acrobat4/bin
 @dirrm Acrobat4/Resource/Font
 @dirrm Acrobat4/Resource
 @dirrm Acrobat4/Reader/res
-@dirrm Acrobat4/Reader/@PLATFORM@/plug_ins/JavaScripts
-@dirrm Acrobat4/Reader/@PLATFORM@/plug_ins
-@dirrm Acrobat4/Reader/@PLATFORM@/lib
-@dirrm Acrobat4/Reader/@PLATFORM@/bin
-@dirrm Acrobat4/Reader/@PLATFORM@/app-defaults
-@dirrm Acrobat4/Reader/@PLATFORM@
+@dirrm Acrobat4/Reader/${PLATFORM}/plug_ins/JavaScripts
+@dirrm Acrobat4/Reader/${PLATFORM}/plug_ins
+@dirrm Acrobat4/Reader/${PLATFORM}/lib
+@dirrm Acrobat4/Reader/${PLATFORM}/bin
+@dirrm Acrobat4/Reader/${PLATFORM}/app-defaults
+@dirrm Acrobat4/Reader/${PLATFORM}
 @dirrm Acrobat4/Reader/help
 @dirrm Acrobat4/Reader
-@dirrm Acrobat4/Browsers/@PLATFORM@
+@dirrm Acrobat4/Browsers/${PLATFORM}
 @dirrm Acrobat4/Browsers
 @dirrm Acrobat4