This PR is related to ports/179696 Again, xmlcatmgr is run twice, the fix is identical (patch attached). However, the PKG_INSTALL script modifies the same file as docbook-xsl: ${LOCALBASE}/share/xml/catalog.ports Therefore, despite the pkg-plist not overlapping, these ports conflict with each other. I don't know if the ports should be marked with a conflict, or if one port needs to change it's catalog path. That is for the maintainer to decide, and to be applied after the provided patch. Fix: Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->gabor Over to maintainer (via the GNATS Auto Assign Tool)
State Changed From-To: open->closed Committed, thanks!
Author: gabor Date: Tue Jul 9 21:06:11 2013 New Revision: 322577 URL: http://svnweb.freebsd.org/changeset/ports/322577 Log: - Fix package installation - Bump PORTREVISION PR: ports/179725 Submitted by: marino Modified: head/textproc/docbook-xsl-ns/Makefile head/textproc/docbook-xsl-ns/files/pkg-install.in Modified: head/textproc/docbook-xsl-ns/Makefile ============================================================================== --- head/textproc/docbook-xsl-ns/Makefile Tue Jul 9 21:05:14 2013 (r322576) +++ head/textproc/docbook-xsl-ns/Makefile Tue Jul 9 21:06:11 2013 (r322577) @@ -2,7 +2,7 @@ PORTNAME= docbook-xsl-ns PORTVERSION= 1.78.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= SF/docbook/${PORTNAME}/${PORTVERSION}:src \ SF/docbook/docbook-xsl-doc/${PORTVERSION}:doc @@ -29,13 +29,23 @@ SUB_LIST+= INSTDIR="${INSTDIR}" \ CATALOG_PORTS="${LOCALBASE}/share/xml/catalog.ports" XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_XSL= ${WRKSRC}/catalog + +DXVERSIONS= 1.36 1.37 1.38 1.39 1.40 1.41 1.42 1.43 1.44 1.45 1.46 1.47 \ + 1.48 1.49 1.50.0 1.51.0 1.51.1 1.52.0 1.52.1 1.52.2 1.53.0 \ + 1.54.0 1.54.1 1.55.0 1.56.0 1.56.1 1.57.0 1.58.0 1.58.1 \ + 1.59.0 1.59.1 1.59.2 1.60.0 1.60.1 1.61.0 1.61.1 1.61.2 \ + 1.61.3 1.62.0 1.62.1 1.62.2 1.62.3 1.62.4 1.63.0 1.64.0 \ + 1.64.1 1.65.0 1.65.1 1.66.0 1.66.1 1.67.0 1.67.2 1.68.0 \ + 1.68.1 1.69.0 1.69.1 1.70.0 1.70.1 1.71.0 1.71.1 1.78.1 \ + current OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} -DISTFILES+= docbook-xsl-doc-${PORTVERSION}${EXTRACT_SUFX}:doc +DISTFILES+= docbook-xsl-doc-${PORTVERSION}${EXTRACT_SUFX}:doc .endif post-extract: @@ -50,6 +60,15 @@ do-install: ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; && \ ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; .endif + ${XMLCATMGR} -c ${CATALOG_XSL} create +.for dxversion in ${DXVERSIONS} + ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteSystem \ + http://docbook.sourceforge.net/release/xsl/${dxversion} \ + "file://${PREFIX}/${INSTDIR}" + ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteURI \ + http://docbook.sourceforge.net/release/xsl/${dxversion} \ + "file://${PREFIX}/${INSTDIR}" +.endfor ${MKDIR} ${PREFIX}/${INSTDIR} cd ${WRKSRC} && \ ${FIND} . -type d -exec ${MKDIR} ${PREFIX}/${INSTDIR}/{} \; && \ Modified: head/textproc/docbook-xsl-ns/files/pkg-install.in ============================================================================== --- head/textproc/docbook-xsl-ns/files/pkg-install.in Tue Jul 9 21:05:14 2013 (r322576) +++ head/textproc/docbook-xsl-ns/files/pkg-install.in Tue Jul 9 21:06:11 2013 (r322577) @@ -18,22 +18,6 @@ if [ "$2" != "POST-INSTALL" ]; then exit 0 fi -VERSIONS='1.36 1.37 1.38 1.39 1.40 1.41 1.42 1.43 1.44 1.45 1.46 1.47 1.48 1.49 1.50.0 1.51.0 1.51.1 1.52.0 1.52.1 1.52.2 1.53.0 1.54.0 1.54.1 1.55.0 1.56.0 1.56.1 1.57.0 1.58.0 1.58.1 1.59.0 1.59.1 1.59.2 1.60.0 1.60.1 1.61.0 1.61.1 1.61.2 1.61.3 1.62.0 1.62.1 1.62.2 1.62.3 1.62.4 1.63.0 1.64.0 1.64.1 1.65.0 1.65.1 1.66.0 1.66.1 1.67.0 1.67.2 1.68.0 1.68.1 1.69.0 1.69.1 1.70.0 1.70.1 1.71.0 1.71.1 1.78.1 current' - -if [ ! -f ${CATALOG_XSL} ]; then - %%XMLCATMGR%% -c "${CATALOG_XSL}" create -fi - -for version in ${VERSIONS} -do - %%XMLCATMGR%% -c "${CATALOG_XSL}" add rewriteSystem \ - http://docbook.sourceforge.net/release/xsl/$version \ - "file://${XSL_DIR}" - %%XMLCATMGR%% -c "${CATALOG_XSL}" add rewriteURI \ - http://docbook.sourceforge.net/release/xsl/$version \ - "file://${XSL_DIR}" -done - %%XMLCATMGR%% -c %%CATALOG_PORTS%% add delegateSystem \ http://docbook.sourceforge.net/release/xsl/ \ "file://${CATALOG_XSL}" _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"