[Midnightbsd-cvs] mports [18938] trunk/textproc/docbook-xml: attempt to fix remove

[laffer1 at midnightbsd.org]

Revision: 18938
          http://svnweb.midnightbsd.org/mports/?rev=18938
Author:   laffer1
Date:     2015-05-14 20:01:46 -0400 (Thu, 14 May 2015)
Log Message:
-----------
attempt to fix remove

Modified Paths:
--------------
    trunk/textproc/docbook-xml/Makefile
    trunk/textproc/docbook-xml/pkg-plist

Modified: trunk/textproc/docbook-xml/Makefile
===================================================================
--- trunk/textproc/docbook-xml/Makefile	2015-05-14 23:59:36 UTC (rev 18937)
+++ trunk/textproc/docbook-xml/Makefile	2015-05-15 00:01:46 UTC (rev 18938)
@@ -3,7 +3,7 @@
 
 PORTNAME=	docbook
 PORTVERSION=	5.0
-PORTREVISION=	0
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${DBFILES:C,(.*):(.*),http://www.docbook.org/xml/\1/:\2,:C,:docbook-xml-([0-9]+).([0-9]+).?([0-9]*),:db\1\2\3,:C,:docbook-([0-9]+).([0-9]+).?([0-9]*),:db\1\2\3,}
 PKGNAMESUFFIX=	-xml
@@ -50,9 +50,9 @@
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${DBKDIR}
 	${ECHO_CMD} "CATALOG \"${LOCALBASE}/share/xml/xmlcharent/catalog\"" \
-	    > ${STAGEDIR}${DBCAT_SGML}
-	${XMLCATMGR_CMD} -c ${STAGEDIR}${DBCAT_XML} create
-	${XMLCATMGR_CMD} -c ${STAGEDIR}${DBCAT_XML} \
+	    > ${DBCAT_SGML}
+	${XMLCATMGR_CMD} -c ${DBCAT_XML} create
+	${XMLCATMGR_CMD} -c ${DBCAT_XML} \
 	    add nextCatalog "${LOCALBASE}/share/xml/xmlcharent/catalog.xml"
 
 .for D in ${DBFILES:C,:.*,,}
@@ -70,7 +70,7 @@
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/catalog412.xml \
-	    ${STAGEDIR}${PREFIX}/${DBKDIR}/4.1.2/catalog.xml
+	    ${PREFIX}/${DBKDIR}/4.1.2/catalog.xml
 	${REINPLACE_CMD} -i'' -e 's|${FAKE_DESTDIR}||g' \
 		${PREFIX}/share/xml/docbook/catalog.xml \
 		${PREFIX}/share/xml/docbook/catalog

Modified: trunk/textproc/docbook-xml/pkg-plist
===================================================================
--- trunk/textproc/docbook-xml/pkg-plist	2015-05-14 23:59:36 UTC (rev 18937)
+++ trunk/textproc/docbook-xml/pkg-plist	2015-05-15 00:01:46 UTC (rev 18938)
@@ -188,6 +188,7 @@
 %%DBKDIR%%/5.0/xsd/xlink.xsd
 %%DBKDIR%%/5.0/xsd/xml.xsd
 %%DBKDIR%%/catalog.xml
+ at exec echo %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove nextCatalog %D/%F
 @unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove nextCatalog %D/%F
 @exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F
 %%DBKDIR%%/catalog