From owner-svn-ports-all@FreeBSD.ORG Wed May 28 21:12:57 2014 Return-Path: Delivered-To: svn-ports-all@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 9B63C144; Wed, 28 May 2014 21:12:57 +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 6E2AE2646; Wed, 28 May 2014 21:12:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4SLCvlG073173; Wed, 28 May 2014 21:12:57 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4SLCv5Z073172; Wed, 28 May 2014 21:12:57 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201405282112.s4SLCv5Z073172@svn.freebsd.org> From: John Marino Date: Wed, 28 May 2014 21:12:57 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 May 2014 21:12:57 -0000 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