From owner-svn-ports-head@FreeBSD.ORG Sat Dec 21 16:57:54 2013 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 B26BC361; Sat, 21 Dec 2013 16:57:54 +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 91E9011DD; Sat, 21 Dec 2013 16:57:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLGvsRZ019788; Sat, 21 Dec 2013 16:57:54 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLGvsOJ019786; Sat, 21 Dec 2013 16:57:54 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201312211657.rBLGvsOJ019786@svn.freebsd.org> From: Chris Rees Date: Sat, 21 Dec 2013 16:57:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337154 - in head/textproc/docbook-420: . 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: Sat, 21 Dec 2013 16:57:54 -0000 Author: crees Date: Sat Dec 21 16:57:53 2013 New Revision: 337154 URL: http://svnweb.freebsd.org/changeset/ports/337154 Log: Stagify and correct extraction. PR: ports/181624 Submitted by: crees Approved by: maintainer timeout (kutulu@kutulu.org, 5 months) Added: head/textproc/docbook-420/files/catalog.in - copied, changed from r337153, head/textproc/docbook-420/files/catalog Deleted: head/textproc/docbook-420/files/catalog Modified: head/textproc/docbook-420/Makefile Modified: head/textproc/docbook-420/Makefile ============================================================================== --- head/textproc/docbook-420/Makefile Sat Dec 21 16:52:11 2013 (r337153) +++ head/textproc/docbook-420/Makefile Sat Dec 21 16:57:53 2013 (r337154) @@ -5,43 +5,39 @@ PORTNAME= docbook PORTVERSION= 4.2 CATEGORIES= textproc MASTER_SITES= http://www.docbook.org/sgml/4.2/ -EXTRACT_ONLY= # empty MAINTAINER= kutulu@kutulu.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 -BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip USE_ZIP= yes NO_MTREE= yes NO_BUILD= yes -NO_WRKSUBDIR= 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= ${PREFIX}/share/sgml/docbook -ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog +INSTDIR= ${STAGEDIR}${PREFIX}/share/sgml/docbook +ISOCAT= ${LOCALBASE}/share/sgml/iso8879/catalog XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports +CATALOG_PORTS_SGML= ${LOCALBASE}/share/sgml/catalog.ports LATEST_LINK= docbook-420 -NO_STAGE= yes -pre-su-install: - @[ -d ${INSTDIR}/${PORTVERSION} ] || ${MKDIR} ${INSTDIR}/${PORTVERSION} +do-extract: + ${MKDIR} ${WRKSRC} + ${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} \ + -d ${WRKSRC} do-install: - @unzip ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/${PORTVERSION} - @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/${PORTVERSION}/catalog - @${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/${PORTVERSION}/catalog - @${CHMOD} ${SHAREMODE} ${INSTDIR}/${PORTVERSION}/* - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR} - -post-install: - @-${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/${PORTVERSION}/catalog + @${MKDIR} ${INSTDIR}/${PORTVERSION} + ${INSTALL_DATA} ${WRKSRC}/* ${WRKDIR}/catalog \ + ${INSTDIR}/${PORTVERSION}/ .include Copied and modified: head/textproc/docbook-420/files/catalog.in (from r337153, head/textproc/docbook-420/files/catalog) ============================================================================== --- head/textproc/docbook-420/files/catalog Sat Dec 21 16:52:11 2013 (r337153, copy source) +++ head/textproc/docbook-420/files/catalog.in Sat Dec 21 16:57:53 2013 (r337154) @@ -83,3 +83,5 @@ PUBLIC "ISO 8879:1986//ENTITIES Non-Russ -- End of catalog data for DocBook V4.2 ................................. -- -- ...................................................................... -- + +CATALOG "%%ISOCAT%%"