From owner-svn-ports-head@FreeBSD.ORG Sat Aug 2 04:04:34 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 3F9CA5FE; Sat, 2 Aug 2014 04:04:34 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2CDFA22CF; Sat, 2 Aug 2014 04:04:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7244YuH006423; Sat, 2 Aug 2014 04:04:34 GMT (envelope-from jhale@svn.freebsd.org) Received: (from jhale@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7244XKQ006420; Sat, 2 Aug 2014 04:04:33 GMT (envelope-from jhale@svn.freebsd.org) Message-Id: <201408020404.s7244XKQ006420@svn.freebsd.org> From: "Jason E. Hale" Date: Sat, 2 Aug 2014 04:04:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363778 - in head/textproc/xhtml-modularization: . 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.18 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, 02 Aug 2014 04:04:34 -0000 Author: jhale Date: Sat Aug 2 04:04:33 2014 New Revision: 363778 URL: http://svnweb.freebsd.org/changeset/ports/363778 QAT: https://qat.redports.org/buildarchive/r363778/ Log: - Support staging - Use SUB_FILES instead of sed replacement - Remove some cruft Added: head/textproc/xhtml-modularization/files/catalog.xml.in - copied, changed from r363777, head/textproc/xhtml-modularization/files/catalog.xml Deleted: head/textproc/xhtml-modularization/files/catalog.xml Modified: head/textproc/xhtml-modularization/Makefile Modified: head/textproc/xhtml-modularization/Makefile ============================================================================== --- head/textproc/xhtml-modularization/Makefile Sat Aug 2 02:39:19 2014 (r363777) +++ head/textproc/xhtml-modularization/Makefile Sat Aug 2 04:04:33 2014 (r363778) @@ -7,17 +7,19 @@ PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.w3.org/TR/2001/REC-${PORTNAME}-${RECDATE}/ DISTNAME= ${PORTNAME} -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= W3C's Modularization of XHTML DTDs and docs RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr +USES= tar:tgz + RECDATE= 20010410 -NO_MTREE= YES -NO_BUILD= YES +SUB_FILES= catalog.xml +NO_MTREE= yes +NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${RECDATE} PLIST= ${WRKDIR}/PLIST @@ -39,10 +41,6 @@ SGMLCAT_ADD= ${XMLCATMGR} -sc ${SGMLCAT} SGMLCAT_RM= ${XMLCATMGR} -sc ${SGMLCAT} remove \ ${PREFIX}/${dir_DTD}/xhtml.cat -CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports -CATALOG_PORTS_XML= ${PREFIX}/share/xml/catalog.ports - -NO_STAGE= yes .include "${.CURDIR}/contents.inc" # I'd much rather do this stuff in line with the actual installation @@ -74,32 +72,24 @@ pre-install: ${ECHO} "@dirrm ${dir_EXAMPLES}" >> ${PLIST} do-install: - @[ -d ${PREFIX}/${dir_DTD} ] || \ - ${MKDIR} ${PREFIX}/${dir_DTD} - @[ -d ${PREFIX}/${dir_DOC}/images ] || \ - ${MKDIR} ${PREFIX}/${dir_DOC}/images - @[ -d ${PREFIX}/${dir_EXAMPLES} ] || \ - ${MKDIR} ${PREFIX}/${dir_EXAMPLES} - @[ -d ${PREFIX}/${dir_TEMPLATES} ] || \ - ${MKDIR} ${PREFIX}/${dir_TEMPLATES} + @${MKDIR} ${STAGEDIR}${PREFIX}/${dir_DTD} .for f in ${contents_DTD} - ${INSTALL_DATA} ${WRKSRC}/DTD/${f} ${PREFIX}/${dir_DTD}/${f} + ${INSTALL_DATA} ${WRKSRC}/DTD/${f} ${STAGEDIR}${PREFIX}/${dir_DTD}/${f} .endfor + @${MKDIR} ${STAGEDIR}${PREFIX}/${dir_DOC}/images .for f in ${contents_DOC} - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${dir_DOC}/${f} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/${dir_DOC}/${f} .endfor + @${MKDIR} ${STAGEDIR}${PREFIX}/${dir_EXAMPLES} .for f in ${contents_EXAMPLES} ${INSTALL_DATA} ${WRKSRC}/DTD/examples/${f} \ - ${PREFIX}/${dir_EXAMPLES}/${f} + ${STAGEDIR}${PREFIX}/${dir_EXAMPLES}/${f} .endfor + @${MKDIR} ${STAGEDIR}${PREFIX}/${dir_TEMPLATES} .for f in ${contents_TEMPLATES} ${INSTALL_DATA} ${WRKSRC}/DTD/templates/${f} \ - ${PREFIX}/${dir_TEMPLATES}/${f} + ${STAGEDIR}${PREFIX}/${dir_TEMPLATES}/${f} .endfor - ${SED} -e "s;@@PREFIX@@;${PREFIX};g" ${FILESDIR}/catalog.xml > \ - ${WRKDIR}/catalog.xml - ${INSTALL_DATA} ${WRKDIR}/catalog.xml ${PREFIX}/${dir_DTD}/catalog.xml - ${XMLCAT_ADD} - ${SGMLCAT_ADD} + ${INSTALL_DATA} ${WRKDIR}/catalog.xml ${STAGEDIR}${PREFIX}/${dir_DTD}/catalog.xml .include Copied and modified: head/textproc/xhtml-modularization/files/catalog.xml.in (from r363777, head/textproc/xhtml-modularization/files/catalog.xml) ============================================================================== --- head/textproc/xhtml-modularization/files/catalog.xml Sat Aug 2 02:39:19 2014 (r363777, copy source) +++ head/textproc/xhtml-modularization/files/catalog.xml.in Sat Aug 2 04:04:33 2014 (r363778) @@ -5,7 +5,7 @@ + xml:base="file://%%PREFIX%%/share/xml/dtd/xhtml-modularization/">