- Use SUB_FILES for pkg-{install,deinstall,message}.

- Replace a literal ${PREFIX} with %%PREFIX%% [*].

PR:	ports/164903 [*]

4 files changed, 37 insertions, 22 deletions

diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index f74cad08bc44..1307198ea233 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -21,30 +21,25 @@ CONFIGURE_ARGS=		DEFAULT_CATALOG_SGML=${CATALOG_PORTS_SGML} \
 .if defined(NOPORTDOCS)
 CONFIGURE_ARGS+=	--disable-docs
 .endif
-PKGINSTALL=		${WRKDIR}/pkg-install.sh
-PKGDEINSTALL=		${WRKDIR}/pkg-deinstall.sh
+PKGINSTALL=		${WRKDIR}/pkg-install
+PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
+SUB_FILES=		pkg-install \
+			pkg-deinstall \
+			pkg-message
+SUB_LIST=		XMLCATMGR=${XMLCATMGR} \
+			CATALOG_MASTER_SGML=${CATALOG_MASTER_SGML} \
+			CATALOG_MASTER_XML=${CATALOG_MASTER_XML} \
+			CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \
+			CATALOG_PORTS_XML=${CATALOG_PORTS_XML}
 
-COMMONVARS=		${WRKDIR}/commonvars.sh
 XMLCATMGR?=		${PREFIX}/bin/xmlcatmgr
 CATALOG_MASTER_SGML?=	${PREFIX}/share/sgml/catalog
 CATALOG_PORTS_SGML?=	${PREFIX}/share/sgml/catalog.ports
 CATALOG_MASTER_XML?=	${PREFIX}/share/xml/catalog
 CATALOG_PORTS_XML?=	${PREFIX}/share/xml/catalog.ports
 
-post-build:
-	( ${ECHO} '#!/bin/sh'; \
-	${ECHO} 'PATH=$${PATH}:/bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin'; \
-	${ECHO} 'export PATH;'; \
-	) > ${COMMONVARS}
-.for V in XMLCATMGR CATALOG_MASTER_SGML CATALOG_MASTER_XML CATALOG_PORTS_SGML CATALOG_PORTS_XML
-	${ECHO} '${V}=${${V}}' >> ${COMMONVARS}
-.endfor
-	${CAT} ${COMMONVARS} ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
-	${CAT} ${COMMONVARS} ${FILESDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
-	${CHMOD} 0555 ${PKGINSTALL} ${PKGDEINSTALL}
-
 post-install:
-	@${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/textproc/xmlcatmgr/files/pkg-deinstall.in b/textproc/xmlcatmgr/files/pkg-deinstall.in
index 76e1526368df..befe3402eab7 100644
--- a/textproc/xmlcatmgr/files/pkg-deinstall.in
+++ b/textproc/xmlcatmgr/files/pkg-deinstall.in
@@ -1,5 +1,15 @@
+#!/bin/sh
 # $FreeBSD$
 
+PATH=/bin:/usr/bin:%%LOCALBASE%%/bin
+
+export PATH
+XMLCATMGR=%%XMLCATMGR%%
+CATALOG_MASTER_SGML=%%CATALOG_MASTER_SGML%%
+CATALOG_MASTER_XML=%%CATALOG_MASTER_XML%%
+CATALOG_PORTS_SGML=%%CATALOG_PORTS_SGML%%
+CATALOG_PORTS_XML=%%CATALOG_PORTS_XML%%
+
 case $2 in
 DEINSTALL)
 
diff --git a/textproc/xmlcatmgr/files/pkg-install.in b/textproc/xmlcatmgr/files/pkg-install.in
index c85adbe08d62..962283496ff0 100644
--- a/textproc/xmlcatmgr/files/pkg-install.in
+++ b/textproc/xmlcatmgr/files/pkg-install.in
@@ -1,5 +1,15 @@
+#!/bin/sh
 # $FreeBSD$
 
+PATH=/bin:/usr/bin:%%LOCALBASE%%/bin
+
+export PATH
+XMLCATMGR=%%XMLCATMGR%%
+CATALOG_MASTER_SGML=%%CATALOG_MASTER_SGML%%
+CATALOG_MASTER_XML=%%CATALOG_MASTER_XML%%
+CATALOG_PORTS_SGML=%%CATALOG_PORTS_SGML%%
+CATALOG_PORTS_XML=%%CATALOG_PORTS_XML%%
+
 case $2 in
 POST-INSTALL)
 
diff --git a/textproc/xmlcatmgr/pkg-message b/textproc/xmlcatmgr/files/pkg-message.in
index 860601ca29bb..4e1913181848 100644
--- a/textproc/xmlcatmgr/pkg-message
+++ b/textproc/xmlcatmgr/files/pkg-message.in
@@ -1,21 +1,21 @@
 The following catalogs are installed:
 
- 1) ${PREFIX}/share/sgml/catalog
+ 1) %%PREFIX%%/share/sgml/catalog
 
    The top level catalog for SGML stuff.  It is not changed
    by any ports/packages except textproc/xmlcatmgr.
 
- 2) ${PREFIX}/share/sgml/catalog.ports
+ 2) %%PREFIX%%/share/sgml/catalog.ports
 
    This catalog is for handling SGML stuff installed under
-   ${PREFIX}/share/sgml.  It is changed by ports/packages.
+   %%PREFIX%%/share/sgml.  It is changed by ports/packages.
 
- 3) ${PREFIX}/share/xml/catalog
+ 3) %%PREFIX%%/share/xml/catalog
 
    The top level catalog for XML stuff.  It is not changed
    by any ports/packages except textproc/xmlcatmgr.
 
- 4) ${PREFIX}/share/xml/catalog.ports
+ 4) %%PREFIX%%/share/xml/catalog.ports
 
    This catalog is for handling XML stuff installed under
-   ${PREFIX}/share/xml.  It is changed by ports/packages.
+   %%PREFIX%%/share/xml.  It is changed by ports/packages.