From owner-svn-ports-head@FreeBSD.ORG Mon Feb 17 18:18:55 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B785AB4; Mon, 17 Feb 2014 18:18:55 +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 86432113F; Mon, 17 Feb 2014 18:18:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1HIItCD083238; Mon, 17 Feb 2014 18:18:55 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1HIIsJB083235; Mon, 17 Feb 2014 18:18:54 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201402171818.s1HIIsJB083235@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 17 Feb 2014 18:18:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344809 - in head/textproc/docbook-410: . files 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: Mon, 17 Feb 2014 18:18:55 -0000 Author: mat Date: Mon Feb 17 18:18:54 2014 New Revision: 344809 URL: http://svnweb.freebsd.org/changeset/ports/344809 QAT: https://qat.redports.org/buildarchive/r344809/ Log: Reduce difference with other docbook ports. Sponsored by: Absolight Added: head/textproc/docbook-410/files/catalog.in - copied, changed from r344787, head/textproc/docbook-410/files/catalog Deleted: head/textproc/docbook-410/files/catalog Modified: head/textproc/docbook-410/Makefile head/textproc/docbook-410/pkg-plist Modified: head/textproc/docbook-410/Makefile ============================================================================== --- head/textproc/docbook-410/Makefile Mon Feb 17 18:18:12 2014 (r344808) +++ head/textproc/docbook-410/Makefile Mon Feb 17 18:18:54 2014 (r344809) @@ -6,7 +6,9 @@ PORTVERSION= 4.1 PORTREVISION= 4 CATEGORIES= textproc MASTER_SITES= http://www.docbook.org/sgml/4.1/ +PKGNAMESUFFIX= 410 DISTNAME= docbk41 +EXTRACT_SUFX= .zip MAINTAINER= gabor@FreeBSD.org COMMENT= V4.1 of the DocBook DTD, designed for technical documentation @@ -14,35 +16,23 @@ COMMENT= V4.1 of the DocBook DTD, design RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr -USE_ZIP= yes NO_MTREE= yes NO_BUILD= yes -NO_WRKSUBDIR= yes +EXTRACT_AFTER_ARGS= -s ,^,${DISTNAME}/, -DTDDIR= share/sgml/docbook/4.1/dtd -PLIST_SUB+= SGMLCAT_ADD="${SGMLCAT_ADD}" \ - SGMLCAT_RM="${SGMLCAT_RM}" +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 -XMLCAT= ${PREFIX}/share/xml/catalog.ports ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog -SGMLCAT_ADD= ${XMLCATMGR} -sc ${SGMLCAT} add CATALOG \ - ${PREFIX}/${DTDDIR}/catalog -SGMLCAT_RM= ${XMLCATMGR} -sc ${SGMLCAT} remove \ - ${PREFIX}/${DTDDIR}/catalog - -PKGNAMESUFFIX= ${PKGORIGIN:T:S/docbook-//} +SUB_FILES= catalog do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR} - files=$$(${FIND} ${WRKSRC} -type f \! -name '.*'); \ - for i in $${files}; do \ - ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/${DTDDIR}; \ - done - ${INSTALL_DATA} ${FILESDIR}/catalog ${STAGEDIR}${PREFIX}/${DTDDIR} - @${ECHO} "CATALOG \"${ISOCAT}\"" >> ${STAGEDIR}${PREFIX}/${DTDDIR}/catalog - + @${MKDIR} ${STAGEDIR}${DTDDIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DTDDIR} + ${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${DTDDIR} .include Copied and modified: head/textproc/docbook-410/files/catalog.in (from r344787, head/textproc/docbook-410/files/catalog) ============================================================================== --- head/textproc/docbook-410/files/catalog Mon Feb 17 16:09:30 2014 (r344787, copy source) +++ head/textproc/docbook-410/files/catalog.in Mon Feb 17 18:18:54 2014 (r344809) @@ -38,3 +38,4 @@ PUBLIC "-//OASIS//ENTITIES DocBook Chara -- End of catalog data for DocBook V4.1 ................................. -- -- ...................................................................... -- +CATALOG "%%PREFIX%%/share/sgml/iso8879/catalog" Modified: head/textproc/docbook-410/pkg-plist ============================================================================== --- head/textproc/docbook-410/pkg-plist Mon Feb 17 18:18:12 2014 (r344808) +++ head/textproc/docbook-410/pkg-plist Mon Feb 17 18:18:54 2014 (r344809) @@ -1,20 +1,20 @@ -@unexec %%SGMLCAT_RM%% -share/sgml/docbook/4.1/dtd/40chg.txt -share/sgml/docbook/4.1/dtd/41chg.txt -share/sgml/docbook/4.1/dtd/50issues.txt -share/sgml/docbook/4.1/dtd/ChangeLog -share/sgml/docbook/4.1/dtd/cals-tbl.dtd -share/sgml/docbook/4.1/dtd/catalog -share/sgml/docbook/4.1/dtd/dbcent.mod -share/sgml/docbook/4.1/dtd/dbgenent.mod -share/sgml/docbook/4.1/dtd/dbhier.mod -share/sgml/docbook/4.1/dtd/dbnotn.mod -share/sgml/docbook/4.1/dtd/dbpool.mod -share/sgml/docbook/4.1/dtd/docbook.cat -share/sgml/docbook/4.1/dtd/docbook.dcl -share/sgml/docbook/4.1/dtd/docbook.dtd -share/sgml/docbook/4.1/dtd/readme.txt -@dirrm share/sgml/docbook/4.1/dtd +@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 +%%DTDDIR%%/dbcent.mod +%%DTDDIR%%/dbgenent.mod +%%DTDDIR%%/dbhier.mod +%%DTDDIR%%/dbnotn.mod +%%DTDDIR%%/dbpool.mod +%%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 %%SGMLCAT_ADD%% +@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog