From owner-svn-ports-head@FreeBSD.ORG Mon Feb 17 18:09:56 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 2D4C92F5; Mon, 17 Feb 2014 18:09:56 +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 1829A102A; Mon, 17 Feb 2014 18:09:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1HI9tvn079020; Mon, 17 Feb 2014 18:09:55 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1HI9tix079018; Mon, 17 Feb 2014 18:09:55 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201402171809.s1HI9tix079018@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 17 Feb 2014 18:09:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344807 - head/textproc/docbook-430 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:09:56 -0000 Author: mat Date: Mon Feb 17 18:09:55 2014 New Revision: 344807 URL: http://svnweb.freebsd.org/changeset/ports/344807 QAT: https://qat.redports.org/buildarchive/r344807/ Log: Reduce difference with other docbook ports. Sponsored by: Absolight Added: head/textproc/docbook-430/pkg-plist (contents, props changed) Modified: head/textproc/docbook-430/Makefile Modified: head/textproc/docbook-430/Makefile ============================================================================== --- head/textproc/docbook-430/Makefile Mon Feb 17 18:05:02 2014 (r344806) +++ head/textproc/docbook-430/Makefile Mon Feb 17 18:09:55 2014 (r344807) @@ -6,35 +6,30 @@ PORTVERSION= 4.3 CATEGORIES= textproc MASTER_SITES= http://www.oasis-open.org/docbook/sgml/${PORTVERSION}/ PKGNAMESUFFIX= -430 +EXTRACT_SUFX= .zip MAINTAINER= hrs@FreeBSD.org COMMENT= DocBook/SGML DTD V4.3, designed for technical documentation -RUN_DEPENDS= ${LOCALBASE}/${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ +RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr -USE_ZIP= yes NO_BUILD= yes -NO_WRKSUBDIR= yes -PLIST= ${WRKSRC}/pkg-plist - -SGMLCATBASE= share/sgml -DTD_NAME= ${PORTNAME} -DTD_VERSION= ${PORTVERSION} -ISOCAT= ${SGMLCATBASE}/iso8879/catalog +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 -CATALOG_PORTS_SGML= ${PREFIX}/${SGMLCATBASE}/catalog.ports -REGIST_CAT_FLAGS_SGML= -sc ${CATALOG_PORTS_SGML} \ - add CATALOG ${DTD_NAME}/${DTD_VERSION}/catalog -UNREGIST_CAT_FLAGS_SGML= -sc ${CATALOG_PORTS_SGML} \ - remove CATALOG ${DTD_NAME}/${DTD_VERSION}/catalog -DOC_FILES= ChangeLog README -DTDDIR= ${SGMLCATBASE}/${DTD_NAME}/${DTD_VERSION} +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 @@ -42,24 +37,10 @@ post-extract: post-patch: ${ECHO_CMD} 'CATALOG "${LOCALBASE}/${ISOCAT}"' >> ${WRKSRC}/catalog -pre-install: - (for F in ${DTD_FILES}; do \ - ${ECHO_CMD} "${DTDDIR}/$${F}"; \ - done;\ - ${ECHO_CMD} "@dirrm ${DTDDIR}";\ - ${ECHO_CMD} "@dirrmtry ${SGMLCATBASE}/${DTD_NAME}"; ) > ${PLIST} - (for F in ${DOC_FILES}; do \ - ${ECHO_CMD} "${DOCSDIR:S,^${PREFIX}/,,}/$${F}"; \ - done;\ - ${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}" ) >> ${PLIST} - ${ECHO_CMD} "@exec ${XMLCATMGR} ${REGIST_CAT_FLAGS_SGML}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${XMLCATMGR} ${UNREGIST_CAT_FLAGS_SGML}" >> ${PLIST} - do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR} - ${INSTALL_DATA} ${DTD_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/${DTDDIR} - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} - + @${MKDIR} ${STAGEDIR}${DTDDIR} + ${INSTALL_DATA} ${DTD_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DTDDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Added: head/textproc/docbook-430/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/docbook-430/pkg-plist Mon Feb 17 18:09:55 2014 (r344807) @@ -0,0 +1,19 @@ +@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog +%%DTDDIR%%/calstblx.dtd +%%DTDDIR%%/catalog +%%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%%/htmltblx.mod +%%DTDDIR%%/soextblx.dtd +@dirrmtry %%DTDDIR%% +@dirrmtry share/sgml/docbook +@dirrmtry share/doc/docbook +@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog