From owner-svn-ports-head@FreeBSD.ORG Mon Feb 17 16:09:32 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 E7795993; Mon, 17 Feb 2014 16:09:31 +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 D0C8A125A; Mon, 17 Feb 2014 16:09:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1HG9Vp2027078; Mon, 17 Feb 2014 16:09:31 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1HG9VfT027075; Mon, 17 Feb 2014 16:09:31 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201402171609.s1HG9VfT027075@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 17 Feb 2014 16:09:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344787 - in head/textproc/docbook-300: . 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 16:09:32 -0000 Author: mat Date: Mon Feb 17 16:09:30 2014 New Revision: 344787 URL: http://svnweb.freebsd.org/changeset/ports/344787 QAT: https://qat.redports.org/buildarchive/r344787/ Log: Support staging. Sponsored by: Absolight Added: head/textproc/docbook-300/files/catalog.in - copied, changed from r344745, head/textproc/docbook-300/files/catalog Deleted: head/textproc/docbook-300/files/catalog Modified: head/textproc/docbook-300/Makefile head/textproc/docbook-300/pkg-plist Modified: head/textproc/docbook-300/Makefile ============================================================================== --- head/textproc/docbook-300/Makefile Mon Feb 17 16:09:04 2014 (r344786) +++ head/textproc/docbook-300/Makefile Mon Feb 17 16:09:30 2014 (r344787) @@ -6,7 +6,9 @@ PORTVERSION= 3.0 PORTREVISION= 4 CATEGORIES= textproc MASTER_SITES= http://www.oasis-open.org/docbook/sgml/${PORTVERSION}/ +PKGNAMESUFFIX= 300 DISTNAME= docbk30 +EXTRACT_SUFX= .zip MAINTAINER= gabor@FreeBSD.org COMMENT= V3.0 of the DocBook DTD, designed for technical documentation @@ -14,38 +16,23 @@ COMMENT= V3.0 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/3.0/dtd -PLIST_SUB+= SGMLCAT_ADD="${SGMLCAT_ADD}" \ - SGMLCAT_RM="${SGMLCAT_RM}" +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 -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 +SUB_FILES= catalog -PKGNAMESUFFIX= ${PKGORIGIN:T:S/docbook-//} - -NO_STAGE= yes do-install: - @${MKDIR} ${PREFIX}/${DTDDIR} - files=$$(${FIND} ${WRKSRC} -type f \! -name '.*'); \ - for i in $${files}; do \ - ${INSTALL_DATA} $${i} ${PREFIX}/${DTDDIR}; \ - done - ${INSTALL_DATA} ${FILESDIR}/catalog ${PREFIX}/${DTDDIR} - @${ECHO} "CATALOG \"${ISOCAT}\"" >> ${PREFIX}/${DTDDIR}/catalog - -post-install: - -${SGMLCAT_ADD} + @${MKDIR} ${STAGEDIR}${DTDDIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DTDDIR} + ${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${DTDDIR} .include Copied and modified: head/textproc/docbook-300/files/catalog.in (from r344745, head/textproc/docbook-300/files/catalog) ============================================================================== --- head/textproc/docbook-300/files/catalog Mon Feb 17 13:32:26 2014 (r344745, copy source) +++ head/textproc/docbook-300/files/catalog.in Mon Feb 17 16:09:30 2014 (r344787) @@ -6,3 +6,4 @@ PUBLIC "-//USA-DOD//DTD Table Model 9510 PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod" PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod" PUBLIC "-//Davenport//ENTITIES DocBook Additional General Entities V3.0//EN" "dbgenent.mod" +CATALOG "%%PREFIX%%/share/sgml/iso8879/catalog" Modified: head/textproc/docbook-300/pkg-plist ============================================================================== --- head/textproc/docbook-300/pkg-plist Mon Feb 17 16:09:04 2014 (r344786) +++ head/textproc/docbook-300/pkg-plist Mon Feb 17 16:09:30 2014 (r344787) @@ -1,4 +1,4 @@ -@unexec %%SGMLCAT_RM%% +@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog share/sgml/docbook/3.0/dtd/30chg.txt share/sgml/docbook/3.0/dtd/40issues.txt share/sgml/docbook/3.0/dtd/announce.txt @@ -13,4 +13,4 @@ share/sgml/docbook/3.0/dtd/docbook.dtd @dirrm share/sgml/docbook/3.0/dtd @dirrm share/sgml/docbook/3.0 @dirrmtry share/sgml/docbook -@exec %%SGMLCAT_ADD%% +@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog