Date: Wed, 19 Jun 2013 18:19:56 GMT From: John Marino <draco@marino.st> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/179729: [PATCH]: textproc/website: Fix xmlcatmgr errors caused by duplicate installation + pkg-plist Message-ID: <201306191819.r5JIJuAt063234@oldred.freebsd.org> Resent-Message-ID: <201306191830.r5JIU1Gn076960@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <jb.quenot@caraldi.com>
-#
-# Based on the docbook-xsl port
-#
+# Created by: Jean-Baptiste Quenot <jb.quenot@caraldi.com>
# $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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306191819.r5JIJuAt063234>