From owner-svn-ports-head@FreeBSD.ORG Tue Feb 18 11:43:20 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ABF668DA; Tue, 18 Feb 2014 11:43:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 954451ABE; Tue, 18 Feb 2014 11:43:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1IBhKiM098223; Tue, 18 Feb 2014 11:43:20 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1IBhFNZ098193; Tue, 18 Feb 2014 11:43:15 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201402181143.s1IBhFNZ098193@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 18 Feb 2014 11:43:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344866 - in head/textproc: docbook docbook-241 docbook-300 docbook-310 docbook-400 docbook-410 docbook-420 docbook-420/files docbook-430 docbook-440 docbook-450 docbook-500 docbook-sk ... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Feb 2014 11:43:20 -0000 Author: mat Date: Tue Feb 18 11:43:14 2014 New Revision: 344866 URL: http://svnweb.freebsd.org/changeset/ports/344866 QAT: https://qat.redports.org/buildarchive/r344866/ Log: Refactor the docbook ports. Reviewed by: miwi Sponsored by: Absolight Added: head/textproc/docbook-xml-430/pkg-plist (contents, props changed) head/textproc/docbook-xml-440/pkg-plist (contents, props changed) head/textproc/docbook-xml-450/pkg-plist (contents, props changed) head/textproc/docbook/bsd.docbook.mk (contents, props changed) Modified: head/textproc/docbook-241/Makefile head/textproc/docbook-241/pkg-plist head/textproc/docbook-300/Makefile head/textproc/docbook-300/pkg-plist head/textproc/docbook-310/Makefile head/textproc/docbook-310/pkg-plist head/textproc/docbook-400/Makefile head/textproc/docbook-400/pkg-plist head/textproc/docbook-410/Makefile head/textproc/docbook-410/pkg-plist head/textproc/docbook-420/Makefile head/textproc/docbook-420/files/catalog.in head/textproc/docbook-420/pkg-plist head/textproc/docbook-430/Makefile head/textproc/docbook-430/pkg-plist head/textproc/docbook-440/Makefile head/textproc/docbook-440/pkg-plist head/textproc/docbook-450/Makefile head/textproc/docbook-450/pkg-plist head/textproc/docbook-500/Makefile head/textproc/docbook-500/pkg-plist head/textproc/docbook-sk/Makefile head/textproc/docbook-sk/pkg-plist head/textproc/docbook-xml-430/Makefile head/textproc/docbook-xml-440/Makefile head/textproc/docbook-xml-450/Makefile head/textproc/docbook-xml/Makefile head/textproc/docbook-xml/pkg-plist Modified: head/textproc/docbook-241/Makefile ============================================================================== --- head/textproc/docbook-241/Makefile Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-241/Makefile Tue Feb 18 11:43:14 2014 (r344866) @@ -1,39 +1,16 @@ # Created by: nik # $FreeBSD$ -PORTNAME= docbook PORTVERSION= 2.4.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 -CATEGORIES= textproc -MASTER_SITES= http://www.oasis-open.org/docbook/sgml/2.4.1/ PKGNAMESUFFIX= 241 DISTNAME= docbk241 -EXTRACT_SUFX= .zip MAINTAINER= gabor@FreeBSD.org COMMENT= V2.4.1 of the DocBook DTD, designed for technical documentation -RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr - -NO_MTREE= yes -NO_BUILD= yes -EXTRACT_AFTER_ARGS= -s ,^,${DISTNAME}/, - -DTDDIR= ${PREFIX}/share/sgml/docbook/2.4.1/dtd -PLIST_SUB+= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \ - DTDDIR=${DTDDIR:S/${PREFIX}\///} - -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -SGMLCAT= ${PREFIX}/share/sgml/catalog.ports -ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog - -SUB_FILES= catalog - -do-install: - @${MKDIR} ${STAGEDIR}${DTDDIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DTDDIR} - ${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${DTDDIR} +HAS_OASIS_MASTER_SITE= yes +.include "../../textproc/docbook/bsd.docbook.mk" .include Modified: head/textproc/docbook-241/pkg-plist ============================================================================== --- head/textproc/docbook-241/pkg-plist Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-241/pkg-plist Tue Feb 18 11:43:14 2014 (r344866) @@ -1,8 +1,7 @@ -@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog -%%DTDDIR%%/241chg.txt -%%DTDDIR%%/announce.txt %%DTDDIR%%/calstbl.mod %%DTDDIR%%/catalog +@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F +@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F %%DTDDIR%%/dbgenent.mod %%DTDDIR%%/dbhier.mod %%DTDDIR%%/dbpool.mod @@ -28,7 +27,4 @@ %%DTDDIR%%/iso-num.gml %%DTDDIR%%/iso-pub.gml %%DTDDIR%%/iso-tech.gml -@dirrmtry %%DTDDIR%% -@dirrm share/sgml/docbook/2.4.1 -@dirrmtry share/sgml/docbook -@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog +@dirrm %%DTDDIR%% Modified: head/textproc/docbook-300/Makefile ============================================================================== --- head/textproc/docbook-300/Makefile Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-300/Makefile Tue Feb 18 11:43:14 2014 (r344866) @@ -1,38 +1,15 @@ # Created by: nik # $FreeBSD$ -PORTNAME= docbook PORTVERSION= 3.0 -PORTREVISION= 4 -CATEGORIES= textproc -MASTER_SITES= http://www.oasis-open.org/docbook/sgml/${PORTVERSION}/ +PORTREVISION= 5 PKGNAMESUFFIX= 300 DISTNAME= docbk30 -EXTRACT_SUFX= .zip MAINTAINER= gabor@FreeBSD.org COMMENT= V3.0 of the DocBook DTD, designed for technical documentation -RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr - -NO_MTREE= yes -NO_BUILD= yes -EXTRACT_AFTER_ARGS= -s ,^,${DISTNAME}/, - -DTDDIR= ${PREFIX}/share/sgml/docbook/3.0/dtd -PLIST_SUB+= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \ - DTDDIR=${DTDDIR:S/${PREFIX}\///} - -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -SGMLCAT= ${PREFIX}/share/sgml/catalog.ports -ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog - -SUB_FILES= catalog - -do-install: - @${MKDIR} ${STAGEDIR}${DTDDIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DTDDIR} - ${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${DTDDIR} +HAS_OASIS_MASTER_SITE= yes +.include "../../textproc/docbook/bsd.docbook.mk" .include Modified: head/textproc/docbook-300/pkg-plist ============================================================================== --- head/textproc/docbook-300/pkg-plist Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-300/pkg-plist Tue Feb 18 11:43:14 2014 (r344866) @@ -1,9 +1,7 @@ -@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog -%%DTDDIR%%/30chg.txt -%%DTDDIR%%/40issues.txt -%%DTDDIR%%/announce.txt %%DTDDIR%%/cals-tbl.dtd %%DTDDIR%%/catalog +@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F +@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F %%DTDDIR%%/dbgenent.mod %%DTDDIR%%/dbhier.mod %%DTDDIR%%/dbpool.mod @@ -11,6 +9,3 @@ %%DTDDIR%%/docbook.dcl %%DTDDIR%%/docbook.dtd @dirrm %%DTDDIR%% -@dirrm share/sgml/docbook/3.0 -@dirrmtry share/sgml/docbook -@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog Modified: head/textproc/docbook-310/Makefile ============================================================================== --- head/textproc/docbook-310/Makefile Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-310/Makefile Tue Feb 18 11:43:14 2014 (r344866) @@ -1,38 +1,16 @@ # Created by: nik # $FreeBSD$ -PORTNAME= docbook PORTVERSION= 3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc -MASTER_SITES= http://www.docbook.org/sgml/3.1/ PKGNAMESUFFIX= 310 DISTNAME= docbk31 -EXTRACT_SUFX= .zip MAINTAINER= gabor@FreeBSD.org COMMENT= V3.1 of the DocBook DTD, designed for technical documentation -RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr - -NO_MTREE= yes -NO_BUILD= yes -EXTRACT_AFTER_ARGS= -s ,^,${DISTNAME}/, - -DTDDIR= ${PREFIX}/share/sgml/docbook/3.1/dtd -PLIST_SUB+= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \ - DTDDIR=${DTDDIR:S/${PREFIX}\///} - -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -SGMLCAT= ${PREFIX}/share/sgml/catalog.ports -ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog - -SUB_FILES= catalog - -do-install: - @${MKDIR} ${STAGEDIR}${DTDDIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DTDDIR} - ${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${DTDDIR} +PORTDOCS= ChangeLog *.txt +.include "../../textproc/docbook/bsd.docbook.mk" .include Modified: head/textproc/docbook-310/pkg-plist ============================================================================== --- head/textproc/docbook-310/pkg-plist Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-310/pkg-plist Tue Feb 18 11:43:14 2014 (r344866) @@ -1,10 +1,7 @@ -@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog -%%DTDDIR%%/31chg.txt -%%DTDDIR%%/40issues.txt -%%DTDDIR%%/50issues.txt -%%DTDDIR%%/ChangeLog %%DTDDIR%%/cals-tbl.dtd %%DTDDIR%%/catalog +@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F +@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F %%DTDDIR%%/dbcent.mod %%DTDDIR%%/dbgenent.mod %%DTDDIR%%/dbhier.mod @@ -13,8 +10,4 @@ %%DTDDIR%%/docbook.cat %%DTDDIR%%/docbook.dcl %%DTDDIR%%/docbook.dtd -%%DTDDIR%%/readme.txt @dirrm %%DTDDIR%% -@dirrm share/sgml/docbook/3.1 -@dirrmtry share/sgml/docbook -@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog Modified: head/textproc/docbook-400/Makefile ============================================================================== --- head/textproc/docbook-400/Makefile Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-400/Makefile Tue Feb 18 11:43:14 2014 (r344866) @@ -1,38 +1,15 @@ # Created by: asmodai # $FreeBSD$ -PORTNAME= docbook PORTVERSION= 4.0 -PORTREVISION= 3 -CATEGORIES= textproc -MASTER_SITES= http://www.oasis-open.org/docbook/sgml/4.0/ +PORTREVISION= 4 PKGNAMESUFFIX= 400 DISTNAME= docbk40 -EXTRACT_SUFX= .zip MAINTAINER= gabor@FreeBSD.org COMMENT= V4.0 of the DocBook DTD, designed for technical documentation -RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr - -NO_MTREE= yes -NO_BUILD= yes -EXTRACT_AFTER_ARGS= -s ,^,${DISTNAME}/, - -DTDDIR= ${PREFIX}/share/sgml/docbook/4.0/dtd -PLIST_SUB+= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \ - DTDDIR=${DTDDIR:S/${PREFIX}\///} - -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -SGMLCAT= ${PREFIX}/share/sgml/catalog.ports -ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog - -SUB_FILES= catalog - -do-install: - @${MKDIR} ${STAGEDIR}${DTDDIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DTDDIR} - ${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${DTDDIR} +HAS_OASIS_MASTER_SITE= yes +.include "../../textproc/docbook/bsd.docbook.mk" .include Modified: head/textproc/docbook-400/pkg-plist ============================================================================== --- head/textproc/docbook-400/pkg-plist Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-400/pkg-plist Tue Feb 18 11:43:14 2014 (r344866) @@ -1,8 +1,7 @@ -@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog -%%DTDDIR%%/40chg.txt -%%DTDDIR%%/50issues.txt %%DTDDIR%%/cals-tbl.dtd %%DTDDIR%%/catalog +@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F +@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F %%DTDDIR%%/dbcent.mod %%DTDDIR%%/dbgenent.mod %%DTDDIR%%/dbhier.mod @@ -11,8 +10,4 @@ %%DTDDIR%%/docbook.cat %%DTDDIR%%/docbook.dcl %%DTDDIR%%/docbook.dtd -%%DTDDIR%%/readme.txt @dirrm %%DTDDIR%% -@dirrm share/sgml/docbook/4.0 -@dirrmtry share/sgml/docbook -@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog Modified: head/textproc/docbook-410/Makefile ============================================================================== --- head/textproc/docbook-410/Makefile Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-410/Makefile Tue Feb 18 11:43:14 2014 (r344866) @@ -1,38 +1,15 @@ # Created by: murray # $FreeBSD$ -PORTNAME= docbook PORTVERSION= 4.1 -PORTREVISION= 4 -CATEGORIES= textproc -MASTER_SITES= http://www.docbook.org/sgml/4.1/ +PORTREVISION= 5 PKGNAMESUFFIX= 410 DISTNAME= docbk41 -EXTRACT_SUFX= .zip MAINTAINER= gabor@FreeBSD.org COMMENT= V4.1 of the DocBook DTD, designed for technical documentation -RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr - -NO_MTREE= yes -NO_BUILD= yes -EXTRACT_AFTER_ARGS= -s ,^,${DISTNAME}/, - -DTDDIR= ${PREFIX}/share/sgml/${PORTNAME}/${PORTVERSION}/dtd -PLIST_SUB+= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \ - DTDDIR=${DTDDIR:S/${PREFIX}\///} - -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -SGMLCAT= ${PREFIX}/share/sgml/catalog.ports -ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog - -SUB_FILES= catalog - -do-install: - @${MKDIR} ${STAGEDIR}${DTDDIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DTDDIR} - ${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${DTDDIR} +PORTDOCS= ChangeLog *.txt +.include "../../textproc/docbook/bsd.docbook.mk" .include Modified: head/textproc/docbook-410/pkg-plist ============================================================================== --- head/textproc/docbook-410/pkg-plist Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-410/pkg-plist Tue Feb 18 11:43:14 2014 (r344866) @@ -1,10 +1,7 @@ -@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog -%%DTDDIR%%/40chg.txt -%%DTDDIR%%/41chg.txt -%%DTDDIR%%/50issues.txt -%%DTDDIR%%/ChangeLog %%DTDDIR%%/cals-tbl.dtd %%DTDDIR%%/catalog +@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F +@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F %%DTDDIR%%/dbcent.mod %%DTDDIR%%/dbgenent.mod %%DTDDIR%%/dbhier.mod @@ -13,8 +10,4 @@ %%DTDDIR%%/docbook.cat %%DTDDIR%%/docbook.dcl %%DTDDIR%%/docbook.dtd -%%DTDDIR%%/readme.txt @dirrm %%DTDDIR%% -@dirrm share/sgml/docbook/4.1 -@dirrmtry share/sgml/docbook -@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog Modified: head/textproc/docbook-420/Makefile ============================================================================== --- head/textproc/docbook-420/Makefile Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-420/Makefile Tue Feb 18 11:43:14 2014 (r344866) @@ -1,42 +1,14 @@ # Created by: kutulu # $FreeBSD$ -PORTNAME= docbook PORTVERSION= 4.2 -CATEGORIES= textproc -MASTER_SITES= http://www.docbook.org/sgml/4.2/ -PKGNAMESUFFIX= -420 +PORTREVISION= 1 +PKGNAMESUFFIX= 420 MAINTAINER= ports@FreeBSD.org COMMENT= V4.2 of the DocBook DTD, designed for technical documentation -EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip -RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr - -USE_ZIP= yes -NO_MTREE= yes -NO_BUILD= yes -PLIST_SUB= DTD_NAME=${PORTNAME} -PLIST_SUB+= DTD_VERSION=${PORTVERSION} -PLIST_SUB+= XMLCATMGR=${XMLCATMGR} -PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} -SUB_FILES+= catalog -SUB_LIST+= ISOCAT=${ISOCAT} - -INSTDIR= ${STAGEDIR}${PREFIX}/share/sgml/docbook -ISOCAT= ${LOCALBASE}/share/sgml/iso8879/catalog -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -CATALOG_PORTS_SGML= ${LOCALBASE}/share/sgml/catalog.ports - -do-extract: - ${MKDIR} ${WRKSRC} - ${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} \ - -d ${WRKSRC} - -do-install: - @${MKDIR} ${INSTDIR}/${PORTVERSION} - ${INSTALL_DATA} ${WRKSRC}/* ${WRKDIR}/catalog \ - ${INSTDIR}/${PORTVERSION}/ +PORTDOCS= ChangeLog +.include "../../textproc/docbook/bsd.docbook.mk" .include Modified: head/textproc/docbook-420/files/catalog.in ============================================================================== --- head/textproc/docbook-420/files/catalog.in Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-420/files/catalog.in Tue Feb 18 11:43:14 2014 (r344866) @@ -84,4 +84,4 @@ PUBLIC "ISO 8879:1986//ENTITIES Non-Russ -- End of catalog data for DocBook V4.2 ................................. -- -- ...................................................................... -- -CATALOG "%%ISOCAT%%" +CATALOG "%%PREFIX%%/share/sgml/iso8879/catalog" Modified: head/textproc/docbook-420/pkg-plist ============================================================================== --- head/textproc/docbook-420/pkg-plist Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-420/pkg-plist Tue Feb 18 11:43:14 2014 (r344866) @@ -1,19 +1,17 @@ -share/sgml/docbook/4.2/ChangeLog -share/sgml/docbook/4.2/calstblx.dtd -@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/%%DTD_VERSION%%/catalog -share/sgml/docbook/4.2/catalog -share/sgml/docbook/4.2/catalog.xml -@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/%%DTD_VERSION%%/catalog -share/sgml/docbook/4.2/dbcentx.mod -share/sgml/docbook/4.2/dbgenent.mod -share/sgml/docbook/4.2/dbhierx.mod -share/sgml/docbook/4.2/dbnotnx.mod -share/sgml/docbook/4.2/dbpoolx.mod -share/sgml/docbook/4.2/docbook.cat -share/sgml/docbook/4.2/docbook.dcl -share/sgml/docbook/4.2/docbook.dtd -share/sgml/docbook/4.2/docbookx.dtd -share/sgml/docbook/4.2/soextblx.dtd -share/sgml/docbook/4.2/README -@dirrm share/sgml/docbook/4.2 -@dirrmtry share/sgml/docbook +%%DTDDIR%%/calstblx.dtd +%%DTDDIR%%/catalog +@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F +@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F +%%DTDDIR%%/catalog.xml +%%DTDDIR%%/dbcentx.mod +%%DTDDIR%%/dbgenent.mod +%%DTDDIR%%/dbhierx.mod +%%DTDDIR%%/dbnotnx.mod +%%DTDDIR%%/dbpoolx.mod +%%DTDDIR%%/docbook.cat +%%DTDDIR%%/docbook.dcl +%%DTDDIR%%/docbook.dtd +%%DTDDIR%%/docbookx.dtd +%%DTDDIR%%/soextblx.dtd +%%DTDDIR%%/README +@dirrm %%DTDDIR%% Modified: head/textproc/docbook-430/Makefile ============================================================================== --- head/textproc/docbook-430/Makefile Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-430/Makefile Tue Feb 18 11:43:14 2014 (r344866) @@ -1,46 +1,17 @@ # Created by: hrs # $FreeBSD$ -PORTNAME= docbook PORTVERSION= 4.3 -CATEGORIES= textproc -MASTER_SITES= http://www.oasis-open.org/docbook/sgml/${PORTVERSION}/ -PKGNAMESUFFIX= -430 -EXTRACT_SUFX= .zip +PORTREVISION= 1 +PKGNAMESUFFIX= 430 MAINTAINER= hrs@FreeBSD.org COMMENT= DocBook/SGML DTD V4.3, designed for technical documentation -RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr - -NO_BUILD= yes -EXTRACT_AFTER_ARGS= -s ,^,${DISTNAME}/, - -DTDDIR= ${PREFIX}/share/sgml/${PORTNAME}/${PORTVERSION} -SGMLCAT= ${PREFIX}/share/sgml/catalog.ports -ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr - -PLIST_SUB+= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \ - DTDDIR=${DTDDIR:S/${PREFIX}\///} - PORTDOCS= ChangeLog README -DTD_FILES= calstblx.dtd catalog.xml dbcentx.mod dbgenent.mod \ - dbhierx.mod dbnotnx.mod dbpoolx.mod docbook.cat docbook.dcl \ - docbook.dtd docbookx.dtd htmltblx.mod soextblx.dtd catalog -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION} - -post-extract: - ${CP} ${WRKSRC}/docbook.cat ${WRKSRC}/catalog - -post-patch: - ${ECHO_CMD} 'CATALOG "${LOCALBASE}/${ISOCAT}"' >> ${WRKSRC}/catalog -do-install: - @${MKDIR} ${STAGEDIR}${DTDDIR} - ${INSTALL_DATA} ${DTD_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DTDDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} +HAS_CATALOG_FILE= yes +HAS_OASIS_MASTER_SITE= yes +.include "../../textproc/docbook/bsd.docbook.mk" .include Modified: head/textproc/docbook-430/pkg-plist ============================================================================== --- head/textproc/docbook-430/pkg-plist Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-430/pkg-plist Tue Feb 18 11:43:14 2014 (r344866) @@ -1,6 +1,7 @@ -@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog %%DTDDIR%%/calstblx.dtd %%DTDDIR%%/catalog +@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F +@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F %%DTDDIR%%/catalog.xml %%DTDDIR%%/dbcentx.mod %%DTDDIR%%/dbgenent.mod @@ -13,7 +14,4 @@ %%DTDDIR%%/docbookx.dtd %%DTDDIR%%/htmltblx.mod %%DTDDIR%%/soextblx.dtd -@dirrmtry %%DTDDIR%% -@dirrmtry share/sgml/docbook -@dirrmtry share/doc/docbook -@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog +@dirrm %%DTDDIR%% Modified: head/textproc/docbook-440/Makefile ============================================================================== --- head/textproc/docbook-440/Makefile Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-440/Makefile Tue Feb 18 11:43:14 2014 (r344866) @@ -1,47 +1,17 @@ # Created by: Gabor Kovesdan # $FreeBSD$ -PORTNAME= docbook PORTVERSION= 4.4 -PORTREVISION= 2 -CATEGORIES= textproc -MASTER_SITES= http://www.oasis-open.org/docbook/sgml/${PORTVERSION}/ +PORTREVISION= 3 PKGNAMESUFFIX= 440 -EXTRACT_SUFX= .zip MAINTAINER= gabor@FreeBSD.org COMMENT= DocBook/SGML DTD V4.4, designed for technical documentation -RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr - -NO_BUILD= yes -EXTRACT_AFTER_ARGS= -s ,^,${DISTNAME}/, - -DTDDIR= ${PREFIX}/share/sgml/${PORTNAME}/${PORTVERSION} -SGMLCAT= ${PREFIX}/share/sgml/catalog.ports -ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr - -PLIST_SUB+= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \ - DTDDIR=${DTDDIR:S/${PREFIX}\///} +HAS_OASIS_MASTER_SITE= yes +HAS_CATALOG_FILE= yes PORTDOCS= ChangeLog README -DTD_FILES= calstblx.dtd catalog.xml dbcentx.mod dbgenent.mod \ - dbhierx.mod dbnotnx.mod dbpoolx.mod docbook.cat docbook.dcl \ - docbook.dtd docbookx.dtd htmltblx.mod soextblx.dtd catalog -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION} - -post-extract: - ${CP} ${WRKSRC}/docbook.cat ${WRKSRC}/catalog - -post-patch: - ${ECHO_CMD} 'CATALOG "${LOCALBASE}/${ISOCAT}"' >> ${WRKSRC}/catalog - -do-install: - @${MKDIR} ${STAGEDIR}${DTDDIR} - ${INSTALL_DATA} ${DTD_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DTDDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} +.include "../../textproc/docbook/bsd.docbook.mk" .include Modified: head/textproc/docbook-440/pkg-plist ============================================================================== --- head/textproc/docbook-440/pkg-plist Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-440/pkg-plist Tue Feb 18 11:43:14 2014 (r344866) @@ -1,6 +1,7 @@ -@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog %%DTDDIR%%/calstblx.dtd %%DTDDIR%%/catalog +@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F +@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F %%DTDDIR%%/catalog.xml %%DTDDIR%%/dbcentx.mod %%DTDDIR%%/dbgenent.mod @@ -13,6 +14,4 @@ %%DTDDIR%%/docbookx.dtd %%DTDDIR%%/htmltblx.mod %%DTDDIR%%/soextblx.dtd -@dirrmtry %%DTDDIR%% -@dirrmtry share/sgml/docbook -@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog +@dirrm %%DTDDIR%% Modified: head/textproc/docbook-450/Makefile ============================================================================== --- head/textproc/docbook-450/Makefile Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-450/Makefile Tue Feb 18 11:43:14 2014 (r344866) @@ -1,47 +1,17 @@ # Created by: Gabor Kovesdan # $FreeBSD$ -PORTNAME= docbook PORTVERSION= 4.5 -PORTREVISION= 2 -CATEGORIES= textproc -MASTER_SITES= http://www.oasis-open.org/docbook/sgml/${PORTVERSION}/ +PORTREVISION= 3 PKGNAMESUFFIX= 450 -EXTRACT_SUFX= .zip MAINTAINER= gabor@FreeBSD.org COMMENT= DocBook/SGML DTD V4.5, designed for technical documentation -RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr - -NO_BUILD= yes -EXTRACT_AFTER_ARGS= -s ,^,${DISTNAME}/, - -DTDDIR= ${PREFIX}/share/sgml/${PORTNAME}/${PORTVERSION} -SGMLCAT= ${PREFIX}/share/sgml/catalog.ports -ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr - -PLIST_SUB+= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \ - DTDDIR=${DTDDIR:S/${PREFIX}\///} +HAS_OASIS_MASTER_SITE= yes +HAS_CATALOG_FILE= yes PORTDOCS= README -DTD_FILES= calstblx.dtd catalog.xml dbcentx.mod dbgenent.mod \ - dbhierx.mod dbnotnx.mod dbpoolx.mod docbook.cat docbook.dcl \ - docbook.dtd docbookx.dtd htmltblx.mod soextblx.dtd catalog -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION} - -post-extract: - ${CP} ${WRKSRC}/docbook.cat ${WRKSRC}/catalog - -post-patch: - ${ECHO_CMD} 'CATALOG "${LOCALBASE}/${ISOCAT}"' >> ${WRKSRC}/catalog - -do-install: - @${MKDIR} ${STAGEDIR}${DTDDIR} - ${INSTALL_DATA} ${DTD_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DTDDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} +.include "../../textproc/docbook/bsd.docbook.mk" .include Modified: head/textproc/docbook-450/pkg-plist ============================================================================== --- head/textproc/docbook-450/pkg-plist Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-450/pkg-plist Tue Feb 18 11:43:14 2014 (r344866) @@ -1,6 +1,7 @@ -@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog %%DTDDIR%%/calstblx.dtd %%DTDDIR%%/catalog +@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F +@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F %%DTDDIR%%/catalog.xml %%DTDDIR%%/dbcentx.mod %%DTDDIR%%/dbgenent.mod @@ -14,5 +15,3 @@ %%DTDDIR%%/htmltblx.mod %%DTDDIR%%/soextblx.dtd @dirrm %%DTDDIR%% -@dirrmtry share/sgml/docbook -@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog Modified: head/textproc/docbook-500/Makefile ============================================================================== --- head/textproc/docbook-500/Makefile Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-500/Makefile Tue Feb 18 11:43:14 2014 (r344866) @@ -1,29 +1,18 @@ # Created by: Gabor Kovesdan # $FreeBSD$ -PORTNAME= docbook PORTVERSION= 5.0 -PORTREVISION= 2 -CATEGORIES= textproc -MASTER_SITES= http://www.docbook.org/xml/5.0/ +PORTREVISION= 3 PKGNAMESUFFIX= 500 -EXTRACT_SUFX= .zip MAINTAINER= gabor@FreeBSD.org COMMENT= DocBook 5.0, designed for technical documentation -RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr - -NO_BUILD= yes - -DTDDIR= share/xml/${PORTNAME}/${PORTVERSION} -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION} - -PLIST_SUB+= XMLCATMGR=${XMLCATMGR} XMLCAT=${XMLCAT} \ - DTDDIR=${DTDDIR} - -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -XMLCAT= ${PREFIX}/share/xml/catalog.ports +NO_ISOCAT= yes +HAS_MANUAL_CATALOG_FILE= yes +NO_DISTNAME_FIX= yes +XML_DTD= yes +MANUAL_DOCS= yes OPTIONS_DEFINE= DTD SCHEMA RELAX_NG SCHEMATRON NVDL TOOLS XMLCHARENT DOCS OPTIONS_DEFAULT= DTD SCHEMA RELAX_NG SCHEMATRON NVDL TOOLS XMLCHARENT @@ -36,20 +25,16 @@ TOOLS_DESC= Tools for working with DocB XMLCHARENT_DESC= Install ISO 8879 XML entites OPTIONS_SUB= yes -XMLCHARENT_RUN_DEPENDS+= ${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent +XMLCHARENT_RUN_DEPENDS= ${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent PORTDOCS= * -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR} - ${INSTALL_DATA} ${WRKSRC}/catalog.xml ${STAGEDIR}${PREFIX}/${DTDDIR} -.for m in dtd xsd rng sch tools - cd ${WRKSRC} && ${COPYTREE_SHARE} ${m} ${STAGEDIR}${PREFIX}/${DTDDIR} -.endfor +post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR}/nvdl - ${INSTALL_DATA} ${WRKSRC}/docbook.nvdl ${STAGEDIR}${PREFIX}/${DTDDIR}/nvdl + ${MV} ${STAGEDIR}${PREFIX}/${DTDDIR}/docbook.nvdl ${STAGEDIR}${PREFIX}/${DTDDIR}/nvdl @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ChangeLog README VERSION ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + cd ${STAGEDIR}${PREFIX}/${DTDDIR} && ${MV} ChangeLog README VERSION ${STAGEDIR}${DOCSDIR} + cd ${STAGEDIR}${PREFIX}/${DTDDIR} && ${MV} docs/* ${STAGEDIR}${DOCSDIR} && ${RMDIR} docs +.include "../../textproc/docbook/bsd.docbook.mk" .include Modified: head/textproc/docbook-500/pkg-plist ============================================================================== --- head/textproc/docbook-500/pkg-plist Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-500/pkg-plist Tue Feb 18 11:43:14 2014 (r344866) @@ -1,5 +1,6 @@ -@unexec %%XMLCATMGR%% -c %%XMLCAT%% remove %D/%%DTDDIR%%/catalog.xml %%DTDDIR%%/catalog.xml +@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove %D/%F +@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F %%DTD%%%%DTDDIR%%/dtd/docbook.dtd %%DTD%%@dirrm %%DTDDIR%%/dtd %%NVDL%%%%DTDDIR%%/nvdl/docbook.nvdl @@ -19,6 +20,3 @@ %%SCHEMA%%%%DTDDIR%%/xsd/xml.xsd %%SCHEMA%%@dirrm %%DTDDIR%%/xsd @dirrm %%DTDDIR%% -@dirrmtry share/xml/docbook -@dirrmtry share/xml -@exec %%XMLCATMGR%% -c %%XMLCAT%% add nextCatalog %D/%%DTDDIR%%/catalog.xml Modified: head/textproc/docbook-sk/Makefile ============================================================================== --- head/textproc/docbook-sk/Makefile Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-sk/Makefile Tue Feb 18 11:43:14 2014 (r344866) @@ -3,30 +3,19 @@ PORTNAME= docbook-sk PORTVERSION= 4.1.2 -PORTREVISION= 4 -CATEGORIES= textproc -MASTER_SITES= http://www.oasis-open.org/docbook/xml/${PORTVERSION}/ +PORTREVISION= 5 DISTNAME= docbkx${PORTVERSION:S/.//g} -EXTRACT_SUFX= .zip MAINTAINER= gnome@FreeBSD.org COMMENT= XML version of the DocBook DTD version controlled for ScrollKeeper -RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr +NO_ISOCAT= yes +XML_DTD= yes +HAS_MANUAL_CATALOG_FILE= yes -NO_BUILD= yes -EXTRACT_AFTER_ARGS= -s ,^,${DISTNAME}/, +DTD_SUBDIR?= ${PORTNAME:S/-sk//} -PLIST_SUB= XMLCATMGR=${XMLCATMGR} \ - DOCBOOKDIR=${DOCBOOKDIR:S/${PREFIX}\///} \ - CATALOG_PORTS_XML=${CATALOG_PORTS_XML} - -DOCBOOKDIR= ${PREFIX}/share/xml/${PORTNAME:S/-sk//}/${PORTVERSION} -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -CATALOG_PORTS_XML= ${PREFIX}/share/xml/catalog.ports - -do-install: - @${MKDIR} ${STAGEDIR}${DOCBOOKDIR}/ent - cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCBOOKDIR} +PORTDOCS= ChangeLog *.txt +.include "../../textproc/docbook/bsd.docbook.mk" .include Modified: head/textproc/docbook-sk/pkg-plist ============================================================================== --- head/textproc/docbook-sk/pkg-plist Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-sk/pkg-plist Tue Feb 18 11:43:14 2014 (r344866) @@ -1,56 +1,50 @@ -%%DOCBOOKDIR%%/40chg.txt -%%DOCBOOKDIR%%/41chg.txt -%%DOCBOOKDIR%%/ChangeLog -%%DOCBOOKDIR%%/calstblx.dtd -%%DOCBOOKDIR%%/dbcentx.mod -%%DOCBOOKDIR%%/dbgenent.mod -%%DOCBOOKDIR%%/dbhierx.mod -%%DOCBOOKDIR%%/dbnotnx.mod -%%DOCBOOKDIR%%/dbpoolx.mod -%%DOCBOOKDIR%%/docbook.cat -%%DOCBOOKDIR%%/docbookx.dtd -@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" file://%D/%%DOCBOOKDIR%%/dbpoolx.mod -@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//DTD DocBook XML V4.1.2//EN" file://%D/%%DOCBOOKDIR%%/docbookx.dtd -@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" file://%D/%%DOCBOOKDIR%%/dbcentx.mod -@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" file://%D/%%DOCBOOKDIR%%/dbnotnx.mod -@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" file://%D/%%DOCBOOKDIR%%/dbgenent.mod -@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" file://%D/%%DOCBOOKDIR%%/dbhierx.mod -@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//DTD XML Exchange Table Model 19990315//EN" file://%D/%%DOCBOOKDIR%%/soextblx.dtd -@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" file://%D/%%DOCBOOKDIR%%/calstblx.dtd -@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add rewriteSystem "http://www.oasis-open.org/docbook/xml/4.1.2" file://%D/%%DOCBOOKDIR%% -@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add rewriteURI "http://www.oasis-open.org/docbook/xml/4.1.2" file://%D/%%DOCBOOKDIR%% -@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" -@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//DTD DocBook XML V4.1.2//EN" -@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" -@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" -@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" -@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" -@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//DTD XML Exchange Table Model 19990315//EN" -@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" -@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove rewriteSystem "http://www.oasis-open.org/docbook/xml/4.1.2" -@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove rewriteURI "http://www.oasis-open.org/docbook/xml/4.1.2" -%%DOCBOOKDIR%%/ent/iso-amsa.ent -%%DOCBOOKDIR%%/ent/iso-amsb.ent -%%DOCBOOKDIR%%/ent/iso-amsc.ent -%%DOCBOOKDIR%%/ent/iso-amsn.ent -%%DOCBOOKDIR%%/ent/iso-amso.ent -%%DOCBOOKDIR%%/ent/iso-amsr.ent -%%DOCBOOKDIR%%/ent/iso-box.ent -%%DOCBOOKDIR%%/ent/iso-cyr1.ent -%%DOCBOOKDIR%%/ent/iso-cyr2.ent -%%DOCBOOKDIR%%/ent/iso-dia.ent -%%DOCBOOKDIR%%/ent/iso-grk1.ent -%%DOCBOOKDIR%%/ent/iso-grk2.ent -%%DOCBOOKDIR%%/ent/iso-grk3.ent -%%DOCBOOKDIR%%/ent/iso-grk4.ent -%%DOCBOOKDIR%%/ent/iso-lat1.ent -%%DOCBOOKDIR%%/ent/iso-lat2.ent -%%DOCBOOKDIR%%/ent/iso-num.ent -%%DOCBOOKDIR%%/ent/iso-pub.ent -%%DOCBOOKDIR%%/ent/iso-tech.ent -%%DOCBOOKDIR%%/readme.txt -%%DOCBOOKDIR%%/soextblx.dtd -@dirrm %%DOCBOOKDIR%%/ent -@dirrm %%DOCBOOKDIR%% -@unexec /bin/rmdir %D/share/xml/docbook 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/xml 2>/dev/null || /usr/bin/true +%%DTDDIR%%/calstblx.dtd +%%DTDDIR%%/dbcentx.mod +%%DTDDIR%%/dbgenent.mod +%%DTDDIR%%/dbhierx.mod +%%DTDDIR%%/dbnotnx.mod +%%DTDDIR%%/dbpoolx.mod +%%DTDDIR%%/docbook.cat +%%DTDDIR%%/docbookx.dtd +@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" file://%D/%%DTDDIR%%/dbpoolx.mod +@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//DTD DocBook XML V4.1.2//EN" file://%D/%%DTDDIR%%/docbookx.dtd +@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" file://%D/%%DTDDIR%%/dbcentx.mod +@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" file://%D/%%DTDDIR%%/dbnotnx.mod +@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" file://%D/%%DTDDIR%%/dbgenent.mod +@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" file://%D/%%DTDDIR%%/dbhierx.mod +@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//DTD XML Exchange Table Model 19990315//EN" file://%D/%%DTDDIR%%/soextblx.dtd +@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" file://%D/%%DTDDIR%%/calstblx.dtd +@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add rewriteSystem "http://www.oasis-open.org/docbook/xml/4.1.2" file://%D/%%DTDDIR%% +@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add rewriteURI "http://www.oasis-open.org/docbook/xml/4.1.2" file://%D/%%DTDDIR%% +@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" +@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//DTD DocBook XML V4.1.2//EN" +@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" +@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" +@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" +@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" +@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//DTD XML Exchange Table Model 19990315//EN" +@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" +@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove rewriteSystem "http://www.oasis-open.org/docbook/xml/4.1.2" +@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove rewriteURI "http://www.oasis-open.org/docbook/xml/4.1.2" +%%DTDDIR%%/ent/iso-amsa.ent +%%DTDDIR%%/ent/iso-amsb.ent +%%DTDDIR%%/ent/iso-amsc.ent +%%DTDDIR%%/ent/iso-amsn.ent +%%DTDDIR%%/ent/iso-amso.ent +%%DTDDIR%%/ent/iso-amsr.ent +%%DTDDIR%%/ent/iso-box.ent +%%DTDDIR%%/ent/iso-cyr1.ent +%%DTDDIR%%/ent/iso-cyr2.ent +%%DTDDIR%%/ent/iso-dia.ent +%%DTDDIR%%/ent/iso-grk1.ent +%%DTDDIR%%/ent/iso-grk2.ent +%%DTDDIR%%/ent/iso-grk3.ent +%%DTDDIR%%/ent/iso-grk4.ent +%%DTDDIR%%/ent/iso-lat1.ent +%%DTDDIR%%/ent/iso-lat2.ent +%%DTDDIR%%/ent/iso-num.ent +%%DTDDIR%%/ent/iso-pub.ent +%%DTDDIR%%/ent/iso-tech.ent +%%DTDDIR%%/soextblx.dtd +@dirrm %%DTDDIR%%/ent +@dirrm %%DTDDIR%% Modified: head/textproc/docbook-xml-430/Makefile ============================================================================== --- head/textproc/docbook-xml-430/Makefile Tue Feb 18 11:42:15 2014 (r344865) +++ head/textproc/docbook-xml-430/Makefile Tue Feb 18 11:43:14 2014 (r344866) @@ -3,74 +3,19 @@ PORTNAME= docbook-xml PORTVERSION= 4.3 -CATEGORIES= textproc -MASTER_SITES= http://www.oasis-open.org/docbook/xml/${PORTVERSION}/ +PORTREVISION= 1 PKGNAMESUFFIX= -430 MAINTAINER= hrs@FreeBSD.org COMMENT= DocBook/XML DTD V4.3, designed for technical documentation -RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr +NO_ISOCAT= yes +XML_DTD= yes +HAS_MANUAL_CATALOG_FILE= yes -USE_ZIP= yes -NO_BUILD= yes -NO_WRKSUBDIR= yes -PLIST= ${WRKSRC}/pkg-plist - -XMLCATBASE= share/xml -DTD_NAME= ${PORTNAME:S,-xml,,} -DTD_VERSION= ${PORTVERSION} - -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -CATALOG_PORTS_XML= ${PREFIX}/${XMLCATBASE}/catalog.ports -REGIST_CAT_FLAGS_XML= -c ${CATALOG_PORTS_XML} \ - add nextCatalog ${DTD_NAME}/${DTD_VERSION}/catalog.xml -UNREGIST_CAT_FLAGS_XML= -c ${CATALOG_PORTS_XML} \ - remove nextCatalog ${DTD_NAME}/${DTD_VERSION}/catalog.xml - -DOC_FILES= ChangeLog README -DTDDIR= ${XMLCATBASE}/${DTD_NAME}/${DTD_VERSION} -DTD_FILES= calstblx.dtd catalog.xml dbcentx.mod dbgenent.mod \ - dbhierx.mod dbnotnx.mod dbpoolx.mod docbook.cat docbookx.dtd \ - htmltblx.mod soextblx.dtd -ENTDIR= ${DTDDIR}/ent -ENT_FILES= iso-amsa.ent iso-amsb.ent iso-amsc.ent iso-amsn.ent \ - iso-amso.ent iso-amsr.ent iso-box.ent iso-cyr1.ent \ - iso-cyr2.ent iso-dia.ent iso-grk1.ent iso-grk2.ent \ - iso-grk3.ent iso-grk4.ent iso-lat1.ent iso-lat2.ent \ - iso-num.ent iso-pub.ent iso-tech.ent - -NO_STAGE= yes -pre-install: - (for F in ${ENT_FILES}; do \ - ${ECHO_CMD} "${ENTDIR}/$${F}"; \ - done;\ - ${ECHO_CMD} "@dirrm ${ENTDIR}"; ) > ${PLIST} - (for F in ${DTD_FILES}; do \ - ${ECHO_CMD} "${DTDDIR}/$${F}"; \ - done;\ - ${ECHO_CMD} "@dirrm ${DTDDIR}";\ - ${ECHO_CMD} "@dirrmtry ${XMLCATBASE}/${DTD_NAME}"; ) >> ${PLIST} -.if !defined(NOPORTDOCS) - (for F in ${DOC_FILES}; do \ - ${ECHO_CMD} "${DOCSDIR:S,^${PREFIX}/,,}/$${F}"; \ - done;\ - ${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}" ) >> ${PLIST} -.endif - ${ECHO_CMD} "@exec ${XMLCATMGR} ${REGIST_CAT_FLAGS_XML}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${XMLCATMGR} ${UNREGIST_CAT_FLAGS_XML}" >> ${PLIST} - -do-install: - ${MKDIR} ${PREFIX}/${DTDDIR} - ${INSTALL_DATA} ${DTD_FILES:S,^,${WRKSRC}/,} ${PREFIX}/${DTDDIR} - ${MKDIR} ${PREFIX}/${ENTDIR} - ${INSTALL_DATA} ${ENT_FILES:S,^,${WRKSRC}/ent/,} ${PREFIX}/${ENTDIR} -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES:S,^,${WRKSRC}/,} ${DOCSDIR} -.endif +DTD_SUBDIR?= ${PORTNAME:S/-xml//} -post-install: - -${XMLCATMGR} ${REGIST_CAT_FLAGS_XML} +PORTDOCS= ChangeLog README +.include "../../textproc/docbook/bsd.docbook.mk" .include Added: head/textproc/docbook-xml-430/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/docbook-xml-430/pkg-plist Tue Feb 18 11:43:14 2014 (r344866) @@ -0,0 +1,34 @@ +%%DTDDIR%%/calstblx.dtd +%%DTDDIR%%/catalog.xml +@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove %D/%F +@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F +%%DTDDIR%%/dbcentx.mod +%%DTDDIR%%/dbgenent.mod +%%DTDDIR%%/dbhierx.mod +%%DTDDIR%%/dbnotnx.mod +%%DTDDIR%%/dbpoolx.mod +%%DTDDIR%%/docbook.cat +%%DTDDIR%%/docbookx.dtd +%%DTDDIR%%/ent/iso-amsa.ent +%%DTDDIR%%/ent/iso-amsb.ent +%%DTDDIR%%/ent/iso-amsc.ent +%%DTDDIR%%/ent/iso-amsn.ent +%%DTDDIR%%/ent/iso-amso.ent +%%DTDDIR%%/ent/iso-amsr.ent +%%DTDDIR%%/ent/iso-box.ent +%%DTDDIR%%/ent/iso-cyr1.ent +%%DTDDIR%%/ent/iso-cyr2.ent +%%DTDDIR%%/ent/iso-dia.ent +%%DTDDIR%%/ent/iso-grk1.ent +%%DTDDIR%%/ent/iso-grk2.ent +%%DTDDIR%%/ent/iso-grk3.ent +%%DTDDIR%%/ent/iso-grk4.ent +%%DTDDIR%%/ent/iso-lat1.ent +%%DTDDIR%%/ent/iso-lat2.ent +%%DTDDIR%%/ent/iso-num.ent +%%DTDDIR%%/ent/iso-pub.ent +%%DTDDIR%%/ent/iso-tech.ent +%%DTDDIR%%/htmltblx.mod +%%DTDDIR%%/soextblx.dtd +@dirrmtry %%DTDDIR%%/ent +@dirrmtry %%DTDDIR%% *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***