Date: Tue, 24 May 2016 22:32:49 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415814 - in head: Keywords security/vuxml textproc/docbook-sgml textproc/docbook-xml textproc/docbook-xsl textproc/docbook-xsl-ns textproc/docbook-xsl-ns/files textproc/docbook-xsl/fil... Message-ID: <201605242232.u4OMWnt7061824@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue May 24 22:32:49 2016 New Revision: 415814 URL: https://svnweb.freebsd.org/changeset/ports/415814 Log: Add a new keywork xmlcatmgr It simplifies the handling of the XML and SMGL catalog It brings a big of consistency by always specifying the catalog path absolute instead of mixing absolute and relative path. The keyword is also written a PKG_ROOTDIR friendly to simplify cross installing Reviewed by: hrs Differential Revision: https://reviews.freebsd.org/D6539 Added: head/Keywords/xmlcatmgr.ucl (contents, props changed) head/textproc/xhtml-basic/files/catalog.xml.in - copied, changed from r415813, head/textproc/xhtml-basic/files/catalog.xml head/textproc/xhtml-modularization/pkg-plist (contents, props changed) head/textproc/xhtml/files/catalog.xml.in - copied, changed from r415813, head/textproc/xhtml/files/catalog.xml Deleted: head/textproc/docbook-xsl-ns/files/ head/textproc/docbook-xsl/files/ head/textproc/slides/files/ head/textproc/website/files/ head/textproc/xhtml-basic/contents.inc head/textproc/xhtml-basic/files/catalog.xml head/textproc/xhtml/files/catalog.xml Modified: head/security/vuxml/Makefile head/security/vuxml/pkg-plist head/textproc/docbook-sgml/Makefile head/textproc/docbook-sgml/pkg-plist head/textproc/docbook-xml/Makefile head/textproc/docbook-xml/pkg-plist head/textproc/docbook-xsl-ns/Makefile head/textproc/docbook-xsl-ns/pkg-plist head/textproc/docbook-xsl/Makefile head/textproc/docbook-xsl/pkg-plist head/textproc/dsssl-docbook-modular/Makefile head/textproc/dsssl-docbook-modular/pkg-plist head/textproc/gtk-doc/Makefile head/textproc/gtk-doc/pkg-plist head/textproc/html/Makefile head/textproc/html/pkg-plist head/textproc/iso12083/Makefile head/textproc/iso12083/pkg-plist head/textproc/iso8879/Makefile head/textproc/iso8879/pkg-plist head/textproc/jade/Makefile head/textproc/jade/pkg-plist head/textproc/linuxdoc/Makefile head/textproc/linuxdoc/pkg-plist head/textproc/openjade/Makefile head/textproc/openjade/pkg-plist head/textproc/sdocbook-xml/Makefile head/textproc/sdocbook-xml/pkg-plist head/textproc/slides/Makefile head/textproc/slides/pkg-plist head/textproc/website/Makefile head/textproc/website/pkg-plist head/textproc/xhtml-11/Makefile head/textproc/xhtml-11/pkg-plist head/textproc/xhtml-basic/Makefile head/textproc/xhtml-modularization/Makefile head/textproc/xhtml/Makefile head/textproc/xhtml/pkg-plist head/textproc/xmlcharent/Makefile head/textproc/xmlcharent/pkg-plist Added: head/Keywords/xmlcatmgr.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Keywords/xmlcatmgr.ucl Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/security/vuxml/Makefile ============================================================================== --- head/security/vuxml/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/security/vuxml/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -16,7 +16,7 @@ COMMENT= Vulnerability and eXposure Mark 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: Modified: head/security/vuxml/pkg-plist ============================================================================== --- head/security/vuxml/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/security/vuxml/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -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%% Modified: head/textproc/docbook-sgml/Makefile ============================================================================== --- head/textproc/docbook-sgml/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/docbook-sgml/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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:d 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} Modified: head/textproc/docbook-sgml/pkg-plist ============================================================================== --- head/textproc/docbook-sgml/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/docbook-sgml/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/docbook-xml/Makefile ============================================================================== --- head/textproc/docbook-xml/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/docbook-xml/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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\"" \ Modified: head/textproc/docbook-xml/pkg-plist ============================================================================== --- head/textproc/docbook-xml/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/docbook-xml/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/docbook-xsl-ns/Makefile ============================================================================== --- head/textproc/docbook-xsl-ns/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/docbook-xsl-ns/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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> Modified: head/textproc/docbook-xsl-ns/pkg-plist ============================================================================== --- head/textproc/docbook-xsl-ns/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/docbook-xsl-ns/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -13,7 +13,7 @@ share/xsl/docbook-ns/epub3/docbook-epub. 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 Modified: head/textproc/docbook-xsl/Makefile ============================================================================== --- head/textproc/docbook-xsl/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/docbook-xsl/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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 \ Modified: head/textproc/docbook-xsl/pkg-plist ============================================================================== --- head/textproc/docbook-xsl/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/docbook-xsl/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/dsssl-docbook-modular/Makefile ============================================================================== --- head/textproc/dsssl-docbook-modular/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/dsssl-docbook-modular/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/dsssl-docbook-modular/pkg-plist ============================================================================== --- head/textproc/dsssl-docbook-modular/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/dsssl-docbook-modular/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -9,7 +9,7 @@ share/sgml/docbook/dsssl/modular/WhatsNe 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/d 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 Modified: head/textproc/gtk-doc/Makefile ============================================================================== --- head/textproc/gtk-doc/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/gtk-doc/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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> Modified: head/textproc/gtk-doc/pkg-plist ============================================================================== --- head/textproc/gtk-doc/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/gtk-doc/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -61,6 +61,4 @@ share/help/te/gtk-doc-manual/fdl-appendi 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 Modified: head/textproc/html/Makefile ============================================================================== --- head/textproc/html/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/html/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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} Modified: head/textproc/html/pkg-plist ============================================================================== --- head/textproc/html/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/html/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/iso12083/Makefile ============================================================================== --- head/textproc/iso12083/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/iso12083/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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} Modified: head/textproc/iso12083/pkg-plist ============================================================================== --- head/textproc/iso12083/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/iso12083/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/iso8879/Makefile ============================================================================== --- head/textproc/iso8879/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/iso8879/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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} Modified: head/textproc/iso8879/pkg-plist ============================================================================== --- head/textproc/iso8879/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/iso8879/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/jade/Makefile ============================================================================== --- head/textproc/jade/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/jade/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/jade/pkg-plist ============================================================================== --- head/textproc/jade/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/jade/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/linuxdoc/Makefile ============================================================================== --- head/textproc/linuxdoc/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/linuxdoc/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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} Modified: head/textproc/linuxdoc/pkg-plist ============================================================================== --- head/textproc/linuxdoc/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/linuxdoc/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/openjade/Makefile ============================================================================== --- head/textproc/openjade/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/openjade/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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> Modified: head/textproc/openjade/pkg-plist ============================================================================== --- head/textproc/openjade/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/openjade/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/sdocbook-xml/Makefile ============================================================================== --- head/textproc/sdocbook-xml/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/sdocbook-xml/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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> Modified: head/textproc/sdocbook-xml/pkg-plist ============================================================================== --- head/textproc/sdocbook-xml/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/sdocbook-xml/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/slides/Makefile ============================================================================== --- head/textproc/slides/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/slides/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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} Modified: head/textproc/slides/pkg-plist ============================================================================== --- head/textproc/slides/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/slides/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/website/Makefile ============================================================================== --- head/textproc/website/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/website/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/website/pkg-plist ============================================================================== --- head/textproc/website/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/website/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/xhtml-11/Makefile ============================================================================== --- head/textproc/xhtml-11/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/xhtml-11/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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 Modified: head/textproc/xhtml-11/pkg-plist ============================================================================== --- head/textproc/xhtml-11/pkg-plist Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/xhtml-11/pkg-plist Tue May 24 22:32:49 2016 (r415814) @@ -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%% Modified: head/textproc/xhtml-basic/Makefile ============================================================================== --- head/textproc/xhtml-basic/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/xhtml-basic/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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 - -CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports -CATALOG_PORTS_XML= ${PREFIX}/share/xml/catalog.ports - -.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 - ${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} +PORTDATA= xhtml-basic10-model-1.mod \ + xhtml-basic10.cat \ + xhtml-basic10.dtd \ + xml1.dcl + +PLIST_FILES+= %%DATADIR%%/catalog.xml + +PORTDOCS= Overview.html \ + W3C-REC.css \ + logo-REC.png \ + w3c_home.png \ + xhtml-basic.css + +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> Copied and modified: head/textproc/xhtml-basic/files/catalog.xml.in (from r415813, head/textproc/xhtml-basic/files/catalog.xml) ============================================================================== --- head/textproc/xhtml-basic/files/catalog.xml Tue May 24 22:03:13 2016 (r415813, copy source) +++ head/textproc/xhtml-basic/files/catalog.xml.in Tue May 24 22:32:49 2016 (r415814) @@ -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/" Modified: head/textproc/xhtml-modularization/Makefile ============================================================================== --- head/textproc/xhtml-modularization/Makefile Tue May 24 22:03:13 2016 (r415813) +++ head/textproc/xhtml-modularization/Makefile Tue May 24 22:32:49 2016 (r415814) @@ -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 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605242232.u4OMWnt7061824>