Date: Wed, 28 May 2014 21:12:57 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355656 - in head/textproc: docbook sdocbook-xml Message-ID: <201405282112.s4SLCv5Z073172@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed May 28 21:12:56 2014 New Revision: 355656 URL: http://svnweb.freebsd.org/changeset/ports/355656 QAT: https://qat.redports.org/buildarchive/r355656/ Log: textproc/sdocbook-xml: Reintegrate docbook/bsd.docbook.mk A few months ago, sdocbook-xml was split up along with many other docbook ports to use a common makefile. Since then, the other docbook ports have been consolidated into two flavors (xml and sgml) and neither use the textproc/docbook/bsd.docbook.mk makefile. Moreover, it conditionally sets the EXTRACT_SUFX to .zip, but without setting USES+= zip which is now required for all zip distfiles. The cleanest fix is to move the needed bits from the common makefile back into sdocbook-xml and delete the common makefile. It passed 8x on redport and DragonFly (w/ AK archiver patch in place) Approved by: portmgr (mat) Deleted: head/textproc/docbook/bsd.docbook.mk Modified: head/textproc/sdocbook-xml/Makefile Modified: head/textproc/sdocbook-xml/Makefile ============================================================================== --- head/textproc/sdocbook-xml/Makefile Wed May 28 21:11:00 2014 (r355655) +++ head/textproc/sdocbook-xml/Makefile Wed May 28 21:12:56 2014 (r355656) @@ -5,18 +5,41 @@ PORTNAME= sdocbook-xml PORTVERSION= 1.1 PORTREVISION= 1 PORTEPOCH= 2 +CATEGORIES= textproc MASTER_SITES= http://www.oasis-open.org/docbook/xml/simple/${PORTVERSION}/ DISTNAME= docbook-simple-${PORTVERSION} MAINTAINER= gabor@FreeBSD.org COMMENT= "Simplified" DocBook XML DTD -NO_ISOCAT= yes -XML_DTD= yes -MANUAL_DOCS= yes +RUN_DEPENDS+= ${LOCALBASE}/${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr + +USES= zip +NO_MTREE= yes +NO_BUILD= yes + +XMLCATMGR= bin/xmlcatmgr +XMLCAT= share/xml/catalog.ports +SGMLCAT= share/sgml/catalog.ports CATALOG_FILES= catalog catalog.xml +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION} +DTD_NAME= sdocbook +DTD_VERSION= ${PORTVERSION} +DTD_SUBDIR= /dtd +DTDDIR= share/xml/${DTD_NAME}/${DTD_VERSION}${DTD_SUBDIR} +PLIST_SUB+= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} XMLCAT=${XMLCAT} \ + DTDDIR=${DTDDIR} +SUB_FILES= ${CATALOG_FILES} +SUB_LIST+= DTDDIR=${PREFIX}/${DTDDIR} +WRKSRC= ${WRKDIR} -DTD_NAME= ${PORTNAME:S/-xml//} +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${DTDDIR} +.for f in ${CATALOG_FILES} + ${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/${DTDDIR} +.endfor + @${ECHO_CMD} "@dirrm share/xml/${DTD_NAME}/${DTD_VERSION}" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec rmdir %D/share/xml/${DTD_NAME} 2>/dev/null || :" >> ${TMPPLIST} -.include "../../textproc/docbook/bsd.docbook.mk" .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405282112.s4SLCv5Z073172>