From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 19 17:40:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BC22969 for ; Wed, 19 Jun 2013 17:40:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id A1F8812BA for ; Wed, 19 Jun 2013 17:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JHe0sr066779 for ; Wed, 19 Jun 2013 17:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r5JHe0tS066765; Wed, 19 Jun 2013 17:40:00 GMT (envelope-from gnats) Resent-Date: Wed, 19 Jun 2013 17:40:00 GMT Resent-Message-Id: <201306191740.r5JHe0tS066765@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, John Marino Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2AB24F78 for ; Wed, 19 Jun 2013 17:36:26 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) by mx1.freebsd.org (Postfix) with ESMTP id 0CD7F1280 for ; Wed, 19 Jun 2013 17:36:26 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r5JHaPOC007950 for ; Wed, 19 Jun 2013 17:36:25 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r5JHaPHR007946; Wed, 19 Jun 2013 17:36:25 GMT (envelope-from nobody) Message-Id: <201306191736.r5JHaPHR007946@oldred.freebsd.org> Date: Wed, 19 Jun 2013 17:36:25 GMT From: John Marino To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/179725: textproc/docbook-xsl-ns: Fix xmlcatmgr errors caused by duplicate installation (unmarked conflict with docbook-xsl?) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2013 17:40:00 -0000 >Number: 179725 >Category: ports >Synopsis: textproc/docbook-xsl-ns: Fix xmlcatmgr errors caused by duplicate installation (unmarked conflict with docbook-xsl?) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Jun 19 17:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: John Marino >Release: >Organization: >Environment: >Description: 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. >How-To-Repeat: >Fix: Patch attached with submission follows: --- Makefile.orig 2013-06-18 17:49:34.000000000 +0000 +++ Makefile @@ -29,6 +29,16 @@ 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 @@ -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}/{} \; && \ --- files/pkg-install.in.orig 2013-06-18 17:49:34.000000000 +0000 +++ files/pkg-install.in @@ -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}" >Release-Note: >Audit-Trail: >Unformatted: