From e4239b23d93cdd8bc83e0fbff881fd1662d758a5 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Tue, 3 Feb 2004 06:28:14 +0000
Subject: Correct a typo in the pkg-plist that was masking the fact that
DocBook 4.1.2 didn't include a catalog.xml file. Fix up the port so one is
now able to reinstall it. Note: most users will have to manually remove the
4.1.2 DocBook entry from /usr/local/share/xml/catalog.ports before upgrading
this port.
Finally beaten into looking at this by: truckman
---
textproc/docbook-sk/Makefile | 7 ++-----
textproc/docbook-sk/pkg-plist | 2 --
2 files changed, 2 insertions(+), 7 deletions(-)
(limited to 'textproc')
diff --git a/textproc/docbook-sk/Makefile b/textproc/docbook-sk/Makefile
index 3f91c8d50e89..45b5d8579c0e 100644
--- a/textproc/docbook-sk/Makefile
+++ b/textproc/docbook-sk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= docbook-sk
PORTVERSION= 4.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= http://www.docbook.org/xml/${PORTVERSION}/
DISTNAME= docbkx${PORTVERSION:S/.//g}
@@ -23,13 +23,11 @@ NO_WRKSUBDIR= yes
PLIST_SUB= DTD_VERSION=${PORTVERSION} \
XMLCATMGR=${XMLCATMGR} \
DOCBOOKDIR=${DOCBOOKDIR} \
- CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \
- CATALOG_PORTS_XML=${CATALOG_PORTS_XML}
+ CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
DOCBOOKDIR= ${PREFIX}/share/xml/${PORTNAME:S/-sk//}/${PORTVERSION}
XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr
CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports
-CATALOG_PORTS_XML= ${PREFIX}/share/xml/catalog.ports
pre-install:
@[ -d ${DOCBOOKDIR}/ent ] || ${MKDIR} ${DOCBOOKDIR}/ent
@@ -41,6 +39,5 @@ do-install:
post-install:
@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DOCBOOKDIR}/docbook.cat
- @${XMLCATMGR} -c ${CATALOG_PORTS_XML} add nextCatalog ${DOCBOOKDIR}/catalog.xml
.include <bsd.port.mk>
diff --git a/textproc/docbook-sk/pkg-plist b/textproc/docbook-sk/pkg-plist
index 2ee29f6034ba..2dc07f24ba75 100644
--- a/textproc/docbook-sk/pkg-plist
+++ b/textproc/docbook-sk/pkg-plist
@@ -2,8 +2,6 @@ share/xml/docbook/%%DTD_VERSION%%/40chg.txt
share/xml/docbook/%%DTD_VERSION%%/41chg.txt
share/xml/docbook/%%DTD_VERSION%%/ChangeLog
share/xml/docbook/%%DTD_VERSION%%/calstblx.dtd
-@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove %%DOCBOOKDIR%%/catalog.xmlshare/xml/docbook/%%DTD_VERSION%%/catalog.xml
-@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add nextCatalog %%DOCBOOKDIR%%/catalog.xml
share/xml/docbook/%%DTD_VERSION%%/dbcentx.mod
share/xml/docbook/%%DTD_VERSION%%/dbgenent.mod
share/xml/docbook/%%DTD_VERSION%%/dbhierx.mod
--
cgit v1.2.3