From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 19 18:30:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 89F61A2A for ; Wed, 19 Jun 2013 18:30:01 +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 706831764 for ; Wed, 19 Jun 2013 18:30:01 +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 r5JIU1Ku076961 for ; Wed, 19 Jun 2013 18:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r5JIU1Gn076960; Wed, 19 Jun 2013 18:30:01 GMT (envelope-from gnats) Resent-Date: Wed, 19 Jun 2013 18:30:01 GMT Resent-Message-Id: <201306191830.r5JIU1Gn076960@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 67DE57F3 for ; Wed, 19 Jun 2013 18:19:56 +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 59CAB16EA for ; Wed, 19 Jun 2013 18:19:56 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r5JIJuhW063237 for ; Wed, 19 Jun 2013 18:19:56 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r5JIJuAt063234; Wed, 19 Jun 2013 18:19:56 GMT (envelope-from nobody) Message-Id: <201306191819.r5JIJuAt063234@oldred.freebsd.org> Date: Wed, 19 Jun 2013 18:19:56 GMT From: John Marino To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/179729: [PATCH]: textproc/website: Fix xmlcatmgr errors caused by duplicate installation + pkg-plist 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 18:30:01 -0000 >Number: 179729 >Category: ports >Synopsis: [PATCH]: textproc/website: Fix xmlcatmgr errors caused by duplicate installation + pkg-plist >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 18:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: John Marino >Release: >Organization: >Environment: >Description: This PR is related to ports/179696 and ports/179725 Again, xmlcatmgr is run twice and stored in pkg-plist, the fix is similar. There were two tweaks to the pkg-plist: 1) The catalog is a regular file, remove special unexec handling 2) The ${LOCALBASE}/share/xsl is not guaranteed to be empty after package removal as the port shares the directory with the docbook ports. Convert this to dirrmtry instead of absolute removal. >How-To-Repeat: >Fix: Patch attached with submission follows: --- Makefile.orig 2013-06-05 21:14:09.000000000 +0000 +++ Makefile @@ -1,14 +1,9 @@ -# New ports collection makefile for: website -# Date Created: 2003-11-10 10:13:49 -# Whom: Jean-Baptiste Quenot -# -# Based on the docbook-xsl port -# +# Created by: Jean-Baptiste Quenot # $FreeBSD: ports/textproc/website/Makefile,v 1.4 2012/11/17 06:02:24 svnexp Exp $ -# PORTNAME= website PORTVERSION= 2.5.0 +PORTREVISION= 1 CATEGORIES= textproc www MASTER_SITES= SF/docbook/OldFiles @@ -28,6 +23,9 @@ PKGDEINSTALL= ${WRKSRC}/pkg-deinstall NO_BUILD= yes XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr CATALOG_PORTS= ${XMLDIR}/catalog.ports +CATALOG_XSL= ${WRKSRC}/catalog + +DXVERSIONS= current 2.2 2.3 2.4.0 2.4.1 2.5.0 post-extract: ${FIND} ${WRKSRC} -name '.#*' -delete @@ -38,8 +36,29 @@ do-install: (cd ${WRKSRC}/example && ${TAR} -cf - . |\ ${TAR} -xf - -C${EXAMPLESDIR}) .endif + ${XMLCATMGR} -c "${CATALOG_XSL}" create +.for dxversion in ${DXVERSIONS} + ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteSystem \ + http://docbook.sourceforge.net/release/website/${dxversion}/xsl \ + "file://${PREFIX}/${INSTDIR}/xsl" + ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteURI \ + http://docbook.sourceforge.net/release/website/${dxversion}/xsl \ + "file://${PREFIX}/${INSTDIR}/xsl" + ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteSystem \ + http://docbook.sourceforge.net/release/website/${dxversion}/schema/dtd \ + "file://${PREFIX}/${INSTDIR}/schema/dtd" + ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteURI \ + http://docbook.sourceforge.net/release/website/${dxversion}/schema/dtd \ + "file://${PREFIX}/${INSTDIR}/schema/dtd" + ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteSystem \ + http://docbook.sourceforge.net/release/website/${dxversion} \ + "file://${PREFIX}/${INSTDIR}/schema/dtd" + ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteURI \ + http://docbook.sourceforge.net/release/website/${dxversion} \ + "file://${PREFIX}/${INSTDIR}/schema/dtd" +.endfor ${MKDIR} ${PINSTDIR} - (cd ${WRKSRC} && ${TAR} -cf - VERSION ${COPYDIRS} |\ + (cd ${WRKSRC} && ${TAR} -cf - VERSION catalog ${COPYDIRS} |\ ${TAR} -xf - -C${PINSTDIR}) post-install: --- pkg-plist.orig 2013-06-05 21:14:09.000000000 +0000 +++ pkg-plist @@ -177,7 +177,6 @@ share/xsl/website/xsl/website-common.xsl share/xsl/website/xsl/website-targets.xsl share/xsl/website/xsl/website.xsl share/xsl/website/xsl/xbel.xsl -@unexec rm -f %D/share/xsl/website/catalog 2>&1 >/dev/null || true @dirrm share/xsl/website/xsl @dirrm share/xsl/website/tests @dirrm share/xsl/website/schema/relaxng @@ -193,7 +192,7 @@ share/xsl/website/xsl/xbel.xsl @dirrm share/xsl/website/extensions/saxon64 @dirrm share/xsl/website/extensions @dirrm share/xsl/website -@dirrm share/xsl +@dirrmtry share/xsl %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/subdir %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/graphics/navicons/triangle/other %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/graphics/navicons/triangle/current --- files/pkg-install.in.orig 2013-06-05 21:14:09.000000000 +0000 +++ files/pkg-install.in @@ -18,34 +18,6 @@ if [ "$2" != "POST-INSTALL" ]; then exit 0 fi -VERSIONS='current 2.2 2.3 2.4.0 2.4.1 2.5.0' - -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/website/$version/xsl \ - "file://${XSL_DIR}/xsl" - ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteURI \ - http://docbook.sourceforge.net/release/website/$version/xsl \ - "file://${XSL_DIR}/xsl" - ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteSystem \ - http://docbook.sourceforge.net/release/website/$version/schema/dtd \ - "file://${XSL_DIR}/schema/dtd" - ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteURI \ - http://docbook.sourceforge.net/release/website/$version/schema/dtd \ - "file://${XSL_DIR}/schema/dtd" - ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteSystem \ - http://docbook.sourceforge.net/release/website/$version \ - "file://${XSL_DIR}/schema/dtd" - ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteURI \ - http://docbook.sourceforge.net/release/website/$version \ - "file://${XSL_DIR}/schema/dtd" -done - ${XMLCATMGR} -c "${CATALOG_PORTS_XML}" add delegateSystem \ http://docbook.sourceforge.net/release/website/ \ "file://${CATALOG_XSL}" >Release-Note: >Audit-Trail: >Unformatted: