diff options
52 files changed, 286 insertions, 531 deletions
diff --git a/Keywords/xmlcatmgr.ucl b/Keywords/xmlcatmgr.ucl new file mode 100644 index 000000000000..474c4a81bc79 --- /dev/null +++ b/Keywords/xmlcatmgr.ucl @@ -0,0 +1,34 @@ +# $FreeBSD$ + +actions: [file] +arguments: true +post-install: <<EOD + case "%@" in + /*) cat="%@" ;; + *) cat="%D/%@" ;; + esac + case "%@" in + *.xml) + xmlcatmgr_cmd="xmlcatmgr -c ${PKG_ROOTDIR}%D/share/xml/catalog.ports add nextCatalog" + ;; + *) + xmlcatmgr_cmd="xmlcatmgr -sc ${PKG_ROOTDIR}%D/share/sgml/catalog.ports add CATALOG" + ;; + esac + ${xmlcatmgr_cmd} ${cat} +EOD +post-deinstall: <<EOD + case "%@" in + /*) cat="%@" ;; + *) cat="%D/%@" ;; + esac + case "%@" in + *.xml) + xmlcatmgr_cmd="xmlcatmgr -c ${PKG_ROOTDIR}%D/share/xml/catalog.ports remove nextCatalog" + ;; + *) + xmlcatmgr_cmd="xmlcatmgr -sc ${PKG_ROOTDIR}%D/share/sgml/catalog.ports remove CATALOG" + ;; + esac + ${xmlcatmgr_cmd} ${cat} +EOD diff --git a/security/vuxml/Makefile b/security/vuxml/Makefile index 98070b6de363..a832c3de3f57 100644 --- a/security/vuxml/Makefile +++ b/security/vuxml/Makefile @@ -16,7 +16,7 @@ COMMENT= Vulnerability and eXposure Markup Language DTD LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${XMLCATMGR}:textproc/xmlcatmgr \ +RUN_DEPENDS= xmlcatmgr:textproc/xmlcatmgr \ ${LOCALBASE}/share/xml/dtd/xhtml-modularization/VERSION:textproc/xhtml-modularization \ ${LOCALBASE}/share/xml/dtd/xhtml-basic/xhtml-basic10.dtd:textproc/xhtml-basic @@ -26,28 +26,9 @@ NO_MTREE= yes NO_ARCH= yes NO_BUILD= yes WRKSRC= ${WRKDIR} -PLIST_SUB= XMLCAT_RM="${XMLCAT_RM}" XMLCAT_ADD="${XMLCAT_ADD}" \ - SGMLCAT_RM="${SGMLCAT_RM}" SGMLCAT_ADD="${SGMLCAT_ADD}" \ - dir_DTD="${dir_DTD}" dir_DTD= share/xml/dtd/vuxml -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -SGMLCAT= ${PREFIX}/share/sgml/catalog.ports -XMLCAT= ${PREFIX}/share/xml/catalog.ports - -XMLCAT_ADD= ${XMLCATMGR} -c ${XMLCAT} add nextCatalog \ - ${PREFIX}/${dir_DTD}/catalog.xml -XMLCAT_RM= ${XMLCATMGR} -c ${XMLCAT} remove nextCatalog \ - ${PREFIX}/${dir_DTD}/catalog.xml -SGMLCAT_ADD= ${XMLCATMGR} -sc ${SGMLCAT} add CATALOG \ - ${PREFIX}/${dir_DTD}/catalog -SGMLCAT_RM= ${XMLCATMGR} -sc ${SGMLCAT} remove CATALOG \ - ${PREFIX}/${dir_DTD}/catalog - -CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports -CATALOG_PORTS_XML= ${PREFIX}/share/xml/catalog.ports - VUXML_FILE?= ${PKGDIR}/vuln.xml do-extract: diff --git a/security/vuxml/pkg-plist b/security/vuxml/pkg-plist index 2420132382fd..6a61d5ee3d38 100644 --- a/security/vuxml/pkg-plist +++ b/security/vuxml/pkg-plist @@ -1,11 +1,7 @@ -share/xml/dtd/vuxml/catalog -share/xml/dtd/vuxml/catalog.xml +@xmlcatmgr share/xml/dtd/vuxml/catalog +@xmlcatmgr share/xml/dtd/vuxml/catalog.xml share/xml/dtd/vuxml/vuxml-10.dtd share/xml/dtd/vuxml/vuxml-11.dtd share/xml/dtd/vuxml/vuxml-model-10.mod share/xml/dtd/vuxml/vuxml-model-11.mod share/xml/dtd/vuxml/xml1.dcl -@unexec %%XMLCAT_RM%% -@exec %%XMLCAT_ADD%% -@unexec %%SGMLCAT_RM%% -@exec %%SGMLCAT_ADD%% diff --git a/textproc/docbook-sgml/Makefile b/textproc/docbook-sgml/Makefile index aa30728f7df8..72fb16d2f060 100644 --- a/textproc/docbook-sgml/Makefile +++ b/textproc/docbook-sgml/Makefile @@ -12,7 +12,7 @@ MAINTAINER= doceng@FreeBSD.org COMMENT= DocBook SGML DTD RUN_DEPENDS= ${LOCALBASE}/${ISOCAT}:textproc/iso8879 \ - ${LOCALBASE}/${XMLCATMGR}:textproc/xmlcatmgr + xmlcatmgr:textproc/xmlcatmgr NO_BUILD= yes @@ -20,12 +20,10 @@ DBFILES=2.4.1:docbk241 3.0:docbk30 3.1:docbk31 \ 4.0:docbk40 4.1:docbk41 4.2:docbook-4.2 \ 4.3:docbook-4.3 4.4:docbook-4.4 4.5:docbook-4.5 -XMLCATMGR= bin/xmlcatmgr -SGMLCAT= share/sgml/catalog.ports ISOCAT= share/sgml/iso8879/catalog DBKDIR= share/sgml/docbook DBCAT= ${PREFIX}/${DBKDIR}/catalog -PLIST_SUB= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} DBKDIR=${DBKDIR} +PLIST_SUB= DBKDIR=${DBKDIR} do-extract: @${RM} -rf ${WRKDIR} diff --git a/textproc/docbook-sgml/pkg-plist b/textproc/docbook-sgml/pkg-plist index f67380888b50..a0d55f5bd916 100644 --- a/textproc/docbook-sgml/pkg-plist +++ b/textproc/docbook-sgml/pkg-plist @@ -134,6 +134,4 @@ %%DBKDIR%%/4.5/docbookx.dtd %%DBKDIR%%/4.5/htmltblx.mod %%DBKDIR%%/4.5/soextblx.dtd -%%DBKDIR%%/catalog -@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove CATALOG %D/%F -@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F +@xmlcatmgr %%DBKDIR%%/catalog diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile index fe5272601b73..82fa0d5a0a3a 100644 --- a/textproc/docbook-xml/Makefile +++ b/textproc/docbook-xml/Makefile @@ -12,24 +12,19 @@ MAINTAINER= doceng@FreeBSD.org COMMENT= DocBook XML DTD BUILD_DEPENDS= ${LOCALBASE}/share/xml/xmlcharent/catalog.xml:textproc/xmlcharent \ - ${XMLCATMGR_CMD}:textproc/xmlcatmgr + xmlcatmgr:textproc/xmlcatmgr RUN_DEPENDS= ${LOCALBASE}/share/xml/xmlcharent/catalog.xml:textproc/xmlcharent \ - ${XMLCATMGR_CMD}:textproc/xmlcatmgr + xmlcatmgr:textproc/xmlcatmgr NO_BUILD= yes DBFILES=4.1.2:docbkx412 4.2:docbook-xml-4.2 4.3:docbook-xml-4.3 \ 4.4:docbook-xml-4.4 4.5:docbook-xml-4.5 5.0:docbook-5.0 -XMLCATMGR= bin/xmlcatmgr -XMLCATMGR_CMD= ${LOCALBASE}/${XMLCATMGR} -SGMLCAT= share/sgml/catalog.ports -XMLCAT= share/xml/catalog.ports DBKDIR= share/xml/docbook DBCAT_XML= ${PREFIX}/${DBKDIR}/catalog.xml DBCAT_SGML= ${PREFIX}/${DBKDIR}/catalog -PLIST_SUB= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \ - DBKDIR=${DBKDIR} XMLCAT=${XMLCAT} +PLIST_SUB= DBKDIR=${DBKDIR} do-extract: @${RM} -rf ${WRKDIR} @@ -48,8 +43,8 @@ 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} \ + xmlcatmgr -c ${STAGEDIR}${DBCAT_XML} create + xmlcatmgr -c ${STAGEDIR}${DBCAT_XML} \ add nextCatalog "${LOCALBASE}/share/xml/xmlcharent/catalog.xml" .for D in ${DBFILES:C,:.*,,} @@ -57,7 +52,7 @@ do-install-${D:S/./_/g}: @${MKDIR} ${STAGEDIR}${PREFIX}/${DBKDIR}/$D cd ${WRKDIR}/${DBFILES:M${D}\:*:C,.*:,,} && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${DBKDIR}/$D - ${XMLCATMGR_CMD} -c ${STAGEDIR}${DBCAT_XML} \ + xmlcatmgr -c ${STAGEDIR}${DBCAT_XML} \ add nextCatalog "${PREFIX}/${DBKDIR}/$D/catalog.xml" test "$D" = 5.0 || test "$D" = 4.1.2 || \ ${ECHO_CMD} "CATALOG \"${PREFIX}/${DBKDIR}/$D/docbook.cat\"" \ diff --git a/textproc/docbook-xml/pkg-plist b/textproc/docbook-xml/pkg-plist index c09ea554f87e..c45f4e3e3ce3 100644 --- a/textproc/docbook-xml/pkg-plist +++ b/textproc/docbook-xml/pkg-plist @@ -187,9 +187,5 @@ %%DBKDIR%%/5.0/xsd/docbook.xsd %%DBKDIR%%/5.0/xsd/xlink.xsd %%DBKDIR%%/5.0/xsd/xml.xsd -%%DBKDIR%%/catalog.xml -@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove nextCatalog %D/%F -@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F -%%DBKDIR%%/catalog -@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove CATALOG %D/%F -@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F +@xmlcatmgr %%DBKDIR%%/catalog.xml +@xmlcatmgr %%DBKDIR%%/catalog diff --git a/textproc/docbook-xsl-ns/Makefile b/textproc/docbook-xsl-ns/Makefile index 8d1b44e9e727..29b8a796d842 100644 --- a/textproc/docbook-xsl-ns/Makefile +++ b/textproc/docbook-xsl-ns/Makefile @@ -23,32 +23,21 @@ NO_BUILD= yes EXTRACT_AFTER_ARGS= --exclude=".*" --exclude="*.sh" --exclude "*.LOG" PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-install -SUB_FILES= pkg-install -SUB_LIST+= INSTDIR="${INSTDIR}" \ - XMLCATMGR="${XMLCATMGR}" \ - CATALOG_PORTS="${LOCALBASE}/share/xml/catalog.ports" PORTDOCS= * INSTDIR= share/xsl/docbook-ns DOCSRC= ${WRKDIR}/docbook-xsl-${PORTVERSION} -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -DISTFILES+= docbook-xsl-doc-${PORTVERSION}${EXTRACT_SUFX}:doc -.endif +DOCS_DISTFILES= docbook-xsl-doc-${PORTVERSION}${EXTRACT_SUFX}:doc do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${INSTDIR} cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${INSTDIR} -post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${DOCSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> diff --git a/textproc/docbook-xsl-ns/files/pkg-install.in b/textproc/docbook-xsl-ns/files/pkg-install.in deleted file mode 100644 index c58c447febd6..000000000000 --- a/textproc/docbook-xsl-ns/files/pkg-install.in +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -# This script will create the docbook-xsl catalog and will add entries to xml catalog. -# WARNING: If you change this script, be sure to check pkg-deinstall.in! -# -# Based on http://xmlsoft.org/buildDocBookCatalog file. -# -# Run the following command to generate a new VERSIONS string: -# perl -n -e '/Version ([\d.]+) rel/ && print "$1\n"' work/*/ChangeLog | -# sort -n | tr '\n' ' ' -# -# -- Rui Lopes <rui@ruilopes.com> - -case $2 in -POST-INSTALL) - %%XMLCATMGR%% -c %%CATALOG_PORTS%% add nextCatalog \ - "${PKG_PREFIX}/%%INSTDIR%%/catalog.xml" -;; -POST-DEINSTALL) - %%XMLCATMGR%% -c %%CATALOG_PORTS%% remove \ - "${PKG_PREFIX}/%%INSTDIR%%/catalog.xml" -;; -esac -exit 0 diff --git a/textproc/docbook-xsl-ns/pkg-plist b/textproc/docbook-xsl-ns/pkg-plist index 5651d87a8979..9c2092e8b70b 100644 --- a/textproc/docbook-xsl-ns/pkg-plist +++ b/textproc/docbook-xsl-ns/pkg-plist @@ -13,7 +13,7 @@ share/xsl/docbook-ns/epub3/docbook-epub.css.xml share/xsl/docbook-ns/tests/refentry.007.xml share/xsl/docbook-ns/tests/refentry.007.ns.xml share/xsl/docbook-ns/Makefile -share/xsl/docbook-ns/catalog.xml +@xmlcatmgr share/xsl/docbook-ns/catalog.xml share/xsl/docbook-ns/RELEASE-NOTES.xml share/xsl/docbook-ns/eclipse/profile-eclipse.xsl share/xsl/docbook-ns/eclipse/eclipse3.xsl @@ -469,7 +469,6 @@ share/xsl/docbook-ns/html/chunk-code.xsl share/xsl/docbook-ns/html/titlepage.xsl share/xsl/docbook-ns/html/refentry.xsl share/xsl/docbook-ns/html/autoidx.xsl -share/xsl/docbook-ns/svn-commit.tmp share/xsl/docbook-ns/profiling/profile-mode.xsl share/xsl/docbook-ns/profiling/strip-attributes.xsl share/xsl/docbook-ns/profiling/xsl2profile.xsl diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile index 65d87ee2b53a..85695af0400c 100644 --- a/textproc/docbook-xsl/Makefile +++ b/textproc/docbook-xsl/Makefile @@ -2,7 +2,7 @@ PORTNAME= docbook-xsl PORTVERSION= 1.76.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= SF/docbook/${PORTNAME}/${PORTVERSION}:src \ SF/docbook/${PORTNAME}-doc/${PORTVERSION}:doc @@ -22,14 +22,6 @@ INSTDIR= share/xsl/docbook 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 - MODULES= common fo html images lib manpages params xhtml OPTIONS_DEFINE= ECLIPSE EPUB EXTENSIONS HIGHLIGHTING HTMLHELP JAVAHELP \ diff --git a/textproc/docbook-xsl/files/pkg-deinstall.in b/textproc/docbook-xsl/files/pkg-deinstall.in deleted file mode 100644 index e4c66930a4cb..000000000000 --- a/textproc/docbook-xsl/files/pkg-deinstall.in +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# This script will remove the docbook-xsl entries added to xml catalog. -# -- Rui Lopes <rui@ruilopes.com> - -if [ "$2" != "DEINSTALL" ]; then - exit 0 -fi - -%%XMLCATMGR%% -c %%CATALOG_PORTS%% remove \ - http://docbook.sourceforge.net/release/xsl/ -exit 0 diff --git a/textproc/docbook-xsl/files/pkg-install.in b/textproc/docbook-xsl/files/pkg-install.in deleted file mode 100644 index 48ef165481d6..000000000000 --- a/textproc/docbook-xsl/files/pkg-install.in +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# This script will create the docbook-xsl catalog and will add entries to xml catalog. -# WARNING: If you change this script, be sure to check pkg-deinstall.in! -# -# Based on http://xmlsoft.org/buildDocBookCatalog file. -# -# Run the following command to generate a new VERSIONS string: -# perl -n -e '/Version ([\d.]+) rel/ && print "$1\n"' work/*/ChangeLog | -# sort -n | tr '\n' ' ' -# -# -- Rui Lopes <rui@ruilopes.com> - -XSL_DIR=${PKG_PREFIX}/%%INSTDIR%% -CATALOG_XSL=${XSL_DIR}/catalog.xml - -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -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%% add delegateURI \ - http://docbook.sourceforge.net/release/xsl/ \ - "file://${CATALOG_XSL}" -exit 0 diff --git a/textproc/docbook-xsl/pkg-plist b/textproc/docbook-xsl/pkg-plist index 4110bcbecbfb..35217754223a 100644 --- a/textproc/docbook-xsl/pkg-plist +++ b/textproc/docbook-xsl/pkg-plist @@ -13,7 +13,7 @@ share/xsl/docbook/RELEASE-NOTES.txt share/xsl/docbook/RELEASE-NOTES.xml share/xsl/docbook/TODO share/xsl/docbook/VERSION -share/xsl/docbook/catalog.xml +@xmlcatmgr share/xsl/docbook/catalog.xml share/xsl/docbook/common/af.xml share/xsl/docbook/common/am.xml share/xsl/docbook/common/ar.xml diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile index 3c2620f87e8a..f8f09521a093 100644 --- a/textproc/dsssl-docbook-modular/Makefile +++ b/textproc/dsssl-docbook-modular/Makefile @@ -18,17 +18,13 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= kuriyama@FreeBSD.org COMMENT= DSSSL stylesheets for the DocBook DTD by Norman Walsh -BUILD_DEPENDS= ${XMLCATMGR}:textproc/xmlcatmgr +BUILD_DEPENDS= xmlcatmgr:textproc/xmlcatmgr RUN_DEPENDS:= ${BUILD_DEPENDS} NO_MTREE= yes RELDIR= docbook/dsssl/modular INSTDIR= ${PREFIX}/share/sgml/${RELDIR} -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports -PLIST_SUB= XMLCATMGR=${XMLCATMGR} DTDDIR=${RELDIR} \ - CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} do-build: ${RM} -Rf ${WRKSRC}/docsrc diff --git a/textproc/dsssl-docbook-modular/pkg-plist b/textproc/dsssl-docbook-modular/pkg-plist index 667f7243b55d..c9121944ac78 100644 --- a/textproc/dsssl-docbook-modular/pkg-plist +++ b/textproc/dsssl-docbook-modular/pkg-plist @@ -9,7 +9,7 @@ share/sgml/docbook/dsssl/modular/WhatsNew share/sgml/docbook/dsssl/modular/bin/ChangeLog share/sgml/docbook/dsssl/modular/bin/collateindex.pl share/sgml/docbook/dsssl/modular/bin/collateindex.pl.1 -share/sgml/docbook/dsssl/modular/catalog +@xmlcatmgr share/sgml/docbook/dsssl/modular/catalog share/sgml/docbook/dsssl/modular/common/ChangeLog share/sgml/docbook/dsssl/modular/common/catalog share/sgml/docbook/dsssl/modular/common/cs-hack.pl @@ -726,5 +726,3 @@ share/sgml/docbook/dsssl/modular/print/docbook.dsl share/sgml/docbook/dsssl/modular/print/notoc.dsl share/sgml/docbook/dsssl/modular/print/plain.dsl share/sgml/docbook/dsssl/modular/print/version.dsl -@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTDDIR%%/catalog -@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile index f0c95edce1b7..27d82a92080d 100644 --- a/textproc/gtk-doc/Makefile +++ b/textproc/gtk-doc/Makefile @@ -22,17 +22,9 @@ RUN_DEPENDS= jade:textproc/jade \ DOCBOOK_VERSION= 4.1.2 -CATALOG_DIR= ${PREFIX}/share/sgml/${PORTNAME} -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports - USES= gmake gettext-tools pathfix perl5 pkgconfig python tar:xz USE_GNOME= gnomeprefix libxslt GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports -PLIST_SUB= XMLCATMGR=${XMLCATMGR} \ - CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \ - CATALOG_DIR=${CATALOG_DIR} - .include <bsd.port.mk> diff --git a/textproc/gtk-doc/pkg-plist b/textproc/gtk-doc/pkg-plist index dcb61e607557..63f392fb993d 100644 --- a/textproc/gtk-doc/pkg-plist +++ b/textproc/gtk-doc/pkg-plist @@ -61,6 +61,4 @@ share/help/te/gtk-doc-manual/fdl-appendix.xml share/help/te/gtk-doc-manual/index.docbook share/help/zh_CN/gtk-doc-manual/fdl-appendix.xml share/help/zh_CN/gtk-doc-manual/index.docbook -@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG %%CATALOG_DIR%%/gtk-doc.cat -share/sgml/gtk-doc/gtk-doc.cat -@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%CATALOG_DIR%%/gtk-doc.cat +@xmlcatmgr share/sgml/gtk-doc/gtk-doc.cat diff --git a/textproc/html/Makefile b/textproc/html/Makefile index baae73ec6b9e..eab51ea7c4b8 100644 --- a/textproc/html/Makefile +++ b/textproc/html/Makefile @@ -10,18 +10,13 @@ MASTER_SITES= LOCAL/kuriyama MAINTAINER= kuriyama@FreeBSD.org COMMENT= All W3C published SGML DTDs for HTML -RUN_DEPENDS= ${XMLCATMGR}:textproc/xmlcatmgr +RUN_DEPENDS= xmlcatmgr:textproc/xmlcatmgr NO_MTREE= yes NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} XMLCATMGR=${XMLCATMGR} -PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} - INSTDIR= ${PREFIX}/share/sgml/html -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports do-install: ${MKDIR} ${STAGEDIR}${INSTDIR} diff --git a/textproc/html/pkg-plist b/textproc/html/pkg-plist index c9d61ef4ca7f..c72d69cb2497 100644 --- a/textproc/html/pkg-plist +++ b/textproc/html/pkg-plist @@ -21,6 +21,4 @@ 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 %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/catalog -share/sgml/html/catalog -@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/catalog +@xmlcatmgr share/sgml/html/catalog diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile index 390fcd2bc9c9..dfae34c53ac7 100644 --- a/textproc/iso12083/Makefile +++ b/textproc/iso12083/Makefile @@ -12,19 +12,15 @@ EXTRACT_ONLY= # empty MAINTAINER= kuriyama@FreeBSD.org COMMENT= SGML DTDs from the The Electronic Publishing Special Interest Group -RUN_DEPENDS= ${XMLCATMGR}:textproc/xmlcatmgr +RUN_DEPENDS= xmlcatmgr:textproc/xmlcatmgr DIST_SUBDIR= iso12083 NO_MTREE= yes NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} XMLCATMGR=${XMLCATMGR} -PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} INSTDIR= ${STAGEDIR}${PREFIX}/share/sgml/iso12083 -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports pre-install: @[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR} diff --git a/textproc/iso12083/pkg-plist b/textproc/iso12083/pkg-plist index ae45ef5b228a..60af8dbf625a 100644 --- a/textproc/iso12083/pkg-plist +++ b/textproc/iso12083/pkg-plist @@ -2,6 +2,4 @@ share/sgml/iso12083/article.dtd share/sgml/iso12083/book.dtd share/sgml/iso12083/maths.dtd share/sgml/iso12083/serial.dtd -@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/catalog -share/sgml/iso12083/catalog -@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/catalog +@xmlcatmgr share/sgml/iso12083/catalog diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile index 6bf8a4151b4a..3c430480d3b6 100644 --- a/textproc/iso8879/Makefile +++ b/textproc/iso8879/Makefile @@ -11,17 +11,13 @@ DISTNAME= isoENTS MAINTAINER= kuriyama@FreeBSD.org COMMENT= Character entity sets from ISO 8879:1986 (SGML) -RUN_DEPENDS= ${XMLCATMGR}:textproc/xmlcatmgr +RUN_DEPENDS= xmlcatmgr:textproc/xmlcatmgr USES= zip NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} XMLCATMGR=${XMLCATMGR} -PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} INSTDIR= ${PREFIX}/share/sgml/iso8879 -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports do-install: @${MKDIR} ${STAGEDIR}${INSTDIR} diff --git a/textproc/iso8879/pkg-plist b/textproc/iso8879/pkg-plist index 454b38cb3d22..16541a108b71 100644 --- a/textproc/iso8879/pkg-plist +++ b/textproc/iso8879/pkg-plist @@ -17,6 +17,4 @@ share/sgml/iso8879/ISOlat2 share/sgml/iso8879/ISOnum share/sgml/iso8879/ISOpub share/sgml/iso8879/ISOtech -@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/catalog -share/sgml/iso8879/catalog -@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/catalog +@xmlcatmgr share/sgml/iso8879/catalog diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile index c6fc83cb9dbb..b1835e128c08 100644 --- a/textproc/jade/Makefile +++ b/textproc/jade/Makefile @@ -16,7 +16,7 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= kuriyama@FreeBSD.org COMMENT= Object-oriented SGML/XML parser toolkit and DSSSL engine -RUN_DEPENDS= ${XMLCATMGR}:textproc/xmlcatmgr +RUN_DEPENDS= xmlcatmgr:textproc/xmlcatmgr CONFLICTS= sp-1.* @@ -24,13 +24,8 @@ GNU_CONFIGURE= yes USES= desthack gmake libtool USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog -PLIST_SUB= XMLCATMGR=${XMLCATMGR} -PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} MAKE_JOBS_UNSAFE= yes -CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr - post-extract: @${CHMOD} u+w ${WRKSRC}/configure diff --git a/textproc/jade/pkg-plist b/textproc/jade/pkg-plist index 59d1501dd3a6..d9ab8123f1f6 100644 --- a/textproc/jade/pkg-plist +++ b/textproc/jade/pkg-plist @@ -178,9 +178,7 @@ lib/libstyle.so.1.0.3 %%DOCSDIR%%/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 -@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG jade/catalog +@xmlcatmgr share/sgml/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 7dc2055e8333..596b33ed3542 100644 --- a/textproc/linuxdoc/Makefile +++ b/textproc/linuxdoc/Makefile @@ -12,19 +12,14 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= The Linuxdoc SGML DTD RUN_DEPENDS= ${ISOCAT}:textproc/iso8879 \ - ${XMLCATMGR}:textproc/xmlcatmgr + xmlcatmgr:textproc/xmlcatmgr EXTRACT_ONLY= # empty NO_BUILD= yes NO_WRKSUBDIR= yes -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 -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports do-install: ${MKDIR} ${STAGEDIR}${INSTDIR} diff --git a/textproc/linuxdoc/pkg-plist b/textproc/linuxdoc/pkg-plist index b787685caec8..67be3fe15f91 100644 --- a/textproc/linuxdoc/pkg-plist +++ b/textproc/linuxdoc/pkg-plist @@ -1,7 +1,5 @@ share/sgml/linuxdoc/README -@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/catalog -share/sgml/linuxdoc/catalog -@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/catalog +@xmlcatmgr share/sgml/linuxdoc/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 dfe1b30e1712..10e9f2ea1390 100644 --- a/textproc/openjade/Makefile +++ b/textproc/openjade/Makefile @@ -34,12 +34,6 @@ post-patch: @${REINPLACE_CMD} -e 's|<iostream.h>|<iostream>|' ${WRKSRC}/style/MultiLineInlineNote.cxx post-install: - @${CAT} ${PLIST} | \ - ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | \ - ${AWK} '/^@comment INSTALL_DATA:/ \ - {printf "if ! ${GREP} -q \"%s\" ${PLIST}; then ${ECHO_CMD} \"%s\" >> %s; fi; %s %s/%s %s/%s\n", \ - $$4, $$4, "${TMPPLIST}", "${INSTALL_DATA}", \ - "${WRKSRC}", $$3, "${STAGEDIR}${PREFIX}", $$4}' | \ - ${SH} + @${FIND} ${WRKSRC}/dsssl -type f -depth 1 -exec ${INSTALL_DATA} {} ${STAGEDIR}/${DATADIR} \; .include <bsd.port.mk> diff --git a/textproc/openjade/pkg-plist b/textproc/openjade/pkg-plist index d5df27f12e07..3ab0b349a07c 100644 --- a/textproc/openjade/pkg-plist +++ b/textproc/openjade/pkg-plist @@ -11,41 +11,39 @@ lib/libostyle.a lib/libostyle.so lib/libostyle.so.0 lib/libostyle.so.0.0.1 -@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG openjade/catalog -@comment INSTALL_DATA: dsssl/README.jadetex %%DATADIR%%/README.jadetex -@comment INSTALL_DATA: dsssl/builtins.dsl %%DATADIR%%/builtins.dsl -@comment INSTALL_DATA: dsssl/catalog %%DATADIR%%/catalog -@comment INSTALL_DATA: dsssl/demo.dsl %%DATADIR%%/demo.dsl -@comment INSTALL_DATA: dsssl/demo.sgm %%DATADIR%%/demo.sgm -@comment INSTALL_DATA: dsssl/dsssl.dtd %%DATADIR%%/dsssl.dtd -@comment INSTALL_DATA: dsssl/extensions.dsl %%DATADIR%%/extensions.dsl -@comment INSTALL_DATA: dsssl/fot.dtd %%DATADIR%%/fot.dtd -@comment INSTALL_DATA: dsssl/lineNumber.dsl %%DATADIR%%/lineNumber.dsl -@comment INSTALL_DATA: dsssl/lineNumber.sgml %%DATADIR%%/lineNumber.sgml -@comment INSTALL_DATA: dsssl/ps.dsl %%DATADIR%%/ps.dsl -@comment INSTALL_DATA: dsssl/ps.fot %%DATADIR%%/ps.fot -@comment INSTALL_DATA: dsssl/ps.sgml %%DATADIR%%/ps.sgml -@comment INSTALL_DATA: dsssl/psalig.dsl %%DATADIR%%/psalig.dsl -@comment INSTALL_DATA: dsssl/pscs.dsl %%DATADIR%%/pscs.dsl -@comment INSTALL_DATA: dsssl/pscspb.dsl %%DATADIR%%/pscspb.dsl -@comment INSTALL_DATA: dsssl/pscspb.sgml %%DATADIR%%/pscspb.sgml -@comment INSTALL_DATA: dsssl/psemb.dsl %%DATADIR%%/psemb.dsl -@comment INSTALL_DATA: dsssl/psempha.dsl %%DATADIR%%/psempha.dsl -@comment INSTALL_DATA: dsssl/psglyp.dsl %%DATADIR%%/psglyp.dsl -@comment INSTALL_DATA: dsssl/psglyp2.dsl %%DATADIR%%/psglyp2.dsl -@comment INSTALL_DATA: dsssl/psinc.dsl %%DATADIR%%/psinc.dsl -@comment INSTALL_DATA: dsssl/psinc.sgml %%DATADIR%%/psinc.sgml -@comment INSTALL_DATA: dsssl/psinc2.dsl %%DATADIR%%/psinc2.dsl -@comment INSTALL_DATA: dsssl/psmulti.dsl %%DATADIR%%/psmulti.dsl -@comment INSTALL_DATA: dsssl/psmulti2.dsl %%DATADIR%%/psmulti2.dsl -@comment INSTALL_DATA: dsssl/psmulti3.dsl %%DATADIR%%/psmulti3.dsl -@comment INSTALL_DATA: dsssl/psradical.dsl %%DATADIR%%/psradical.dsl -@comment INSTALL_DATA: dsssl/pssbs.dsl %%DATADIR%%/pssbs.dsl -@comment INSTALL_DATA: dsssl/pssbsi.dsl %%DATADIR%%/pssbsi.dsl -@comment INSTALL_DATA: dsssl/sps.dsl %%DATADIR%%/sps.dsl -@comment INSTALL_DATA: dsssl/sps.sgml %%DATADIR%%/sps.sgml -@comment INSTALL_DATA: dsssl/spsanch.dsl %%DATADIR%%/spsanch.dsl -@comment INSTALL_DATA: dsssl/spsanch.sgml %%DATADIR%%/spsanch.sgml -@comment INSTALL_DATA: dsssl/style-sheet.dtd %%DATADIR%%/style-sheet.dtd -@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG openjade/catalog +%%DATADIR%%/README.jadetex +%%DATADIR%%/builtins.dsl +@xmlcatmgr %%DATADIR%%/catalog +%%DATADIR%%/demo.dsl +%%DATADIR%%/demo.sgm +%%DATADIR%%/dsssl.dtd +%%DATADIR%%/extensions.dsl +%%DATADIR%%/fot.dtd +%%DATADIR%%/lineNumber.dsl +%%DATADIR%%/lineNumber.sgml +%%DATADIR%%/ps.dsl +%%DATADIR%%/ps.fot +%%DATADIR%%/ps.sgml +%%DATADIR%%/psalig.dsl +%%DATADIR%%/pscs.dsl +%%DATADIR%%/pscspb.dsl +%%DATADIR%%/pscspb.sgml +%%DATADIR%%/psemb.dsl +%%DATADIR%%/psempha.dsl +%%DATADIR%%/psglyp.dsl +%%DATADIR%%/psglyp2.dsl +%%DATADIR%%/psinc.dsl +%%DATADIR%%/psinc.sgml +%%DATADIR%%/psinc2.dsl +%%DATADIR%%/psmulti.dsl +%%DATADIR%%/psmulti2.dsl +%%DATADIR%%/psmulti3.dsl +%%DATADIR%%/psradical.dsl +%%DATADIR%%/pssbs.dsl +%%DATADIR%%/pssbsi.dsl +%%DATADIR%%/sps.dsl +%%DATADIR%%/sps.sgml +%%DATADIR%%/spsanch.dsl +%%DATADIR%%/spsanch.sgml +%%DATADIR%%/style-sheet.dtd man/man1/openjade.1.gz diff --git a/textproc/sdocbook-xml/Makefile b/textproc/sdocbook-xml/Makefile index 542708071120..901e9f0406bb 100644 --- a/textproc/sdocbook-xml/Makefile +++ b/textproc/sdocbook-xml/Makefile @@ -3,7 +3,7 @@ PORTNAME= sdocbook-xml PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= textproc MASTER_SITES= http://www.oasis-open.org/docbook/xml/simple/${PORTVERSION}/ @@ -12,24 +12,20 @@ DISTNAME= docbook-simple-${PORTVERSION} MAINTAINER= gabor@FreeBSD.org COMMENT= "Simplified" DocBook XML DTD -RUN_DEPENDS+= ${LOCALBASE}/${XMLCATMGR}:textproc/xmlcatmgr +RUN_DEPENDS+= xmlcatmgr:textproc/xmlcatmgr USES= zip NO_MTREE= yes NO_BUILD= yes NO_WRKSUBDIR= yes -XMLCATMGR= bin/xmlcatmgr -XMLCAT= share/xml/catalog.ports -SGMLCAT= share/sgml/catalog.ports CATALOG_FILES= catalog catalog.xml DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION} DTD_NAME= sdocbook DTD_VERSION= ${PORTVERSION} DTD_SUBDIR= /dtd DTDDIR= share/xml/${DTD_NAME}/${DTD_VERSION}${DTD_SUBDIR} -PLIST_SUB+= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} XMLCAT=${XMLCAT} \ - DTDDIR=${DTDDIR} +PLIST_SUB+= DTDDIR=${DTDDIR} SUB_FILES= ${CATALOG_FILES} SUB_LIST+= DTDDIR=${PREFIX}/${DTDDIR} @@ -39,6 +35,5 @@ do-install: .for f in ${CATALOG_FILES} ${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/${DTDDIR} .endfor - @${ECHO_CMD} "@unexec rmdir %D/share/xml/${DTD_NAME} 2>/dev/null || :" >> ${TMPPLIST} .include <bsd.port.mk> diff --git a/textproc/sdocbook-xml/pkg-plist b/textproc/sdocbook-xml/pkg-plist index 4889c60dc24a..6abfc9c37860 100644 --- a/textproc/sdocbook-xml/pkg-plist +++ b/textproc/sdocbook-xml/pkg-plist @@ -1,9 +1,5 @@ -%%DTDDIR%%/catalog -@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F -@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F -%%DTDDIR%%/catalog.xml -@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove %D/%F -@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F +@xmlcatmgr %%DTDDIR%%/catalog +@xmlcatmgr %%DTDDIR%%/catalog.xml %%DTDDIR%%/sdbcent.mod %%DTDDIR%%/sdbhier.mod %%DTDDIR%%/sdbpool.mod diff --git a/textproc/slides/Makefile b/textproc/slides/Makefile index 9b30cb7805a8..25b04bfc5919 100644 --- a/textproc/slides/Makefile +++ b/textproc/slides/Makefile @@ -3,6 +3,7 @@ PORTNAME= slides PORTVERSION= 3.4.0 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= SF/docbook/${PORTNAME}/${PORTVERSION} DISTNAME= docbook-${PORTNAME}-${PORTVERSION} @@ -14,26 +15,20 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= docbook-xml>0:textproc/docbook-xml \ - docbook-xsl>0:textproc/docbook-xsl + docbook-xsl>0:textproc/docbook-xsl \ + xmlcatmgr:textproc/xmlcatmgr NO_ARCH= yes NO_BUILD= yes USES= tar:bzip2 -SUB_FILES= pkg-deinstall pkg-install -SUB_LIST= XMLCATMGR="${XMLCATMGR}" CATALOG_PORTS_XML="${CATALOG_PORTS}" \ - INSTDIR="${INSTDIR}" - OPTIONS_DEFINE= DOCS -XMLDIR= ${LOCALBASE}/share/xml INSTDIR= share/xsl/${PORTNAME} PINSTDIR= ${PREFIX}/${INSTDIR} COPYDIRS= browser graphics schema xsl -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -CATALOG_PORTS= ${XMLDIR}/catalog.ports do-install: @${MKDIR} ${STAGEDIR}${PINSTDIR} diff --git a/textproc/slides/files/pkg-deinstall.in b/textproc/slides/files/pkg-deinstall.in deleted file mode 100644 index e9e55b8d901f..000000000000 --- a/textproc/slides/files/pkg-deinstall.in +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -# This script will remove the slides entries added to xml catalog. -# -- Rui Lopes <rui@ruilopes.com> - -XMLCATMGR=%%XMLCATMGR%% -CATALOG_PORTS_XML=%%CATALOG_PORTS_XML%% - -if [ "$2" != "POST-DEINSTALL" ]; then - exit 0 -fi - -${XMLCATMGR} -c "${CATALOG_PORTS_XML}" remove http://docbook.sourceforge.net/release/slides/ diff --git a/textproc/slides/files/pkg-install.in b/textproc/slides/files/pkg-install.in deleted file mode 100644 index e7b498323082..000000000000 --- a/textproc/slides/files/pkg-install.in +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script will create the slides catalog and will add entries to xml catalog. -# WARNING: If you change this script, be sure to check pkg-deinstall.in! -# -# Based on http://xmlsoft.org/buildDocBookCatalog file. -# -# in vi/vim grab VERSIONS string with command: -# :r!echo -n "VERSIONS='current ";fetch -qo - http://cvs.sf.net/cgi-bin/viewcvs.cgi/docbook/${PORTNAME}/VERSION|sed -nE 's/.*Version (.*) released./\1/gp'|sort|sed -e '1,3d'|paste -sd ' ' -|tr \\n \' -# -# -- Rui Lopes <rui@ruilopes.com> - -XMLCATMGR=%%XMLCATMGR%% -CATALOG_PORTS_XML=%%CATALOG_PORTS_XML%% -XSL_DIR=${PKG_PREFIX}/%%INSTDIR%% -CATALOG_XSL=${XSL_DIR}/catalog - -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -${XMLCATMGR} -c "${CATALOG_PORTS_XML}" add delegateSystem \ - http://docbook.sourceforge.net/release/slides/ \ - "file://${CATALOG_XSL}" -${XMLCATMGR} -c "${CATALOG_PORTS_XML}" add delegateURI \ - http://docbook.sourceforge.net/release/slides/ \ - "file://${CATALOG_XSL}" - -# echo $(w3m -dump http://cvs.sf.net/cgi-bin/viewcvs.cgi/docbook/slides/VERSION -# | grep released | cut -d' ' -f2) diff --git a/textproc/slides/pkg-plist b/textproc/slides/pkg-plist index 783252cca86b..d1c996b3454f 100644 --- a/textproc/slides/pkg-plist +++ b/textproc/slides/pkg-plist @@ -22,7 +22,7 @@ share/xsl/slides/browser/xbStyle-css.js share/xsl/slides/browser/xbStyle-nn4.js share/xsl/slides/browser/xbStyle-not-supported.js share/xsl/slides/browser/xbStyle.js -share/xsl/slides/catalog +@xmlcatmgr share/xsl/slides/catalog share/xsl/slides/graphics/ChangeLog share/xsl/slides/graphics/active/ChangeLog share/xsl/slides/graphics/active/arr-next.png diff --git a/textproc/website/Makefile b/textproc/website/Makefile index 57e524a2a085..c1f06e9a8e1b 100644 --- a/textproc/website/Makefile +++ b/textproc/website/Makefile @@ -20,26 +20,16 @@ NO_BUILD= yes USES= tar:bzip2 -SUB_FILES= pkg-deinstall pkg-install -SUB_LIST= XMLCATMGR="${XMLCATMGR}" \ - CATALOG_PORTS_XML="${CATALOG_PORTS}" \ - INSTDIR="${INSTDIR}" - OPTIONS_DEFINE= EXAMPLES -XMLDIR= ${LOCALBASE}/share/xml INSTDIR= share/xsl/website PINSTDIR= ${PREFIX}/${INSTDIR} COPYDIRS= extensions schema xsl -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -CATALOG_PORTS= ${XMLDIR}/catalog.ports - do-install: @${MKDIR} ${STAGEDIR}${PINSTDIR} -.for i in VERSION catalog - (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${PINSTDIR}) -.endfor + ${INSTALL_DATA} ${WRKSRC}/VERSION ${STAGEDIR}/${PINSTDIR} + ${INSTALL_DATA} ${WRKSRC}/catalog ${STAGEDIR}/${PINSTDIR}/catalog.xml .for i in ${COPYDIRS} @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${PINSTDIR}) .endfor diff --git a/textproc/website/files/pkg-deinstall.in b/textproc/website/files/pkg-deinstall.in deleted file mode 100644 index 05190bd3098a..000000000000 --- a/textproc/website/files/pkg-deinstall.in +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# This script will remove the website entries added to xml catalog. -# -- Rui Lopes <rui@ruilopes.com> - -XMLCATMGR=%%XMLCATMGR%% -CATALOG_PORTS_XML=%%CATALOG_PORTS_XML%% - -if [ "$2" != "POST-DEINSTALL" ]; then - exit 0 -fi - -${XMLCATMGR} -c "${CATALOG_PORTS_XML}" remove http://docbook.sourceforge.net/release/website/ diff --git a/textproc/website/files/pkg-install.in b/textproc/website/files/pkg-install.in deleted file mode 100644 index 612af1337d0a..000000000000 --- a/textproc/website/files/pkg-install.in +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# This script will create the website catalog and will add entries to xml catalog. -# WARNING: If you change this script, be sure to check pkg-deinstall.in! -# -# Based on http://xmlsoft.org/buildDocBookCatalog file. -# -# in vi/vim grab VERSIONS string with command: -# :r!echo -n "VERSIONS='current ";fetch -qo - http://cvs.sf.net/cgi-bin/viewcvs.cgi/docbook/website/VERSION|sed -nE 's/.*Version (.*) released./\1/gp'|sort|sed -e '1,3d'|paste -sd ' ' -|tr \\n \' -# -# -- Rui Lopes <rui@ruilopes.com> - -XMLCATMGR=%%XMLCATMGR%% -CATALOG_PORTS_XML=%%CATALOG_PORTS_XML%% -XSL_DIR=${PKG_PREFIX}/%%INSTDIR%% -CATALOG_XSL=${XSL_DIR}/catalog - -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -${XMLCATMGR} -c "${CATALOG_PORTS_XML}" add delegateSystem \ - http://docbook.sourceforge.net/release/website/ \ - "file://${CATALOG_XSL}" -${XMLCATMGR} -c "${CATALOG_PORTS_XML}" add delegateURI \ - http://docbook.sourceforge.net/release/website/ \ - "file://${CATALOG_XSL}" - diff --git a/textproc/website/pkg-plist b/textproc/website/pkg-plist index 7db04c67159e..8a84533e9127 100644 --- a/textproc/website/pkg-plist +++ b/textproc/website/pkg-plist @@ -143,7 +143,7 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/website.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wslayout.xml share/xsl/website/VERSION -share/xsl/website/catalog +@xmlcatmgr share/xsl/website/catalog.xml share/xsl/website/extensions/ChangeLog share/xsl/website/extensions/saxon64.jar share/xsl/website/extensions/saxon64/ChangeLog diff --git a/textproc/xhtml-11/Makefile b/textproc/xhtml-11/Makefile index 74d756cdc690..a292980a895f 100644 --- a/textproc/xhtml-11/Makefile +++ b/textproc/xhtml-11/Makefile @@ -13,7 +13,7 @@ DIST_SUBDIR= ${DISTNAME}-${RECDATE} MAINTAINER= mandree@FreeBSD.org COMMENT= W3C's XHTML 1.1 DTD -RUN_DEPENDS= ${XMLCATMGR}:textproc/xmlcatmgr +RUN_DEPENDS= xmlcatmgr:textproc/xmlcatmgr USES= tar:tgz @@ -21,23 +21,6 @@ RECDATE= 20101123 WRKSRC= ${WRKDIR}/xhtml11-${RECDATE} NO_BUILD= yes -PLIST_SUB+= XMLCAT_ADD="${XMLCAT_ADD}" \ - XMLCAT_RM="${XMLCAT_RM}" \ - SGMLCAT_ADD="${SGMLCAT_ADD}" \ - SGMLCAT_RM="${SGMLCAT_RM}" - -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -SGMLCAT= ${PREFIX}/share/sgml/catalog.ports -XMLCAT= ${PREFIX}/share/xml/catalog.ports - -XMLCAT_ADD= ${XMLCATMGR} -c ${XMLCAT} add nextCatalog \ - ${PREFIX}/${DTDDIR}/catalog.xml -XMLCAT_RM= ${XMLCATMGR} -c ${XMLCAT} remove \ - ${PREFIX}/${DTDDIR}/catalog.xml -SGMLCAT_ADD= ${XMLCATMGR} -sc ${SGMLCAT} add CATALOG \ - ${PREFIX}/${DTDDIR}/xhtml11.cat -SGMLCAT_RM= ${XMLCATMGR} -sc ${SGMLCAT} remove \ - ${PREFIX}/${DTDDIR}/xhtml11.cat DTDDIR= share/xml/${PORTNAME}/1.1/dtd XSDDIR= share/xml/${PORTNAME}/1.1/xsd diff --git a/textproc/xhtml-11/pkg-plist b/textproc/xhtml-11/pkg-plist index d18b07f2c25f..0dca6b48ae87 100644 --- a/textproc/xhtml-11/pkg-plist +++ b/textproc/xhtml-11/pkg-plist @@ -1,10 +1,8 @@ -@preunexec %%SGMLCAT_RM%% -@preunexec %%XMLCAT_RM%% share/xml/xhtml/1.1/dtd/VERSION -share/xml/xhtml/1.1/dtd/catalog.xml +@xmlcatmgr share/xml/xhtml/1.1/dtd/catalog.xml share/xml/xhtml/1.1/dtd/xhtml11-flat.dtd share/xml/xhtml/1.1/dtd/xhtml11-model-1.mod -share/xml/xhtml/1.1/dtd/xhtml11.cat +@xmlcatmgr share/xml/xhtml/1.1/dtd/xhtml11.cat share/xml/xhtml/1.1/dtd/xhtml11.dtd share/xml/xhtml/1.1/dtd/xml1.dcl share/xml/xhtml/1.1/dtd/xml1n.dcl @@ -12,5 +10,3 @@ share/xml/xhtml/1.1/xsd/xhtml-ruby-1.xsd share/xml/xhtml/1.1/xsd/xhtml11-model-1.xsd share/xml/xhtml/1.1/xsd/xhtml11-modules-1.xsd share/xml/xhtml/1.1/xsd/xhtml11.xsd -@postexec %%XMLCAT_ADD%% -@postexec %%SGMLCAT_ADD%% diff --git a/textproc/xhtml-basic/Makefile b/textproc/xhtml-basic/Makefile index 642f7c836f73..d007d3c25149 100644 --- a/textproc/xhtml-basic/Makefile +++ b/textproc/xhtml-basic/Makefile @@ -12,7 +12,9 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= W3C's XHTML Basic DTD -RUN_DEPENDS= ${XMLCATMGR}:textproc/xmlcatmgr \ +OPTIONS_DEFINE= DOCS + +RUN_DEPENDS= xmlcatmgr:textproc/xmlcatmgr \ ${LOCALBASE}/share/xml/dtd/xhtml-modularization/catalog.xml:textproc/xhtml-modularization RECDATE= 20001219 @@ -21,56 +23,33 @@ NO_MTREE= YES NO_BUILD= YES WRKSRC= ${WRKDIR}/REC-${PORTNAME}-${RECDATE} -PLIST= ${WRKDIR}/PLIST -dir_DTD= share/xml/dtd/xhtml-basic -dir_DOC= share/doc/xhtml-basic - -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -SGMLCAT= ${PREFIX}/share/sgml/catalog.ports -XMLCAT= ${PREFIX}/share/xml/catalog.ports - -XMLCAT_ADD= ${XMLCATMGR} -c ${XMLCAT} add nextCatalog \ - ${PREFIX}/${dir_DTD}/catalog.xml -XMLCAT_RM= ${XMLCATMGR} -c ${XMLCAT} remove \ - ${PREFIX}/${dir_DTD}/catalog.xml -SGMLCAT_ADD= ${XMLCATMGR} -sc ${SGMLCAT} add CATALOG \ - ${PREFIX}/${dir_DTD}/xhtml-basic10.cat -SGMLCAT_RM= ${XMLCATMGR} -sc ${SGMLCAT} remove \ - ${PREFIX}/${dir_DTD}/xhtml-basic10.cat +PORTDATA= xhtml-basic10-model-1.mod \ + xhtml-basic10.cat \ + xhtml-basic10.dtd \ + xml1.dcl -CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports -CATALOG_PORTS_XML= ${PREFIX}/share/xml/catalog.ports +PLIST_FILES+= %%DATADIR%%/catalog.xml -.include "${.CURDIR}/contents.inc" +PORTDOCS= Overview.html \ + W3C-REC.css \ + logo-REC.png \ + w3c_home.png \ + xhtml-basic.css -# I'd much rather do this stuff in line with the actual installation -# in do-install, but the PLIST must be generated in pre-install. -pre-install: - ${CAT} /dev/null > ${PLIST} -.for f in ${contents_DTD} - ${ECHO} ${dir_DTD}/${f} >> ${PLIST} -.endfor -.for f in ${contents_DOC} - ${ECHO} ${dir_DOC}/${f} >> ${PLIST} -.endfor - ${ECHO} ${dir_DTD}/catalog.xml >> ${PLIST} - ${ECHO} "@unexec ${XMLCAT_RM}" >> ${PLIST} - ${ECHO} "@exec ${XMLCAT_ADD}" >> ${PLIST} - ${ECHO} "@unexec ${SGMLCAT_RM}" >> ${PLIST} - ${ECHO} "@exec ${SGMLCAT_ADD}" >> ${PLIST} - ${ECHO} '@unexec rmdir %D/share/xml/dtd 2>/dev/null || true' >> \ - ${PLIST} +SUB_FILES= catalog.xml +DATADIR= ${PREFIX}/share/xml/dtd/xhtml-basic do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${dir_DTD} - @${MKDIR} ${STAGEDIR}${PREFIX}/${dir_DOC} - (cd ${WRKSRC} && ${INSTALL_DATA} ${contents_DTD} \ - ${STAGEDIR}${PREFIX}/${dir_DTD}) - (cd ${WRKSRC} && ${INSTALL_DATA} ${contents_DOC} \ - ${STAGEDIR}${PREFIX}/${dir_DOC}) - ${SED} -e "s;@@PREFIX@@;${PREFIX};g" ${FILESDIR}/catalog.xml > \ - ${WRKDIR}/catalog.xml + @${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDATA} \ + ${STAGEDIR}${DATADIR}) ${INSTALL_DATA} ${WRKDIR}/catalog.xml \ - ${STAGEDIR}${PREFIX}/${dir_DTD}/catalog.xml + ${STAGEDIR}${DATADIR}/catalog.xml + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \ + ${STAGEDIR}${DOCSDIR}) + .include <bsd.port.mk> diff --git a/textproc/xhtml-basic/contents.inc b/textproc/xhtml-basic/contents.inc deleted file mode 100644 index b49c08018da7..000000000000 --- a/textproc/xhtml-basic/contents.inc +++ /dev/null @@ -1,10 +0,0 @@ -contents_DTD+= xhtml-basic10-model-1.mod -contents_DTD+= xhtml-basic10.cat -contents_DTD+= xhtml-basic10.dtd -contents_DTD+= xml1.dcl - -contents_DOC+= Overview.html -contents_DOC+= W3C-REC.css -contents_DOC+= logo-REC.png -contents_DOC+= w3c_home.png -contents_DOC+= xhtml-basic.css diff --git a/textproc/xhtml-basic/files/catalog.xml b/textproc/xhtml-basic/files/catalog.xml.in index f8d03f71ebd9..091bbff934d1 100644 --- a/textproc/xhtml-basic/files/catalog.xml +++ b/textproc/xhtml-basic/files/catalog.xml.in @@ -4,7 +4,7 @@ <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public" - xml:base="file://@@PREFIX@@/share/xml/dtd/xhtml-basic/"> + xml:base="file://%%PREFIX%%/share/xml/dtd/xhtml-basic/"> <rewriteSystem systemIdStartString="http://www.w3.org/TR/xhtml-basic/" diff --git a/textproc/xhtml-modularization/Makefile b/textproc/xhtml-modularization/Makefile index 79064c7bc155..540633dd5582 100644 --- a/textproc/xhtml-modularization/Makefile +++ b/textproc/xhtml-modularization/Makefile @@ -11,79 +11,46 @@ DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= W3C's Modularization of XHTML DTDs and docs -RUN_DEPENDS= ${XMLCATMGR}:textproc/xmlcatmgr +RUN_DEPENDS= xmlcatmgr:textproc/xmlcatmgr USES= tar:tgz RECDATE= 20010410 +OPTIONS_DEFINE= DOCS EXAMPLES + SUB_FILES= catalog.xml NO_MTREE= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${RECDATE} -PLIST= ${WRKDIR}/PLIST dir_DTD= share/xml/dtd/xhtml-modularization -dir_DOC= share/doc/xhtml-modularization -dir_EXAMPLES= share/examples/xhtml-modularization -dir_TEMPLATES= share/examples/xhtml-modularization/templates - -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -SGMLCAT= ${PREFIX}/share/sgml/catalog.ports -XMLCAT= ${PREFIX}/share/xml/catalog.ports - -XMLCAT_ADD= ${XMLCATMGR} -c ${XMLCAT} add nextCatalog \ - ${PREFIX}/${dir_DTD}/catalog.xml -XMLCAT_RM= ${XMLCATMGR} -c ${XMLCAT} remove \ - ${PREFIX}/${dir_DTD}/catalog.xml -SGMLCAT_ADD= ${XMLCATMGR} -sc ${SGMLCAT} add CATALOG \ - ${PREFIX}/${dir_DTD}/xhtml.cat -SGMLCAT_RM= ${XMLCATMGR} -sc ${SGMLCAT} remove \ - ${PREFIX}/${dir_DTD}/xhtml.cat .include "${.CURDIR}/contents.inc" -# I'd much rather do this stuff in line with the actual installation -# in do-install, but the PLIST must be generated in pre-install. -pre-install: - ${CAT} /dev/null > ${PLIST} -.for f in ${contents_DTD} - ${ECHO} ${dir_DTD}/${f} >> ${PLIST} -.endfor -.for f in ${contents_DOC} - ${ECHO} ${dir_DOC}/${f} >> ${PLIST} -.endfor -.for f in ${contents_EXAMPLES} - ${ECHO} ${dir_EXAMPLES}/${f} >> ${PLIST} -.endfor -.for f in ${contents_TEMPLATES} - ${ECHO} ${dir_TEMPLATES}/${f} >> ${PLIST} -.endfor - ${ECHO} ${dir_DTD}/catalog.xml >> ${PLIST} - ${ECHO} "@unexec ${XMLCAT_RM}" >> ${PLIST} - ${ECHO} "@exec ${XMLCAT_ADD}" >> ${PLIST} - ${ECHO} "@unexec ${SGMLCAT_RM}" >> ${PLIST} - ${ECHO} "@exec ${SGMLCAT_ADD}" >> ${PLIST} - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${dir_DTD} .for f in ${contents_DTD} ${INSTALL_DATA} ${WRKSRC}/DTD/${f} ${STAGEDIR}${PREFIX}/${dir_DTD}/${f} .endfor - @${MKDIR} ${STAGEDIR}${PREFIX}/${dir_DOC}/images + ${INSTALL_DATA} ${WRKDIR}/catalog.xml ${STAGEDIR}${PREFIX}/${dir_DTD}/catalog.xml + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR}/images .for f in ${contents_DOC} - ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/${dir_DOC}/${f} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/${f} .endfor - @${MKDIR} ${STAGEDIR}${PREFIX}/${dir_EXAMPLES} + +post-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in ${contents_EXAMPLES} ${INSTALL_DATA} ${WRKSRC}/DTD/examples/${f} \ - ${STAGEDIR}${PREFIX}/${dir_EXAMPLES}/${f} + ${STAGEDIR}${EXAMPLESDIR}/${f} .endfor - @${MKDIR} ${STAGEDIR}${PREFIX}/${dir_TEMPLATES} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/templates .for f in ${contents_TEMPLATES} ${INSTALL_DATA} ${WRKSRC}/DTD/templates/${f} \ - ${STAGEDIR}${PREFIX}/${dir_TEMPLATES}/${f} + ${STAGEDIR}${EXAMPLESDIR}/templates/${f} .endfor - ${INSTALL_DATA} ${WRKDIR}/catalog.xml ${STAGEDIR}${PREFIX}/${dir_DTD}/catalog.xml .include <bsd.port.mk> diff --git a/textproc/xhtml-modularization/pkg-plist b/textproc/xhtml-modularization/pkg-plist new file mode 100644 index 000000000000..f8be22d61f3c --- /dev/null +++ b/textproc/xhtml-modularization/pkg-plist @@ -0,0 +1,111 @@ +share/xml/dtd/xhtml-modularization/VERSION +@xmlcatmgr share/xml/dtd/xhtml-modularization/catalog.xml +share/xml/dtd/xhtml-modularization/xhtml-applet-1.mod +share/xml/dtd/xhtml-modularization/xhtml-arch-1.mod +share/xml/dtd/xhtml-modularization/xhtml-attribs-1.mod +share/xml/dtd/xhtml-modularization/xhtml-base-1.mod +share/xml/dtd/xhtml-modularization/xhtml-basic-form-1.mod +share/xml/dtd/xhtml-modularization/xhtml-basic-table-1.mod +share/xml/dtd/xhtml-modularization/xhtml-bdo-1.mod +share/xml/dtd/xhtml-modularization/xhtml-blkphras-1.mod +share/xml/dtd/xhtml-modularization/xhtml-blkpres-1.mod +share/xml/dtd/xhtml-modularization/xhtml-blkstruct-1.mod +share/xml/dtd/xhtml-modularization/xhtml-charent-1.mod +share/xml/dtd/xhtml-modularization/xhtml-csismap-1.mod +share/xml/dtd/xhtml-modularization/xhtml-datatypes-1.mod +share/xml/dtd/xhtml-modularization/xhtml-edit-1.mod +share/xml/dtd/xhtml-modularization/xhtml-events-1.mod +share/xml/dtd/xhtml-modularization/xhtml-form-1.mod +share/xml/dtd/xhtml-modularization/xhtml-frames-1.mod +share/xml/dtd/xhtml-modularization/xhtml-framework-1.mod +share/xml/dtd/xhtml-modularization/xhtml-hypertext-1.mod +share/xml/dtd/xhtml-modularization/xhtml-iframe-1.mod +share/xml/dtd/xhtml-modularization/xhtml-image-1.mod +share/xml/dtd/xhtml-modularization/xhtml-inlphras-1.mod +share/xml/dtd/xhtml-modularization/xhtml-inlpres-1.mod +share/xml/dtd/xhtml-modularization/xhtml-inlstruct-1.mod +share/xml/dtd/xhtml-modularization/xhtml-inlstyle-1.mod +share/xml/dtd/xhtml-modularization/xhtml-lat1.ent +share/xml/dtd/xhtml-modularization/xhtml-legacy-1.mod +share/xml/dtd/xhtml-modularization/xhtml-legacy-redecl-1.mod +share/xml/dtd/xhtml-modularization/xhtml-link-1.mod +share/xml/dtd/xhtml-modularization/xhtml-list-1.mod +share/xml/dtd/xhtml-modularization/xhtml-meta-1.mod +share/xml/dtd/xhtml-modularization/xhtml-nameident-1.mod +share/xml/dtd/xhtml-modularization/xhtml-notations-1.mod +share/xml/dtd/xhtml-modularization/xhtml-object-1.mod +share/xml/dtd/xhtml-modularization/xhtml-param-1.mod +share/xml/dtd/xhtml-modularization/xhtml-pres-1.mod +share/xml/dtd/xhtml-modularization/xhtml-qname-1.mod +share/xml/dtd/xhtml-modularization/xhtml-script-1.mod +share/xml/dtd/xhtml-modularization/xhtml-special.ent +share/xml/dtd/xhtml-modularization/xhtml-ssismap-1.mod +share/xml/dtd/xhtml-modularization/xhtml-struct-1.mod +share/xml/dtd/xhtml-modularization/xhtml-style-1.mod +share/xml/dtd/xhtml-modularization/xhtml-symbol.ent +share/xml/dtd/xhtml-modularization/xhtml-table-1.mod +share/xml/dtd/xhtml-modularization/xhtml-target-1.mod +share/xml/dtd/xhtml-modularization/xhtml-text-1.mod +@xmlcatmgr share/xml/dtd/xhtml-modularization/xhtml.cat +share/xml/dtd/xhtml-modularization/xml1.dcl +share/xml/dtd/xhtml-modularization/xml1n.dcl +%%PORTDOCS%%%%DOCSDIR%%/Overview.html +%%PORTDOCS%%%%DOCSDIR%%/W3C-REC.css +%%PORTDOCS%%%%DOCSDIR%%/abstract_modules.html +%%PORTDOCS%%%%DOCSDIR%%/abstraction.html +%%PORTDOCS%%%%DOCSDIR%%/acknowledgements.html +%%PORTDOCS%%%%DOCSDIR%%/conformance.html +%%PORTDOCS%%%%DOCSDIR%%/dtd_developing.html +%%PORTDOCS%%%%DOCSDIR%%/dtd_module_defs.html +%%PORTDOCS%%%%DOCSDIR%%/dtd_module_rules.html +%%PORTDOCS%%%%DOCSDIR%%/goals.html +%%PORTDOCS%%%%DOCSDIR%%/images/aqua.gif +%%PORTDOCS%%%%DOCSDIR%%/images/black.gif +%%PORTDOCS%%%%DOCSDIR%%/images/blue.gif +%%PORTDOCS%%%%DOCSDIR%%/images/fuchsia.gif +%%PORTDOCS%%%%DOCSDIR%%/images/gray.gif +%%PORTDOCS%%%%DOCSDIR%%/images/green.gif +%%PORTDOCS%%%%DOCSDIR%%/images/lime.gif +%%PORTDOCS%%%%DOCSDIR%%/images/maroon.gif +%%PORTDOCS%%%%DOCSDIR%%/images/navy.gif +%%PORTDOCS%%%%DOCSDIR%%/images/olive.gif +%%PORTDOCS%%%%DOCSDIR%%/images/purple.gif +%%PORTDOCS%%%%DOCSDIR%%/images/red.gif +%%PORTDOCS%%%%DOCSDIR%%/images/silver.gif +%%PORTDOCS%%%%DOCSDIR%%/images/teal.gif +%%PORTDOCS%%%%DOCSDIR%%/images/white.gif +%%PORTDOCS%%%%DOCSDIR%%/images/yellow.gif +%%PORTDOCS%%%%DOCSDIR%%/introduction.html +%%PORTDOCS%%%%DOCSDIR%%/logo-REC.gif +%%PORTDOCS%%%%DOCSDIR%%/references.html +%%PORTDOCS%%%%DOCSDIR%%/schema_developing.html +%%PORTDOCS%%%%DOCSDIR%%/schema_module_defs.html +%%PORTDOCS%%%%DOCSDIR%%/schema_module_rules.html +%%PORTDOCS%%%%DOCSDIR%%/terms.html +%%PORTDOCS%%%%DOCSDIR%%/w3c_home.gif +%%PORTDOCS%%%%DOCSDIR%%/wcag1AAA.gif +%%PORTDOCS%%%%DOCSDIR%%/xhtml-modularization.html +%%PORTDOCS%%%%DOCSDIR%%/xhtml-modularization.pdf +%%PORTDOCS%%%%DOCSDIR%%/xhtml-modularization.ps +%%PORTDOCS%%%%DOCSDIR%%/xhtml.css +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/MODULE-qname.mod +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inventory-1.dtd +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inventory-1.mod +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inventory-newprefix.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inventory-prefixed.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inventory-qname-1.mod +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inventory.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/myml-1_0.dtd +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/myml-elements-1.mod +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/myml-model-1.mod +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/myml-noprefix.html +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/myml-prefixed.html +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/myml-qname-1.mod +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-defaults.html +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-newprefix.html +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-prefixed.html +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simpleml-1_0.dtd +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simpleml-model-1.mod +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/templates/template-1.mod +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/templates/template-qname-1.mod +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/templates/template.dtd diff --git a/textproc/xhtml/Makefile b/textproc/xhtml/Makefile index 6ddbca27c72d..c23e907a34bc 100644 --- a/textproc/xhtml/Makefile +++ b/textproc/xhtml/Makefile @@ -3,7 +3,7 @@ PORTNAME= xhtml PORTVERSION= 1.0.20020801 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc #MASTER_SITES= http://www.w3.org/TR/xhtml1/ MASTER_SITES= LOCAL/kuriyama @@ -12,28 +12,20 @@ DISTNAME= xhtml1-20020801 MAINTAINER= kuriyama@FreeBSD.org COMMENT= W3C's XHTML DTD -RUN_DEPENDS= ${XMLCATMGR}:textproc/xmlcatmgr +RUN_DEPENDS= xmlcatmgr:textproc/xmlcatmgr USES= zip 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} +SUB_FILES= catalog.xml +SUB_LIST+= DTDDIR="${DTDDIR}" 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 ${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 + xhtml1-transitional.dtd xhtml1.dcl ${WRKDIR}/catalog.xml pre-su-install: @[ -d ${STAGEDIR}${DTDDIR} ] || ${MKDIR} ${STAGEDIR}${DTDDIR} diff --git a/textproc/xhtml/files/catalog.xml b/textproc/xhtml/files/catalog.xml.in index 2442f65e0f96..3ad459ea883d 100644 --- a/textproc/xhtml/files/catalog.xml +++ b/textproc/xhtml/files/catalog.xml.in @@ -5,10 +5,10 @@ <!-- 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" /> + <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 d17bcc1e3680..66b9374dd989 100644 --- a/textproc/xhtml/pkg-plist +++ b/textproc/xhtml/pkg-plist @@ -1,13 +1,9 @@ share/xml/dtd/xhtml/xhtml-lat1.ent share/xml/dtd/xhtml/xhtml-special.ent share/xml/dtd/xhtml/xhtml-symbol.ent -@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTDDIR%%/xhtml-dcl.soc share/xml/dtd/xhtml/xhtml.soc -share/xml/dtd/xhtml/xhtml-dcl.soc -@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/xhtml-dcl.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 +@xmlcatmgr share/xml/dtd/xhtml/xhtml-dcl.soc +@xmlcatmgr share/xml/dtd/xhtml/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 24a541211ca5..f0acb79cbd42 100644 --- a/textproc/xmlcharent/Makefile +++ b/textproc/xmlcharent/Makefile @@ -10,18 +10,13 @@ MASTER_SITES= http://www.oasis-open.org/docbook/${PORTNAME}/${PORTVERSION}/ MAINTAINER= hrs@FreeBSD.org COMMENT= XML character entities -RUN_DEPENDS= ${XMLCATMGR}:textproc/xmlcatmgr +RUN_DEPENDS= xmlcatmgr:textproc/xmlcatmgr USES= zip NO_WRKSUBDIR= yes NO_BUILD= yes -PLIST_SUB= XMLCATMGR=${XMLCATMGR} \ - XMLDIR=${XMLDIR} \ - CATALOG_PORTS_SGML=${LOCALBASE}/share/sgml/catalog.ports \ - CATALOG_PORTS_XML=${LOCALBASE}/share/xml/catalog.ports XMLDIR= ${PREFIX}/share/xml/${PORTNAME} -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr do-install: ${MKDIR} ${STAGEDIR}${XMLDIR} diff --git a/textproc/xmlcharent/pkg-plist b/textproc/xmlcharent/pkg-plist index ad6c7bcebea5..f294abe0aff5 100644 --- a/textproc/xmlcharent/pkg-plist +++ b/textproc/xmlcharent/pkg-plist @@ -1,9 +1,5 @@ -@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG %%XMLDIR%%/catalog -share/xml/xmlcharent/catalog -@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%XMLDIR%%/catalog -@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove nextCatalog %%XMLDIR%%/catalog.xml -share/xml/xmlcharent/catalog.xml -@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add nextCatalog %%XMLDIR%%/catalog.xml +@xmlcatmgr share/xml/xmlcharent/catalog +@xmlcatmgr share/xml/xmlcharent/catalog.xml share/xml/xmlcharent/iso-amsa.ent share/xml/xmlcharent/iso-amsb.ent share/xml/xmlcharent/iso-amsc.ent |