diff options
45 files changed, 340 insertions, 172 deletions
diff --git a/textproc/docbook-241/Makefile b/textproc/docbook-241/Makefile index 49c809072fdc..7256c67a4628 100644 --- a/textproc/docbook-241/Makefile +++ b/textproc/docbook-241/Makefile @@ -9,6 +9,7 @@ PORTNAME= docbook PORTVERSION= 241 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= ftp://ftp.ora.com/pub/davenport/ DISTFILES= docbk241.tar.Z @@ -17,31 +18,36 @@ MAINTAINER= nik@FreeBSD.org COMMENT= V2.4.1 of the DocBook DTD, designed for technical documentation RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog + ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr NO_MTREE= yes EXTRACT_ONLY= # empty NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} DTD_VERSION=2.4.1 MKCATALOG=${MKCATALOG} +PLIST_SUB= DTD_NAME=${PORTNAME} +PLIST_SUB+= DTD_VERSION=${DTD_VERSION} +PLIST_SUB+= XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} INSTDIR= ${PREFIX}/share/sgml/docbook ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog -MKCATALOG= ${PREFIX}/sbin/mkcatalog +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports +DTD_VERSION= 2.4.1 LATEST_LINK= docbook-241 pre-install: - @[ -d ${INSTDIR}/2.4.1 ] || ${MKDIR} ${INSTDIR}/2.4.1 + @[ -d ${INSTDIR}/${DTD_VERSION} ] || ${MKDIR} ${INSTDIR}/${DTD_VERSION} do-install: - @zcat ${DISTDIR}/docbk241.tar.Z |(cd ${INSTDIR}/2.4.1; pax -r) - @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/2.4.1/catalog - @${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/2.4.1/catalog - @${CHMOD} ${SHAREMODE} ${INSTDIR}/2.4.1/* + @zcat ${DISTDIR}/docbk241.tar.Z |(cd ${INSTDIR}/${DTD_VERSION}; pax -r) + @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/${DTD_VERSION}/catalog + @${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/${DTD_VERSION}/catalog + @${CHMOD} ${SHAREMODE} ${INSTDIR}/${DTD_VERSION}/* @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR} post-install: - @${MKCATALOG} -q install ${PORTNAME}/2.4.1 + @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/${DTD_VERSION}/catalog .include <bsd.port.mk> diff --git a/textproc/docbook-241/pkg-plist b/textproc/docbook-241/pkg-plist index f2a52a565934..c5118d396a4e 100644 --- a/textproc/docbook-241/pkg-plist +++ b/textproc/docbook-241/pkg-plist @@ -6,8 +6,8 @@ share/sgml/docbook/2.4.1/dbpool.mod share/sgml/docbook/2.4.1/docbook.cat share/sgml/docbook/2.4.1/docbook.dcl share/sgml/docbook/2.4.1/docbook.dtd -@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%%/%%DTD_VERSION%% +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/%%DTD_VERSION%%/catalog share/sgml/docbook/2.4.1/catalog -@exec %%MKCATALOG%% -q install %%DTD_NAME%%/%%DTD_VERSION%% +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add %%DTD_NAME%%/%%DTD_VERSION%%/catalog @dirrm share/sgml/docbook/2.4.1 @unexec rmdir %D/share/sgml/docbook 2>/dev/null || true diff --git a/textproc/docbook-300/Makefile b/textproc/docbook-300/Makefile index 4a82fe2f0342..b5f0971b5ba5 100644 --- a/textproc/docbook-300/Makefile +++ b/textproc/docbook-300/Makefile @@ -9,6 +9,7 @@ PORTNAME= docbook PORTVERSION= 3.0 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= ftp://ftp.ora.com/pub/davenport/ DISTFILES= docbk30.tar.Z @@ -17,32 +18,35 @@ MAINTAINER= nik@FreeBSD.org COMMENT= V3.0 of the DocBook DTD, designed for technical documentation RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog + ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr NO_MTREE= yes EXTRACT_ONLY= # empty NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} DTD_VERSION=${PORTVERSION} \ - MKCATALOG=${MKCATALOG} +PLIST_SUB= DTD_NAME=${PORTNAME} +PLIST_SUB+= DTD_VERSION=${PORTVERSION} +PLIST_SUB+= XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} INSTDIR= ${PREFIX}/share/sgml/docbook ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog -MKCATALOG= ${PREFIX}/sbin/mkcatalog +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports -LATEST_LINK= docbook-300 +LATEST_LINK= docbook-${PORTVERSION} pre-install: - @[ -d ${INSTDIR}/3.0 ] || ${MKDIR} ${INSTDIR}/3.0 + @[ -d ${INSTDIR}/${PORTVERSION} ] || ${MKDIR} ${INSTDIR}/${PORTVERSION} do-install: - @zcat ${DISTDIR}/docbk30.tar.Z |(cd ${INSTDIR}/3.0; pax -r) - @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/3.0/catalog - @${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.0/catalog - @${CHMOD} ${SHAREMODE} ${INSTDIR}/3.0/* + @zcat ${DISTDIR}/docbk30.tar.Z |(cd ${INSTDIR}/${PORTVERSION}; pax -r) + @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/${PORTVERSION}/catalog + @${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/${PORTVERSION}/catalog + @${CHMOD} ${SHAREMODE} ${INSTDIR}/${PORTVERSION}/* @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR} post-install: - @${MKCATALOG} -q install ${PORTNAME}/${PORTVERSION} + @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/${PORTVERSION}/catalog .include <bsd.port.mk> diff --git a/textproc/docbook-300/pkg-plist b/textproc/docbook-300/pkg-plist index 6f5c42709542..f0842950cb88 100644 --- a/textproc/docbook-300/pkg-plist +++ b/textproc/docbook-300/pkg-plist @@ -8,8 +8,8 @@ share/sgml/docbook/3.0/dbpool.mod share/sgml/docbook/3.0/docbook.cat share/sgml/docbook/3.0/docbook.dcl share/sgml/docbook/3.0/docbook.dtd -@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%%/%%DTD_VERSION%% +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/%%DTD_VERSION%%/catalog share/sgml/docbook/3.0/catalog -@exec %%MKCATALOG%% -q install %%DTD_NAME%%/%%DTD_VERSION%% +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add %%DTD_NAME%%/%%DTD_VERSION%%/catalog @dirrm share/sgml/docbook/3.0 @unexec rmdir %D/share/sgml/docbook 2>/dev/null || true diff --git a/textproc/docbook-310/Makefile b/textproc/docbook-310/Makefile index e830888be061..1432148b8565 100644 --- a/textproc/docbook-310/Makefile +++ b/textproc/docbook-310/Makefile @@ -9,6 +9,7 @@ PORTNAME= docbook PORTVERSION= 3.1 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.docbook.org/sgml/3.1/ DISTNAME= docbk31 @@ -17,33 +18,36 @@ MAINTAINER= nik@FreeBSD.org COMMENT= V3.1 of the DocBook DTD, designed for technical documentation RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog + ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr USE_ZIP= yes NO_MTREE= yes EXTRACT_ONLY= # empty NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} DTD_VERSION=${PORTVERSION} \ - MKCATALOG=${MKCATALOG} +PLIST_SUB= DTD_NAME=${PORTNAME} +PLIST_SUB+= DTD_VERSION=${PORTVERSION} +PLIST_SUB+= XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} INSTDIR= ${PREFIX}/share/sgml/docbook ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog -MKCATALOG= ${PREFIX}/sbin/mkcatalog +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports LATEST_LINK= docbook-310 pre-install: - @[ -d ${INSTDIR}/3.1 ] || ${MKDIR} ${INSTDIR}/3.1 + @[ -d ${INSTDIR}/${PORTVERSION} ] || ${MKDIR} ${INSTDIR}/${PORTVERSION} do-install: - @unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/3.1 - @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/3.1/catalog - @${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.1/catalog - @${CHMOD} ${SHAREMODE} ${INSTDIR}/3.1/* + @unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/${PORTVERSION} + @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/${PORTVERSION}/catalog + @${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/${PORTVERSION}/catalog + @${CHMOD} ${SHAREMODE} ${INSTDIR}/${PORTVERSION}/* @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR} post-install: - @${MKCATALOG} -q install ${PORTNAME}/${PORTVERSION} + @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/${PORTVERSION}/catalog .include <bsd.port.mk> diff --git a/textproc/docbook-310/pkg-plist b/textproc/docbook-310/pkg-plist index 670d27d7da01..001f22f219d8 100644 --- a/textproc/docbook-310/pkg-plist +++ b/textproc/docbook-310/pkg-plist @@ -11,9 +11,9 @@ share/sgml/docbook/3.1/dbpool.mod share/sgml/docbook/3.1/docbook.cat share/sgml/docbook/3.1/docbook.dcl share/sgml/docbook/3.1/docbook.dtd -@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%%/%%DTD_VERSION%% +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/%%DTD_VERSION%%/catalog share/sgml/docbook/3.1/catalog -@exec %%MKCATALOG%% -q install %%DTD_NAME%%/%%DTD_VERSION%% +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add %%DTD_NAME%%/%%DTD_VERSION%%/catalog share/sgml/docbook/3.1/readme.txt @dirrm share/sgml/docbook/3.1 @unexec rmdir %D/share/sgml/docbook 2>/dev/null || true diff --git a/textproc/docbook-400/Makefile b/textproc/docbook-400/Makefile index f221d8a7c366..2a74667acb17 100644 --- a/textproc/docbook-400/Makefile +++ b/textproc/docbook-400/Makefile @@ -9,6 +9,7 @@ PORTNAME= docbook PORTVERSION= 4.0 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.oasis-open.org/docbook/sgml/4.0/ DISTNAME= docbk40 @@ -17,33 +18,36 @@ MAINTAINER= asmodai@FreeBSD.org COMMENT= V4.0 of the DocBook DTD, designed for technical documentation RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog + ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr USE_ZIP= yes NO_MTREE= yes EXTRACT_ONLY= # empty NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} DTD_VERSION=${PORTVERSION} \ - MKCATALOG=${MKCATALOG} +PLIST_SUB= DTD_NAME=${PORTNAME} +PLIST_SUB+= DTD_VERSION=${PORTVERSION} +PLIST_SUB+= XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} INSTDIR= ${PREFIX}/share/sgml/docbook ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog -MKCATALOG= ${PREFIX}/sbin/mkcatalog +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports LATEST_LINK= docbook-400 pre-install: - @[ -d ${INSTDIR}/4.0 ] || ${MKDIR} ${INSTDIR}/4.0 + @[ -d ${INSTDIR}/${PORTVERSION} ] || ${MKDIR} ${INSTDIR}/${PORTVERSION} do-install: - @unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/4.0 - @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/4.0/catalog - @${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/4.0/catalog - @${CHMOD} ${SHAREMODE} ${INSTDIR}/4.0/* + @unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/${PORTVERSION} + @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/${PORTVERSION}/catalog + @${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/${PORTVERSION}/catalog + @${CHMOD} ${SHAREMODE} ${INSTDIR}/${PORTVERSION}/* @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR} post-install: - @${MKCATALOG} -q install ${PORTNAME}/${PORTVERSION} + @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/${PORTVERSION}/catalog .include <bsd.port.mk> diff --git a/textproc/docbook-400/pkg-plist b/textproc/docbook-400/pkg-plist index f6ec9edad73f..9ee548206d84 100644 --- a/textproc/docbook-400/pkg-plist +++ b/textproc/docbook-400/pkg-plist @@ -9,9 +9,9 @@ share/sgml/docbook/4.0/dbpool.mod share/sgml/docbook/4.0/docbook.cat share/sgml/docbook/4.0/docbook.dcl share/sgml/docbook/4.0/docbook.dtd -@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%%/%%DTD_VERSION%% +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/%%DTD_VERSION%%/catalog share/sgml/docbook/4.0/catalog -@exec %%MKCATALOG%% -q install %%DTD_NAME%%/%%DTD_VERSION%% +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add %%DTD_NAME%%/%%DTD_VERSION%%/catalog share/sgml/docbook/4.0/readme.txt @dirrm share/sgml/docbook/4.0 @unexec rmdir %D/share/sgml/docbook 2>/dev/null || true diff --git a/textproc/docbook-410/Makefile b/textproc/docbook-410/Makefile index 54902e119a7b..03f8322923f0 100644 --- a/textproc/docbook-410/Makefile +++ b/textproc/docbook-410/Makefile @@ -9,6 +9,7 @@ PORTNAME= docbook PORTVERSION= 4.1 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.docbook.org/sgml/4.1/ DISTNAME= docbk41 @@ -18,32 +19,35 @@ MAINTAINER= murray@freebsd.org COMMENT= V4.1 of the DocBook DTD, designed for technical documentation RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog + ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr USE_ZIP= yes NO_MTREE= yes NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} DTD_VERSION=${PORTVERSION} \ - MKCATALOG=${MKCATALOG} +PLIST_SUB= DTD_NAME=${PORTNAME} +PLIST_SUB+= DTD_VERSION=${PORTVERSION} +PLIST_SUB+= XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} INSTDIR= ${PREFIX}/share/sgml/docbook ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog -MKCATALOG= ${PREFIX}/sbin/mkcatalog +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports LATEST_LINK= docbook-410 pre-install: - @[ -d ${INSTDIR}/4.1 ] || ${MKDIR} ${INSTDIR}/4.1 + @[ -d ${INSTDIR}/${PORTVERSION} ] || ${MKDIR} ${INSTDIR}/${PORTVERSION} do-install: - @unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/4.1 - @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/4.1/catalog - @${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/4.1/catalog - @${CHMOD} ${SHAREMODE} ${INSTDIR}/4.1/* + @unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/${PORTVERSION} + @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/${PORTVERSION}/catalog + @${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/${PORTVERSION}/catalog + @${CHMOD} ${SHAREMODE} ${INSTDIR}/${PORTVERSION}/* @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR} post-install: - @${MKCATALOG} -q install ${PORTNAME}/${PORTVERSION} + @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/${PORTVERSION}/catalog .include <bsd.port.mk> diff --git a/textproc/docbook-410/pkg-plist b/textproc/docbook-410/pkg-plist index e056cf6db41b..1c667d05f4de 100644 --- a/textproc/docbook-410/pkg-plist +++ b/textproc/docbook-410/pkg-plist @@ -3,9 +3,9 @@ share/sgml/docbook/4.1/41chg.txt share/sgml/docbook/4.1/50issues.txt share/sgml/docbook/4.1/ChangeLog share/sgml/docbook/4.1/cals-tbl.dtd -@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%%/%%DTD_VERSION%% +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/%%DTD_VERSION%%/catalog share/sgml/docbook/4.1/catalog -@exec %%MKCATALOG%% -q install %%DTD_NAME%%/%%DTD_VERSION%% +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add %%DTD_NAME%%/%%DTD_VERSION%%/catalog share/sgml/docbook/4.1/dbcent.mod share/sgml/docbook/4.1/dbgenent.mod share/sgml/docbook/4.1/dbhier.mod diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile index 6dd2333efd7e..63f23f6726b3 100644 --- a/textproc/docbook-xml/Makefile +++ b/textproc/docbook-xml/Makefile @@ -7,6 +7,7 @@ PORTNAME= docbook-xml PORTVERSION= 4.2 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.docbook.org/xml/${PORTVERSION}/ \ http://www.oasis-open.org/committees/docbook/xml/${PORTVERSION}/ @@ -14,17 +15,21 @@ MASTER_SITES= http://www.docbook.org/xml/${PORTVERSION}/ \ MAINTAINER= kuriyama@FreeBSD.org COMMENT= XML version of the DocBook DTD -RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr USE_ZIP= YES NO_BUILD= YES NO_WRKSUBDIR= YES PLIST_SUB= DTD_VERSION=${PORTVERSION} \ - MKCATALOG=${MKCATALOG} CATALOG=${CATALOG} + XMLCATMGR=${XMLCATMGR}\ + DOCBOOKDIR=${DOCBOOKDIR}\ + CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \ + CATALOG_PORTS_XML=${CATALOG_PORTS_XML} DOCBOOKDIR= ${PREFIX}/share/xml/${PORTNAME:S/-xml//}/${PORTVERSION} -MKCATALOG= ${LOCALBASE}/sbin/mkcatalog -CATALOG= ${PREFIX}/share/xml/catalog +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 @@ -35,6 +40,7 @@ do-install: done post-install: - ${MKCATALOG} -q -c ${CATALOG} install docbook/${PORTVERSION} docbook.cat + @${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-xml/pkg-plist b/textproc/docbook-xml/pkg-plist index 6195f7d07bf3..d2e244255014 100644 --- a/textproc/docbook-xml/pkg-plist +++ b/textproc/docbook-xml/pkg-plist @@ -1,15 +1,17 @@ share/xml/docbook/%%DTD_VERSION%%/ChangeLog share/xml/docbook/%%DTD_VERSION%%/README share/xml/docbook/%%DTD_VERSION%%/calstblx.dtd +@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove %%DOCBOOKDIR%%/catalog.xml share/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 share/xml/docbook/%%DTD_VERSION%%/dbnotnx.mod share/xml/docbook/%%DTD_VERSION%%/dbpoolx.mod -@unexec %%MKCATALOG%% -q -c%%CATALOG%% deinstall docbook/%%DTD_VERSION%% docbook.cat +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DOCBOOKDIR%%/docbook.cat share/xml/docbook/%%DTD_VERSION%%/docbook.cat -@exec %%MKCATALOG%% -q -c%%CATALOG%% install docbook/%%DTD_VERSION%% docbook.cat +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DOCBOOKDIR%%/docbook.cat share/xml/docbook/%%DTD_VERSION%%/docbookx.dtd share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsa.ent share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsb.ent diff --git a/textproc/html/Makefile b/textproc/html/Makefile index 6a49bf1acccb..d007823170ab 100644 --- a/textproc/html/Makefile +++ b/textproc/html/Makefile @@ -7,6 +7,7 @@ PORTNAME= html PORTVERSION= 4.01 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= kuriyama @@ -15,15 +16,18 @@ EXTRACT_ONLY= # empty MAINTAINER= kuriyama@FreeBSD.org COMMENT= All W3C published SGML DTDs for HTML -RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr NO_MTREE= yes NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} MKCATALOG=${MKCATALOG} + +PLIST_SUB= DTD_NAME=${PORTNAME} XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} INSTDIR= ${PREFIX}/share/sgml/html -MKCATALOG= ${PREFIX}/sbin/mkcatalog +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports pre-install: @[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR} @@ -34,6 +38,6 @@ do-install: @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR} post-install: - @${MKCATALOG} -q install ${PORTNAME} + @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/catalog .include <bsd.port.mk> diff --git a/textproc/html/pkg-plist b/textproc/html/pkg-plist index ce3e2d0fba61..727dfded3df1 100644 --- a/textproc/html/pkg-plist +++ b/textproc/html/pkg-plist @@ -21,9 +21,9 @@ share/sgml/html/4.01/HTMLsymbol.ent share/sgml/html/4.01/frameset.dtd share/sgml/html/4.01/loose.dtd share/sgml/html/4.01/strict.dtd -@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%% +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/catalog share/sgml/html/catalog -@exec %%MKCATALOG%% -q install %%DTD_NAME%% +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add %%DTD_NAME%%/catalog @dirrm share/sgml/html/2.0 @dirrm share/sgml/html/3.2 @dirrm share/sgml/html/4.0 diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile index 6f703f4d4974..5fce8251b72c 100644 --- a/textproc/iso12083/Makefile +++ b/textproc/iso12083/Makefile @@ -7,6 +7,7 @@ PORTNAME= iso12083 PORTVERSION= 1993 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= kuriyama/iso12083 @@ -16,17 +17,19 @@ EXTRACT_ONLY= # empty MAINTAINER= kuriyama@FreeBSD.org COMMENT= SGML DTDs from the The Electronic Publishing Special Interest Group -RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr DIST_SUBDIR= iso12083 NO_MTREE= yes NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} MKCATALOG=${MKCATALOG} +PLIST_SUB= DTD_NAME=${PORTNAME} XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} INSTDIR= ${PREFIX}/share/sgml/iso12083 -MKCATALOG= ${PREFIX}/sbin/mkcatalog +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports pre-install: @[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR} @@ -38,6 +41,6 @@ do-install: @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/catalog post-install: - @${MKCATALOG} -q install ${PORTNAME} + @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/catalog .include <bsd.port.mk> diff --git a/textproc/iso12083/pkg-plist b/textproc/iso12083/pkg-plist index 34a1779fc16b..c55aec39ffad 100644 --- a/textproc/iso12083/pkg-plist +++ b/textproc/iso12083/pkg-plist @@ -2,7 +2,7 @@ share/sgml/iso12083/article.dtd share/sgml/iso12083/book.dtd share/sgml/iso12083/maths.dtd share/sgml/iso12083/serial.dtd -@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%% +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/catalog share/sgml/iso12083/catalog -@exec %%MKCATALOG%% -q install %%DTD_NAME%% +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add %%DTD_NAME%%/catalog @dirrm share/sgml/iso12083 diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile index e2377434f0d7..7c85ce196266 100644 --- a/textproc/iso8879/Makefile +++ b/textproc/iso8879/Makefile @@ -7,6 +7,7 @@ PORTNAME= iso8879 PORTVERSION= 1986 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= kuriyama @@ -17,15 +18,17 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= Character entity sets from ISO 8879:1986 (SGML) BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr EXTRACT_ONLY= # empty NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} MKCATALOG=${MKCATALOG} +PLIST_SUB= DTD_NAME=${PORTNAME} XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} INSTDIR= ${PREFIX}/share/sgml/iso8879 -MKCATALOG= ${PREFIX}/sbin/mkcatalog +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports pre-install: @[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR} @@ -37,6 +40,6 @@ do-install: @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR} post-install: - @${MKCATALOG} -q install ${PORTNAME} + @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/catalog .include <bsd.port.mk> diff --git a/textproc/iso8879/pkg-plist b/textproc/iso8879/pkg-plist index 9dfc38ee1b49..cf98d7e945e1 100644 --- a/textproc/iso8879/pkg-plist +++ b/textproc/iso8879/pkg-plist @@ -17,7 +17,7 @@ share/sgml/iso8879/ISOlat2 share/sgml/iso8879/ISOnum share/sgml/iso8879/ISOpub share/sgml/iso8879/ISOtech -@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%% +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/catalog share/sgml/iso8879/catalog -@exec %%MKCATALOG%% -q install %%DTD_NAME%% +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add %%DTD_NAME%%/catalog @dirrm share/sgml/iso8879 diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile index f93da0bbb8ae..f14b54deb24a 100644 --- a/textproc/jade/Makefile +++ b/textproc/jade/Makefile @@ -7,7 +7,7 @@ PORTNAME= jade PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= ftp://ftp.jclark.com/pub/jade/ @@ -18,10 +18,17 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= kuriyama@FreeBSD.org COMMENT= An object-oriented SGML/XML parser toolkit and DSSSL engine +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr + USE_GMAKE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog +PLIST_SUB= XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} + +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr post-extract: @${CHMOD} u+w ${WRKSRC}/configure @@ -45,10 +52,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${PREFIX}/share/doc/jade ${MKDIR} ${PREFIX}/share/sgml/jade ${INSTALL_DATA} ${WRKSRC}/dsssl/* ${PREFIX}/share/sgml/jade - @if [ ! -f ${PREFIX}/share/sgml/catalog ]; then \ - ${ECHO_CMD} "CATALOG \"${PREFIX}/share/sgml/jade/catalog\"" > ${PREFIX}/share/sgml/catalog; \ - else \ - ${SETENV} LANG=C ${PERL} -ni -e 'print if !m|${PREFIX}/share/sgml/jade/catalog|;print "CATALOG \"${PREFIX}/share/sgml/jade/catalog\"\n" if eof;' ${PREFIX}/share/sgml/catalog; \ - fi + @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/catalog .include <bsd.port.post.mk> diff --git a/textproc/jade/pkg-plist b/textproc/jade/pkg-plist index 4fc6f110bee3..5e87ce46bcc6 100644 --- a/textproc/jade/pkg-plist +++ b/textproc/jade/pkg-plist @@ -169,10 +169,9 @@ share/doc/jade/sysid.htm share/doc/jade/xml.htm share/sgml/jade/FOT.tex share/sgml/jade/Makefile.jadetex +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove jade/catalog share/sgml/jade/catalog -@unexec env LANG=C perl -ni -e 'print if !m|%D/%F|;' %D/share/sgml/catalog -@unexec if [ -f %D/share/sgml/catalog -a ! -s %D/share/sgml/catalog ]; then rm -f %D/share/sgml/catalog; fi -@exec if [ ! -f %D/share/sgml/catalog ]; then echo "CATALOG \"%D/%F\"" > %D/share/sgml/catalog; else env LANG=C perl -ni -e 'print if !m|%D/%F|;print "CATALOG \"%D/%F\"\n" if eof;' %D/share/sgml/catalog; fi +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add jade/catalog share/sgml/jade/demo.dsl share/sgml/jade/demo.sgm share/sgml/jade/demoMaster.tex diff --git a/textproc/linuxdoc/Makefile b/textproc/linuxdoc/Makefile index 479075995635..1e7bf6f3aa0b 100644 --- a/textproc/linuxdoc/Makefile +++ b/textproc/linuxdoc/Makefile @@ -7,6 +7,7 @@ PORTNAME= linuxdoc PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://fallout.campusview.indiana.edu/ports/distfiles/ @@ -14,16 +15,19 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= The Linuxdoc SGML DTD RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog + ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr EXTRACT_ONLY= # empty NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} MKCATALOG=${MKCATALOG} + +PLIST_SUB= DTD_NAME=${PORTNAME} XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} INSTDIR= ${PREFIX}/share/sgml/linuxdoc ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog -MKCATALOG= ${PREFIX}/sbin/mkcatalog +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports pre-install: @[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR} @@ -34,6 +38,6 @@ do-install: @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR} post-install: - @${MKCATALOG} -q install ${PORTNAME} + @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/catalog .include <bsd.port.mk> diff --git a/textproc/linuxdoc/pkg-plist b/textproc/linuxdoc/pkg-plist index 78c11b69986c..725005c28a9b 100644 --- a/textproc/linuxdoc/pkg-plist +++ b/textproc/linuxdoc/pkg-plist @@ -1,7 +1,7 @@ share/sgml/linuxdoc/README -@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%% +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/catalog share/sgml/linuxdoc/catalog -@exec %%MKCATALOG%% -q install %%DTD_NAME%% +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add %%DTD_NAME%%/catalog share/sgml/linuxdoc/freebsd-1.0.dtd share/sgml/linuxdoc/freebsd-1.1.dtd share/sgml/linuxdoc/linuxdoc.dec diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile index 0823386c1b8d..ebfcba3cc086 100644 --- a/textproc/openjade/Makefile +++ b/textproc/openjade/Makefile @@ -7,7 +7,7 @@ PORTNAME= openjade PORTVERSION= 1.3.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +16,7 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= Object-oriented SGML/XML parser toolkit and DSSSL engine LIB_DEPENDS= osp.3:${PORTSDIR}/textproc/opensp -RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr USE_GMAKE= YES USE_LIBTOOL= YES @@ -24,13 +24,15 @@ USE_PERL5= yes CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog \ --datadir=${PREFIX}/share/sgml/openjade INSTALLS_SHLIB= yes -PLIST_SUB= MKCATALOG=${MKCATALOG} +PLIST_SUB= XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} -MKCATALOG= ${PREFIX}/sbin/mkcatalog +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr post-install: @${INSTALL_DATA} ${WRKSRC}/dsssl/* ${PREFIX}/share/sgml/openjade - @${MKCATALOG} -q install openjade + @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG openjade/catalog .include <bsd.port.pre.mk> diff --git a/textproc/openjade/pkg-plist b/textproc/openjade/pkg-plist index 13ccf5b7eb47..222b3c1cb961 100644 --- a/textproc/openjade/pkg-plist +++ b/textproc/openjade/pkg-plist @@ -9,7 +9,7 @@ lib/libospgrove.so.0 lib/libostyle.a lib/libostyle.so lib/libostyle.so.0 -@unexec %%MKCATALOG%% -q deinstall openjade +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove openjade/catalog share/sgml/openjade/README.jadetex share/sgml/openjade/builtins.dsl share/sgml/openjade/catalog @@ -19,4 +19,4 @@ share/sgml/openjade/dsssl.dtd share/sgml/openjade/extensions.dsl share/sgml/openjade/fot.dtd share/sgml/openjade/style-sheet.dtd -@exec %%MKCATALOG%% -q install openjade +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add openjade/catalog diff --git a/textproc/sdocbook-xml/Makefile b/textproc/sdocbook-xml/Makefile index 3e87cf5d9d6f..7989a34571a9 100644 --- a/textproc/sdocbook-xml/Makefile +++ b/textproc/sdocbook-xml/Makefile @@ -7,6 +7,7 @@ PORTNAME= sdocbook-xml PORTVERSION= 4.1.2.5 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/ DISTNAME= simple${PORTVERSION:S/.//g} @@ -14,15 +15,20 @@ DISTNAME= simple${PORTVERSION:S/.//g} MAINTAINER= des@FreeBSD.org COMMENT= "Simplified" DocBook XML DTD -RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr USE_ZIP= yes NO_BUILD= yes -PLIST_SUB= MKCATALOG=${MKCATALOG} CATALOG=${CATALOG} +WRKSRC= ${WRKDIR} +PLIST_SUB= XMLCATMGR=${XMLCATMGR}\ + CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}\ + CATALOG_PORTS_XML=${CATALOG_PORTS_XML}\ + XMLDIR=${SDOCBOOKDIR} SDOCBOOKDIR= ${PREFIX}/share/xml/sdocbook -MKCATALOG= ${LOCALBASE}/sbin/mkcatalog -CATALOG= ${PREFIX}/share/xml/catalog +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports +CATALOG_PORTS_XML= ${PREFIX}/share/xml/catalog.ports FILES= sdbcent.mod sdbhier.mod sdbpool.mod sdocbook-custom.dtd \ sdocbook.css sdocbook.dtd sdocbookref-custom.dtd \ @@ -32,14 +38,19 @@ do-extract: ${MKDIR} ${WRKDIR}; \ (cd ${WRKDIR} && unzip -oq ${DISTDIR}/${DISTFILES}) +post-patch: + ${SED} -e 's#@@DTDDIR@@#${SDOCBOOKDIR}#' < ${FILESDIR}/catalog.xml > ${WRKSRC}/catalog.xml + do-install: ${MKDIR} ${SDOCBOOKDIR} .for i in ${FILES} $(INSTALL_DATA) $(WRKDIR)/${i} $(SDOCBOOKDIR) .endfor ${INSTALL_DATA} ${FILESDIR}/catalog ${SDOCBOOKDIR} + ${INSTALL_DATA} ${WRKDIR}/catalog.xml ${SDOCBOOKDIR} post-install: - ${MKCATALOG} -q -c ${CATALOG} install sdocbook catalog + ${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${SDOCBOOKDIR}/catalog + ${XMLCATMGR} -c ${CATALOG_PORTS_XML} add nextCatalog ${SDOCBOOKDIR}/catalog.xml .include <bsd.port.mk> diff --git a/textproc/sdocbook-xml/files/catalog.xml b/textproc/sdocbook-xml/files/catalog.xml new file mode 100644 index 000000000000..9ad01221cb7f --- /dev/null +++ b/textproc/sdocbook-xml/files/catalog.xml @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" + "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> + +<!-- Created by xmlcatmgr-0.2 --> + +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> + <public publicId="-//OASIS//DTD Simplified DocBook XML V4.1.2.5//EN" uri="file://@@DTDDIR@@/sdocbook.dtd" /> + <public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML V4.1.2.5//EN" uri="file://@@DTDDIR@@/sdocbookref.dtd" /> +</catalog> diff --git a/textproc/sdocbook-xml/pkg-plist b/textproc/sdocbook-xml/pkg-plist index 14f0f1781954..90c735c7ce5e 100644 --- a/textproc/sdocbook-xml/pkg-plist +++ b/textproc/sdocbook-xml/pkg-plist @@ -1,7 +1,9 @@ -share/xml/catalog -@unexec %%MKCATALOG%% -q -c%%CATALOG%% deinstall sdocbook catalog +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%XMLDIR%%/catalog share/xml/sdocbook/catalog -@exec %%MKCATALOG%% -q -c%%CATALOG%% install sdocbook catalog +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%XMLDIR%%/catalog +@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove %%XMLDIR%%/catalog.xml +share/xml/sdocbook/catalog.xml +@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add nextCatalog %%XMLDIR%%/catalog.xml share/xml/sdocbook/sdbcent.mod share/xml/sdocbook/sdbhier.mod share/xml/sdocbook/sdbpool.mod diff --git a/textproc/tei-lite/Makefile b/textproc/tei-lite/Makefile index d5cd457a794e..b7a9b689e902 100644 --- a/textproc/tei-lite/Makefile +++ b/textproc/tei-lite/Makefile @@ -7,6 +7,7 @@ PORTNAME= tei PORTVERSION= 1.6 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.tei-c.org/Lite/DTD/ PKGNAMESUFFIX= -lite @@ -16,22 +17,24 @@ EXTRACT_ONLY= # Empty MAINTAINER= henrik.motakef@web.de COMMENT= SGML version of the TEI-Lite DTD -RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr NO_BUILD= yes -PLIST_SUB= MKCATALOG=${MKCATALOG} CATALOG=${CATALOG} +PLIST_SUB= XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= DTDDIR=${DTDDIR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} INSTDIR= ${PREFIX}/share/sgml/tei/lite -CATALOG= ${PREFIX}/share/sgml/catalog -MKCATALOG= ${PREFIX}/sbin/mkcatalog +DTDDIR= ${PORTNAME}/lite +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports do-install: @[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR} @${INSTALL_DATA} ${DISTDIR}/teilite.dtd ${INSTDIR} @${INSTALL_DATA} ${DISTDIR}/teilite.tag ${INSTDIR} - @${SED} -e 's!%%INSTDIR%%!${INSTDIR}!' ${FILESDIR}/catalog \ - > ${INSTDIR}/catalog + @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR} post-install: - @${MKCATALOG} -q -c ${CATALOG} install ${PORTNAME}/lite + ${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DTDDIR}/catalog .include <bsd.port.mk> diff --git a/textproc/tei-lite/files/catalog b/textproc/tei-lite/files/catalog index f9328354a16e..3aba6d085a3b 100644 --- a/textproc/tei-lite/files/catalog +++ b/textproc/tei-lite/files/catalog @@ -1,7 +1,7 @@ -PUBLIC "-//TEI//DTD TEI Lite 1.0//EN" "%%INSTDIR%%/teilite.dtd" -PUBLIC "-//TEI//DTD TEI Lite 1.0 //EN" "%%INSTDIR%%/teilite.dtd" -PUBLIC "-//TEI//DTD TEI Lite 1.6 //EN" "%%INSTDIR%%/teilite.dtd" -PUBLIC "-//TEI//DTD TEI Lite 1.6//EN" "%%INSTDIR%%/teilite.dtd" +PUBLIC "-//TEI//DTD TEI Lite 1.0//EN" "teilite.dtd" +PUBLIC "-//TEI//DTD TEI Lite 1.0 //EN" "teilite.dtd" +PUBLIC "-//TEI//DTD TEI Lite 1.6 //EN" "teilite.dtd" +PUBLIC "-//TEI//DTD TEI Lite 1.6//EN" "teilite.dtd" diff --git a/textproc/tei-lite/pkg-plist b/textproc/tei-lite/pkg-plist index 14236c352b01..a48f39e84f16 100644 --- a/textproc/tei-lite/pkg-plist +++ b/textproc/tei-lite/pkg-plist @@ -1,7 +1,7 @@ -@unexec %%MKCATALOG%% -q -c %%CATALOG%% deinstall tei/lite share/sgml/tei/lite/teilite.dtd share/sgml/tei/lite/teilite.tag +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTDDIR%%/catalog share/sgml/tei/lite/catalog -@exec %%MKCATALOG%% -q -c %%CATALOG%% install tei/lite +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog @dirrm share/sgml/tei/lite @unexec rmdir %D/share/sgml/tei 2>/dev/null || true diff --git a/textproc/tei-p3/Makefile b/textproc/tei-p3/Makefile index 5f68682e88da..7d5069424df7 100644 --- a/textproc/tei-p3/Makefile +++ b/textproc/tei-p3/Makefile @@ -7,6 +7,7 @@ PORTNAME= tei PORTVERSION= p3 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.tei-c.org/Vault/GL/ DISTNAME= teip3dtd @@ -14,25 +15,27 @@ DISTNAME= teip3dtd MAINTAINER= henrik.motakef@web.de COMMENT= DTD of the Text Encoding Initiative -RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} DTD_VERSION=${PORTVERSION} \ - MKCATALOG=${MKCATALOG} +PLIST_SUB= XMLCATMGR=${XMLCATMGR} \ + DTDDIR=${DTDDIR} \ + CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} SGMLDIR= ${PREFIX}/share/sgml INSTDIR= ${SGMLDIR}/${PORTNAME}/${PORTVERSION} -MKCATALOG= ${PREFIX}/sbin/mkcatalog +DTDDIR= ${PORTNAME}/${PORTVERSION} +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports do-install: @[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR} @${INSTALL_MAN} ${WRKSRC}/*.dtd ${INSTDIR} @${INSTALL_MAN} ${WRKSRC}/*.ent ${INSTDIR} - @${SED} -e 's!%%INSTDIR%%!${INSTDIR}!' ${FILESDIR}/catalog \ - > ${INSTDIR}/catalog + @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR} post-install: - @${MKCATALOG} -q install ${PORTNAME}/${PORTVERSION} + ${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DTDDIR}/catalog .include <bsd.port.mk> diff --git a/textproc/tei-p3/files/catalog b/textproc/tei-p3/files/catalog index afcfea08a4d7..b2c540e81e72 100644 --- a/textproc/tei-p3/files/catalog +++ b/textproc/tei-p3/files/catalog @@ -1,5 +1 @@ -PUBLIC "-//TEI P3//DTD Main Document Type//EN" "%%INSTDIR%%/tei2.dtd"END-of-tei-p3/files/catalog -exit - - - +PUBLIC "-//TEI P3//DTD Main Document Type//EN" "tei2.dtd" diff --git a/textproc/tei-p3/pkg-plist b/textproc/tei-p3/pkg-plist index 2e179f4e6966..4b61ae2aa245 100644 --- a/textproc/tei-p3/pkg-plist +++ b/textproc/tei-p3/pkg-plist @@ -1,4 +1,4 @@ -@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%%/%%DTD_VERSION%% +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTDDIR%%/catalog share/sgml/tei/p3/p2ents.dtd share/sgml/tei/p3/tei2.dtd share/sgml/tei/p3/teiana2.dtd @@ -47,6 +47,6 @@ share/sgml/tei/p3/teiterm2.ent share/sgml/tei/p3/teitran2.ent share/sgml/tei/p3/teivers2.ent share/sgml/tei/p3/catalog -@exec %%MKCATALOG%% -q install %%DTD_NAME%%/%%DTD_VERSION%% +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog @dirrm share/sgml/tei/p3 @unexec rmdir %D/share/sgml/tei 2>/dev/null || true diff --git a/textproc/tei-p4/Makefile b/textproc/tei-p4/Makefile index 9dcaa7086f8a..24acaca88842 100644 --- a/textproc/tei-p4/Makefile +++ b/textproc/tei-p4/Makefile @@ -7,6 +7,7 @@ PORTNAME= tei PORTVERSION= p4 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.tei-c.org/P4X/DTD/ DISTNAME= dtd @@ -14,18 +15,21 @@ DISTNAME= dtd MAINTAINER= henrik.motakef@web.de COMMENT= DTD of the Text Encoding Initiative -RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr USE_ZIP= yes NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} DTD_VERSION=${PORTVERSION} \ - MKCATALOG=${MKCATALOG} +PLIST_SUB= XMLCATMGR=${XMLCATMGR} \ + DTDDIR=${DTDDIR} \ + CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} DTD= dtd.zip SGMLDIR= ${PREFIX}/share/sgml INSTDIR= ${SGMLDIR}/${PORTNAME}/${PORTVERSION} -MKCATALOG= ${PREFIX}/sbin/mkcatalog +DTDDIR= ${PORTNAME}/${PORTVERSION} +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports pre-install: @[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR} @@ -35,9 +39,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/*.ent ${INSTDIR} ${INSTALL_DATA} ${WRKSRC}/*.dec ${INSTDIR} ${INSTALL_DATA} ${WRKSRC}/teicatalog.xml ${INSTDIR} - ${SED} -e "s!&DTDpath;!${INSTDIR}/!" ${WRKSRC}/catalog.tei > ${INSTDIR}/catalog + ${SED} -e "s!&DTDpath;!!" ${WRKSRC}/catalog.tei > ${INSTDIR}/catalog post-install: - @${MKCATALOG} -q install ${PORTNAME}/${PORTVERSION} + ${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DTDDIR}/catalog .include <bsd.port.mk> diff --git a/textproc/tei-p4/pkg-plist b/textproc/tei-p4/pkg-plist index c816c98b2ef5..9a62d813fa4d 100644 --- a/textproc/tei-p4/pkg-plist +++ b/textproc/tei-p4/pkg-plist @@ -1,4 +1,4 @@ -@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%%/%%DTD_VERSION%% +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTDDIR%%/catalog share/sgml/tei/p4/dummy.dtd share/sgml/tei/p4/teicatalog.xml share/sgml/tei/p4/tei2.dtd @@ -53,6 +53,6 @@ share/sgml/tei/p4/teilitex.dtd share/sgml/tei/p4/teilite.dec share/sgml/tei/p4/teilitex.dec share/sgml/tei/p4/catalog -@exec %%MKCATALOG%% -q install %%DTD_NAME%%/%%DTD_VERSION%% +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog @dirrm share/sgml/tei/p4/ @unexec rmdir %D/share/sgml/tei 2>/dev/null || true diff --git a/textproc/tei-xlite/Makefile b/textproc/tei-xlite/Makefile index 65704b8e79ae..f8885fd0fc8c 100644 --- a/textproc/tei-xlite/Makefile +++ b/textproc/tei-xlite/Makefile @@ -7,6 +7,7 @@ PORTNAME= tei PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.tei-c.org/Lite/DTD/ PKGNAMESUFFIX= -xlite @@ -17,21 +18,27 @@ EXTRACT_ONLY= # Empty MAINTAINER= henrik.motakef@web.de COMMENT= XML version of the TEI-Lite DTD -RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr NO_BUILD= yes -PLIST_SUB= MKCATALOG=${MKCATALOG} CATALOG=${CATALOG} +PLIST_SUB= XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= DTDDIR=${INSTDIR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} +PLIST_SUB+= CATALOG_PORTS_XML=${CATALOG_PORTS_XML} INSTDIR= ${PREFIX}/share/xml/tei/xlite -CATALOG= ${PREFIX}/share/xml/catalog -MKCATALOG= ${PREFIX}/sbin/mkcatalog +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports +CATALOG_PORTS_XML= ${PREFIX}/share/xml/catalog.ports do-install: @[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR} @${INSTALL_DATA} ${DISTDIR}/teixlite.dtd ${INSTDIR} - @${SED} -e 's!%%INSTDIR%%!${INSTDIR}!' ${FILESDIR}/catalog \ - > ${INSTDIR}/catalog + @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR} + @${SED} -e 's!%%INSTDIR%%!${INSTDIR}!' ${FILESDIR}/catalog.xml \ + > ${INSTDIR}/catalog.xml post-install: - @${MKCATALOG} -q -c ${CATALOG} install ${PORTNAME}/xlite + ${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${INSTDIR}/catalog + ${XMLCATMGR} -c ${CATALOG_PORTS_XML} add nextCatalog ${INSTDIR}/catalog.xml .include <bsd.port.mk> diff --git a/textproc/tei-xlite/files/catalog b/textproc/tei-xlite/files/catalog index f761017481c1..1445e115f797 100644 --- a/textproc/tei-xlite/files/catalog +++ b/textproc/tei-xlite/files/catalog @@ -1 +1 @@ -PUBLIC "-//TEI//DTD TEI Lite XML ver. 1//EN" "%%INSTDIR%%/teixlite.dtd" +PUBLIC "-//TEI//DTD TEI Lite XML ver. 1//EN" "teixlite.dtd" diff --git a/textproc/tei-xlite/files/catalog.xml b/textproc/tei-xlite/files/catalog.xml new file mode 100644 index 000000000000..b4d7c76e7aab --- /dev/null +++ b/textproc/tei-xlite/files/catalog.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" + "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> + +<!-- Created by xmlcatmgr-0.2 --> + +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> + <public publicId="-//TEI//DTD TEI Lite XML ver. 1//EN" uri="file://%%INSTDIR%%/teixlite.dtd" /> +</catalog> diff --git a/textproc/tei-xlite/pkg-plist b/textproc/tei-xlite/pkg-plist index 900e6070cbf7..0b4940b0696e 100644 --- a/textproc/tei-xlite/pkg-plist +++ b/textproc/tei-xlite/pkg-plist @@ -1,6 +1,9 @@ -@unexec %%MKCATALOG%% -q -c %%CATALOG%% deinstall tei/xlite share/xml/tei/xlite/teixlite.dtd +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTDDIR%%/catalog share/xml/tei/xlite/catalog -@exec %%MKCATALOG%% -q -c %%CATALOG%% install tei/xlite +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog +@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove %%DTDDIR%%/catalog.xml +share/xml/tei/xlite/catalog.xml +@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add nextCatalog %%DTDDIR%%/catalog.xml @dirrm share/xml/tei/xlite @unexec rmdir %D/share/xml/tei 2>/dev/null || true diff --git a/textproc/xhtml/Makefile b/textproc/xhtml/Makefile index c9daff2f28df..673b0d8cf581 100644 --- a/textproc/xhtml/Makefile +++ b/textproc/xhtml/Makefile @@ -7,7 +7,7 @@ PORTNAME= xhtml PORTVERSION= 1.0.20020801 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc #MASTER_SITES= http://www.w3.org/TR/xhtml1/ MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -17,21 +17,28 @@ DISTNAME= xhtml1-20020801 MAINTAINER= kuriyama@FreeBSD.org COMMENT= W3C's XHTML DTD -BUILD_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog -RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr USE_ZIP= YES NO_MTREE= YES NO_BUILD= YES WRKSRC= ${WRKDIR}/xhtml1-20020801 +PLIST_SUB= XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= DTDDIR=${DTDDIR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} +PLIST_SUB+= CATALOG_PORTS_XML=${CATALOG_PORTS_XML} INSTDIR= ${PREFIX}/share/xml DTDDIR= ${INSTDIR}/dtd/xhtml DTDFILES= xhtml-lat1.ent xhtml-special.ent xhtml-symbol.ent \ xhtml.soc xhtml1-frameset.dtd xhtml1-strict.dtd \ - xhtml1-transitional.dtd xhtml1.dcl -MKCATALOG= ${PREFIX}/sbin/mkcatalog -PLIST_SUB= MKCATALOG=${MKCATALOG} + xhtml1-transitional.dtd xhtml1.dcl ${WRKSRC}/catalog.xml +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports +CATALOG_PORTS_XML= ${PREFIX}/share/xml/catalog.ports + +post-patch: + ${SED} -e 's#@@DTDDIR@@#${DTDDIR}#' < ${FILESDIR}/catalog.xml > ${WRKSRC}/catalog.xml pre-install: @[ -d ${DTDDIR} ] || ${MKDIR} ${DTDDIR} @@ -40,6 +47,7 @@ do-install: @(cd ${WRKSRC}/DTD; ${INSTALL_DATA} ${DTDFILES} ${DTDDIR}) post-install: - @${MKCATALOG} -c ${INSTDIR}/catalog -q install dtd/xhtml xhtml.soc + ${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DTDDIR}/xhtml.soc + ${XMLCATMGR} -c ${CATALOG_PORTS_XML} add nextCatalog ${DTDDIR}/catalog.xml .include <bsd.port.mk> diff --git a/textproc/xhtml/files/catalog.xml b/textproc/xhtml/files/catalog.xml new file mode 100644 index 000000000000..2442f65e0f96 --- /dev/null +++ b/textproc/xhtml/files/catalog.xml @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" + "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> + +<!-- Created by xmlcatmgr-0.2 --> + +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> + <public publicId="-//W3C//DTD XHTML 1.0 Strict//EN" uri="file://@@DTDDIR@@/xhtml1-strict.dtd" /> + <public publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" uri="file://@@DTDDIR@@/xhtml1-transitional.dtd" /> + <public publicId="-//W3C//DTD XHTML 1.0 Frameset//EN" uri="file://@@DTDDIR@@/xhtml1-frameset.dtd" /> + <public publicId="-//W3C//ENTITIES Latin 1 for XHTML//EN" uri="file://@@DTDDIR@@/xhtml-lat1.ent" /> + <public publicId="-//W3C//ENTITIES Symbols for XHTML//EN" uri="file://@@DTDDIR@@/xhtml-symbol.ent" /> + <public publicId="-//W3C//ENTITIES Special for XHTML//EN" uri="file://@@DTDDIR@@/xhtml-special.ent" /> +</catalog> diff --git a/textproc/xhtml/pkg-plist b/textproc/xhtml/pkg-plist index df6d2a9a4ab0..90de89ed5264 100644 --- a/textproc/xhtml/pkg-plist +++ b/textproc/xhtml/pkg-plist @@ -1,9 +1,12 @@ share/xml/dtd/xhtml/xhtml-lat1.ent share/xml/dtd/xhtml/xhtml-special.ent share/xml/dtd/xhtml/xhtml-symbol.ent -@unexec %%MKCATALOG%% -c %D/share/xml/catalog -q deinstall dtd/xhtml xhtml.soc +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTDDIR%%/xhtml.soc share/xml/dtd/xhtml/xhtml.soc -@exec %%MKCATALOG%% -c %D/share/xml/catalog -q install dtd/xhtml xhtml.soc +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/xhtml.soc +@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove %%DTDDIR%%/catalog.xml +share/xml/dtd/xhtml/catalog.xml +@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add nextCatalog %%DTDDIR%%/catalog.xml share/xml/dtd/xhtml/xhtml1-frameset.dtd share/xml/dtd/xhtml/xhtml1-strict.dtd share/xml/dtd/xhtml/xhtml1-transitional.dtd diff --git a/textproc/xmlcharent/Makefile b/textproc/xmlcharent/Makefile index 0fb8d0499130..47b741074b62 100644 --- a/textproc/xmlcharent/Makefile +++ b/textproc/xmlcharent/Makefile @@ -1,5 +1,4 @@ -# New ports collection makefile for: xmlcharent -# Date created: 31 January 2002 +# New ports collection makefile for: xmlcharent # Date created: 31 January 2002 # Whom: Kimura Fuyuki <fuyuki@mj.0038.net> # # $FreeBSD$ @@ -7,20 +6,36 @@ PORTNAME= xmlcharent PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.oasis-open.org/docbook/${PORTNAME}/${PORTVERSION}/ MAINTAINER= ports@FreeBSD.org COMMENT= XML character entities +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr + USE_ZIP= yes NO_WRKSUBDIR= yes NO_BUILD= yes +PLIST_SUB= XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= XMLDIR=${XMLDIR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} +PLIST_SUB+= CATALOG_PORTS_XML=${CATALOG_PORTS_XML} XMLDIR= ${PREFIX}/share/xml/${PORTNAME} +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports +CATALOG_PORTS_XML= ${PREFIX}/share/xml/catalog.ports + +post-patch: + ${SED} -e 's#@@XMLDIR@@#${XMLDIR}#' < ${FILESDIR}/catalog.xml > ${WRKSRC}/catalog.xml do-install: ${MKDIR} ${XMLDIR} - ${INSTALL_DATA} ${WRKSRC}/*.ent ${FILESDIR}/catalog ${XMLDIR} + ${INSTALL_DATA} ${WRKSRC}/*.ent\ + ${FILESDIR}/catalog ${WRKSRC}/catalog.xml ${XMLDIR} + ${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${XMLDIR}/catalog + ${XMLCATMGR} -c ${CATALOG_PORTS_XML} add nextCatalog ${XMLDIR}/catalog.xml .include <bsd.port.mk> diff --git a/textproc/xmlcharent/files/catalog.xml b/textproc/xmlcharent/files/catalog.xml new file mode 100644 index 000000000000..b8cf2166f6d5 --- /dev/null +++ b/textproc/xmlcharent/files/catalog.xml @@ -0,0 +1,27 @@ +<?xml version="1.0"?> +<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" + "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> + +<!-- Created by xmlcatmgr-0.2 --> + +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> + <public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML" uri="file://@@XMLDIR@@/iso-lat1.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN//XML" uri="file://@@XMLDIR@@/iso-lat2.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN//XML" uri="file://@@XMLDIR@@/iso-grk1.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML" uri="file://@@XMLDIR@@/iso-grk2.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML" uri="file://@@XMLDIR@@/iso-cyr1.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML" uri="file://@@XMLDIR@@/iso-cyr2.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML" uri="file://@@XMLDIR@@/iso-num.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML" uri="file://@@XMLDIR@@/iso-dia.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML" uri="file://@@XMLDIR@@/iso-pub.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML" uri="file://@@XMLDIR@@/iso-box.ent" /> + <public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML" uri="file://@@XMLDIR@@/iso-tech.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN//XML" uri="file://@@XMLDIR@@/iso-grk3.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML" uri="file://@@XMLDIR@@/iso-grk4.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML" uri="file://@@XMLDIR@@/iso-amso.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML" uri="file://@@XMLDIR@@/iso-amsb.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML" uri="file://@@XMLDIR@@/iso-amsr.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML" uri="file://@@XMLDIR@@/iso-amsn.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML" uri="file://@@XMLDIR@@/iso-amsa.ent" /> + <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML" uri="file://@@XMLDIR@@/iso-amsc.ent" /> +</catalog> diff --git a/textproc/xmlcharent/pkg-plist b/textproc/xmlcharent/pkg-plist index 493b6f331921..e420e511f385 100644 --- a/textproc/xmlcharent/pkg-plist +++ b/textproc/xmlcharent/pkg-plist @@ -1,5 +1,10 @@ @comment $FreeBSD$ +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%XMLDIR%%/catalog share/xml/xmlcharent/catalog +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%XMLDIR%%/catalog +@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove %%XMLDIR%%/catalog.xml +share/xml/xmlcharent/catalog.xml +@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add nextCatalog %%XMLDIR%%/catalog.xml share/xml/xmlcharent/iso-amsa.ent share/xml/xmlcharent/iso-amsb.ent share/xml/xmlcharent/iso-amsc.ent |