[Midnightbsd-cvs] mports [18727] U trunk/textproc/docbook-xsl/files/pkg-install.in: use pkg-install again

[laffer1 at midnightbsd.org]

Revision: 18727
          http://svnweb.midnightbsd.org/mports/?rev=18727
Author:   laffer1
Date:     2015-05-01 20:49:35 -0400 (Fri, 01 May 2015)
Log Message:
-----------
use pkg-install again

Modified Paths:
--------------
    trunk/textproc/docbook-xsl/Makefile
    trunk/textproc/docbook-xsl/files/pkg-deinstall.in
    trunk/textproc/docbook-xsl/files/pkg-install.in

Property Changed:
----------------
    trunk/textproc/docbook-xsl/files/pkg-deinstall.in
    trunk/textproc/docbook-xsl/files/pkg-install.in

Modified: trunk/textproc/docbook-xsl/Makefile
===================================================================
--- trunk/textproc/docbook-xsl/Makefile	2015-05-02 00:24:02 UTC (rev 18726)
+++ trunk/textproc/docbook-xsl/Makefile	2015-05-02 00:49:35 UTC (rev 18727)
@@ -3,6 +3,7 @@
 
 PORTNAME=	docbook-xsl
 PORTVERSION=	1.76.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/docbook/${PORTNAME}/${PORTVERSION}:src \
  		SF/docbook/${PORTNAME}-doc/${PORTVERSION}:doc
@@ -31,7 +32,12 @@
 		template tools wordml xhtml
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-install pkg-deinstall
+SUB_LIST+=	INSTDIR="${INSTDIR}" \
+		XMLCATMGR="${XMLCATMGR}" \
+		CATALOG_PORTS="${LOCALBASE}/share/xml/catalog.ports"
 
+
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
 CATALOG_XSL=	${WRKSRC}/catalog
 

Modified: trunk/textproc/docbook-xsl/files/pkg-deinstall.in
===================================================================
--- trunk/textproc/docbook-xsl/files/pkg-deinstall.in	2015-05-02 00:24:02 UTC (rev 18726)
+++ trunk/textproc/docbook-xsl/files/pkg-deinstall.in	2015-05-02 00:49:35 UTC (rev 18727)
@@ -2,13 +2,10 @@
 # This script will remove the docbook-xsl entries added to xml catalog.
 # -- Rui Lopes <rui at ruilopes.com>
 
-XMLCATMGR=@XMLCATMGR@
-CATALOG_PORTS_XML=@CATALOG_PORTS_XML@
-
-if [ "$2" != "POST-DEINSTALL" ]; then
+if [ "$2" != "DEINSTALL" ]; then
 	exit 0
 fi
 
-${XMLCATMGR} -c "${CATALOG_PORTS_XML}" remove \
-	http://docbook.sourceforge.net/release/xsl/ 
+%%XMLCATMGR%% -c %%CATALOG_PORTS%% remove \
+	http://docbook.sourceforge.net/release/xsl/
 exit 0


Property changes on: trunk/textproc/docbook-xsl/files/pkg-deinstall.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/textproc/docbook-xsl/files/pkg-install.in
===================================================================
--- trunk/textproc/docbook-xsl/files/pkg-install.in	2015-05-02 00:24:02 UTC (rev 18726)
+++ trunk/textproc/docbook-xsl/files/pkg-install.in	2015-05-02 00:49:35 UTC (rev 18727)
@@ -10,35 +10,21 @@
 #
 # -- Rui Lopes <rui at ruilopes.com>
 
-XMLCATMGR=@XMLCATMGR@
-CATALOG_PORTS_XML=@CATALOG_PORTS_XML@
-XSL_DIR=${PKG_PREFIX}/@INSTDIR@
-CATALOG_XSL=${XSL_DIR}/catalog
+XSL_DIR=${PKG_PREFIX}/%%INSTDIR%%
+CATALOG_XSL=${XSL_DIR}/catalog.xml
 
 if [ "$2" != "POST-INSTALL" ]; then
 	exit 0
 fi
 
-VERSIONS='1.36 1.37 1.38 1.39 1.40 1.41 1.42 1.43 1.44 1.45 1.46 1.47 1.48 1.49 1.50.0 1.51.0 1.51.1 1.52.0 1.52.1 1.52.2 1.53.0 1.54.0 1.54.1 1.55.0 1.56.0 1.56.1 1.57.0 1.58.0 1.58.1 1.59.0 1.59.1 1.59.2 1.60.0 1.60.1 1.61.0 1.61.1 1.61.2 1.61.3 1.62.0 1.62.1 1.62.2 1.62.3 1.62.4 1.63.0 1.64.0 1.64.1 1.65.0 1.65.1 1.66.0 1.66.1 1.67.0 1.67.2 1.68.0 1.68.1 1.69.0 1.69.1 1.70.0 1.70.1 current'
-
-if [ ! -f ${CATALOG_XSL} ]; then
-	 ${XMLCATMGR} -c "${CATALOG_XSL}" create
-fi
-
-for version in ${VERSIONS}
-do
-	${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteSystem \
-		http://docbook.sourceforge.net/release/xsl/$version \
-		"file://${XSL_DIR}"
-	${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteURI \
-		http://docbook.sourceforge.net/release/xsl/$version \
-		"file://${XSL_DIR}"
-done
-
-${XMLCATMGR} -c "${CATALOG_PORTS_XML}" add delegateSystem \
+test -r "${CATALOG_XSL}" || {
+    echo >&2 "Cannot register non-existent catalog ${CATALOG_XSL}"
+    exit 1
+}
+%%XMLCATMGR%% -c %%CATALOG_PORTS%% add delegateSystem \
 	http://docbook.sourceforge.net/release/xsl/ \
 	"file://${CATALOG_XSL}"
-${XMLCATMGR} -c "${CATALOG_PORTS_XML}" add delegateURI \
+%%XMLCATMGR%% -c %%CATALOG_PORTS%% add delegateURI \
 	http://docbook.sourceforge.net/release/xsl/ \
 	"file://${CATALOG_XSL}"
 exit 0


Property changes on: trunk/textproc/docbook-xsl/files/pkg-install.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property