Date: Wed, 19 Feb 2014 22:30:56 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345160 - in head/textproc: docbook-sgml docbook-xml Message-ID: <201402192230.s1JMUuaF001033@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Wed Feb 19 22:30:56 2014 New Revision: 345160 URL: http://svnweb.freebsd.org/changeset/ports/345160 QAT: https://qat.redports.org/buildarchive/r345160/ Log: Fix catalog generation to unbreak textproc/docbook-utils build. Missing closing quotes, and docbook-xml-5.0 does not install a docbook.cat for SGML, so do not list it. Use a shell test to skip the installation because fmake would otherwise barf (bmake is fine). Modified: head/textproc/docbook-sgml/Makefile head/textproc/docbook-xml/Makefile Modified: head/textproc/docbook-sgml/Makefile ============================================================================== --- head/textproc/docbook-sgml/Makefile Wed Feb 19 22:13:32 2014 (r345159) +++ head/textproc/docbook-sgml/Makefile Wed Feb 19 22:30:56 2014 (r345160) @@ -45,7 +45,7 @@ do-install-${D:S/./_/g}: @${MKDIR} ${STAGEDIR}${PREFIX}/share/sgml/docbook/$D cd ${WRKDIR}/${DBFILES:M${D}\:*:C,.*:,,} && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/sgml/docbook/$D - ${ECHO_CMD} "CATALOG \"${PREFIX}/share/sgml/docbook/$D/docbook.cat" \ + ${ECHO_CMD} "CATALOG \"${PREFIX}/share/sgml/docbook/$D/docbook.cat\"" \ >> ${STAGEDIR}${DBCAT} do-install: do-install-${D:S/./_/g} .endfor Modified: head/textproc/docbook-xml/Makefile ============================================================================== --- head/textproc/docbook-xml/Makefile Wed Feb 19 22:13:32 2014 (r345159) +++ head/textproc/docbook-xml/Makefile Wed Feb 19 22:30:56 2014 (r345160) @@ -56,7 +56,8 @@ do-install-${D:S/./_/g}: ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${DBKDIR}/$D ${XMLCATMGR_CMD} -c ${STAGEDIR}${DBCAT_XML} \ add nextCatalog "${PREFIX}/${DBKDIR}/$D/catalog.xml" - ${ECHO_CMD} "CATALOG \"${PREFIX}/${DBKDIR}/$D/docbook.cat" \ + test "$D" = 5.0 || \ + ${ECHO_CMD} "CATALOG \"${PREFIX}/${DBKDIR}/$D/docbook.cat\"" \ >> ${STAGEDIR}${DBCAT_SGML} do-install: do-install-${D:S/./_/g} .endfor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402192230.s1JMUuaF001033>