Date: Tue, 18 Feb 2014 13:09:58 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344882 - in head/textproc: docbook docbook-500 docbook-sk docbook-xml docbook-xml-430 docbook-xml-440 docbook-xml-450 Message-ID: <201402181309.s1ID9wDi031822@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Feb 18 13:09:58 2014 New Revision: 344882 URL: http://svnweb.freebsd.org/changeset/ports/344882 QAT: https://qat.redports.org/buildarchive/r344882/ Log: Fix docbook-500, the files were one level too deep. Pointy hat to: mat Sponsored by: Absolight Modified: head/textproc/docbook-500/Makefile head/textproc/docbook-sk/Makefile head/textproc/docbook-xml-430/Makefile head/textproc/docbook-xml-440/Makefile head/textproc/docbook-xml-450/Makefile head/textproc/docbook-xml/Makefile head/textproc/docbook/bsd.docbook.mk Modified: head/textproc/docbook-500/Makefile ============================================================================== --- head/textproc/docbook-500/Makefile Tue Feb 18 12:54:41 2014 (r344881) +++ head/textproc/docbook-500/Makefile Tue Feb 18 13:09:58 2014 (r344882) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTVERSION= 5.0 -PORTREVISION= 3 +PORTREVISION= 4 PKGNAMESUFFIX= 500 MAINTAINER= gabor@FreeBSD.org @@ -13,6 +13,7 @@ HAS_MANUAL_CATALOG_FILE= yes NO_DISTNAME_FIX= yes XML_DTD= yes MANUAL_DOCS= yes +NO_DTD_SUBDIR= yes OPTIONS_DEFINE= DTD SCHEMA RELAX_NG SCHEMATRON NVDL TOOLS XMLCHARENT DOCS OPTIONS_DEFAULT= DTD SCHEMA RELAX_NG SCHEMATRON NVDL TOOLS XMLCHARENT Modified: head/textproc/docbook-sk/Makefile ============================================================================== --- head/textproc/docbook-sk/Makefile Tue Feb 18 12:54:41 2014 (r344881) +++ head/textproc/docbook-sk/Makefile Tue Feb 18 13:09:58 2014 (r344882) @@ -13,7 +13,7 @@ NO_ISOCAT= yes XML_DTD= yes HAS_MANUAL_CATALOG_FILE= yes -DTD_SUBDIR?= ${PORTNAME:S/-sk//} +DTD_NAME?= ${PORTNAME:S/-sk//} PORTDOCS= ChangeLog *.txt Modified: head/textproc/docbook-xml-430/Makefile ============================================================================== --- head/textproc/docbook-xml-430/Makefile Tue Feb 18 12:54:41 2014 (r344881) +++ head/textproc/docbook-xml-430/Makefile Tue Feb 18 13:09:58 2014 (r344882) @@ -13,7 +13,7 @@ NO_ISOCAT= yes XML_DTD= yes HAS_MANUAL_CATALOG_FILE= yes -DTD_SUBDIR?= ${PORTNAME:S/-xml//} +DTD_NAME?= ${PORTNAME:S/-xml//} PORTDOCS= ChangeLog README Modified: head/textproc/docbook-xml-440/Makefile ============================================================================== --- head/textproc/docbook-xml-440/Makefile Tue Feb 18 12:54:41 2014 (r344881) +++ head/textproc/docbook-xml-440/Makefile Tue Feb 18 13:09:58 2014 (r344882) @@ -16,7 +16,7 @@ MANUAL_DOCS= yes OPTIONS_DEFINE= DOCS -DTD_SUBDIR= ${PORTNAME:S/-xml//} +DTD_NAME= ${PORTNAME:S/-xml//} PORTDOCS= * Modified: head/textproc/docbook-xml-450/Makefile ============================================================================== --- head/textproc/docbook-xml-450/Makefile Tue Feb 18 12:54:41 2014 (r344881) +++ head/textproc/docbook-xml-450/Makefile Tue Feb 18 13:09:58 2014 (r344882) @@ -15,7 +15,7 @@ MANUAL_DOCS= yes OPTIONS_DEFINE= DOCS -DTD_SUBDIR= ${PORTNAME:S/-xml//} +DTD_NAME= ${PORTNAME:S/-xml//} PORTDOCS= * Modified: head/textproc/docbook-xml/Makefile ============================================================================== --- head/textproc/docbook-xml/Makefile Tue Feb 18 12:54:41 2014 (r344881) +++ head/textproc/docbook-xml/Makefile Tue Feb 18 13:09:58 2014 (r344882) @@ -14,7 +14,7 @@ NO_ISOCAT= yes XML_DTD= yes HAS_MANUAL_CATALOG_FILE= yes -DTD_SUBDIR?= ${PORTNAME:S/-xml//} +DTD_NAME?= ${PORTNAME:S/-xml//} PORTDOCS= README ChangeLog Modified: head/textproc/docbook/bsd.docbook.mk ============================================================================== --- head/textproc/docbook/bsd.docbook.mk Tue Feb 18 12:54:41 2014 (r344881) +++ head/textproc/docbook/bsd.docbook.mk Tue Feb 18 13:09:58 2014 (r344882) @@ -35,9 +35,12 @@ SGMLCAT= share/sgml/catalog.ports ISOCAT= share/sgml/iso8879/catalog XMLCAT= share/xml/catalog.ports DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION} -DTD_SUBDIR?= ${PORTNAME} +DTD_NAME?= ${PORTNAME} DTD_VERSION?= ${PORTVERSION} -DTDDIR?= share/${XML_SGML}/${DTD_SUBDIR}/${DTD_VERSION}/dtd +.ifndef NO_DTD_SUBDIR +DTD_SUBDIR?= /dtd +.endif +DTDDIR?= share/${XML_SGML}/${DTD_NAME}/${DTD_VERSION}${DTD_SUBDIR} PLIST_SUB+= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} XMLCAT=${XMLCAT} \ DTDDIR=${DTDDIR} @@ -72,8 +75,10 @@ do-install: ${MV} ${STAGEDIR}${PREFIX}/${DTDDIR}/${f} ${STAGEDIR}${DOCSDIR} . endfor .endif - @${ECHO_CMD} "@dirrm share/${XML_SGML}/${DTD_SUBDIR}/${DTD_VERSION}" >> ${TMPPLIST} - @${ECHO_CMD} "@dirrmtry share/${XML_SGML}/${DTD_SUBDIR}" >> ${TMPPLIST} +.ifndef NO_DTD_SUBDIR + @${ECHO_CMD} "@dirrm share/${XML_SGML}/${DTD_NAME}/${DTD_VERSION}" >> ${TMPPLIST} +.endif + @${ECHO_CMD} "@dirrmtry share/${XML_SGML}/${DTD_NAME}" >> ${TMPPLIST} .if defined(PORTDOCS) @${ECHO_CMD} "@dirrmtry share/doc/${PORTNAME}" >> ${TMPPLIST} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402181309.s1ID9wDi031822>