Date: Sun, 29 Feb 2004 14:49:41 +0900 (JST) From: Hiroki Sato <hrs@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: des@FreeBSD.org Subject: ports/63520: Update port: textproc/docbook-xsl 1.65.0 Message-ID: <200402290549.i1T5nfxU026660@alph.allbsd.org> Resent-Message-ID: <200402290600.i1T60H3o015162@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63520
>Category: ports
>Synopsis: Update port: textproc/docbook-xsl 1.65.0
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 28 22:00:17 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Hiroki Sato
>Release: FreeBSD 4.9-STABLE i386
>Organization:
Tokyo University of Science
>Environment:
System: FreeBSD alph.allbsd.org 4.9-STABLE FreeBSD 4.9-STABLE #1: Sun Feb 8 19:26:12 JST 2004 hrs@alph.allbsd.org:/usr/obj/usr/src/sys/ALPH i386
>Description:
Update to 1.65.0, and:
- Use "xmlcatmgr remove type value" instead of
"xmlcatmgr remove value" in pkg-deinstall.in.
- Move generating the ${PREFIX}/share/xsl/docbook/catalog file
part into the post-install target. When this port is installed
as a package, the generated catalog file is installed together.
However, xmlcatmgr in the pkg-install script still tries to add
the existing entries, so it puts a lot of warnings as a result.
>How-To-Repeat:
N/A
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/docbook-xsl/Makefile,v
retrieving revision 1.23
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.23 Makefile
--- Makefile 13 Feb 2004 10:33:12 -0000 1.23
+++ Makefile 29 Feb 2004 05:34:17 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= docbook-xsl
-PORTVERSION= 1.64.1
-PORTREVISION= 1
+PORTVERSION= 1.65.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= docbook
@@ -30,6 +29,15 @@
XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr
CATALOG_PORTS= ${XMLDIR}/catalog.ports
+XSL_DIR= ${PREFIX}/${INSTDIR}
+CATALOG_XSL= ${XSL_DIR}/catalog
+XSL_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
+
post-extract:
${FIND} ${WRKSRC} -name '.#*' -delete
@@ -52,6 +60,15 @@
${TAR} -xf - -C${PINSTDIR})
post-install:
+ if [ ! -f ${CATALOG_XSL} ]; then ${XMLCATMGR} -c "${CATALOG_XSL}" create; fi
+.for V in ${XSL_VERSIONS}
+ @${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteSystem \
+ http://docbook.sourceforge.net/release/xsl/${V} \
+ "file://${XSL_DIR}"
+ @${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteURI \
+ http://docbook.sourceforge.net/release/xsl/${V} \
+ "file://${XSL_DIR}"
+.endfor
@${SETENV} PKG_PREFIX=${PREFIX} \
${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/textproc/docbook-xsl/distinfo,v
retrieving revision 1.15
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.15 distinfo
--- distinfo 10 Feb 2004 16:21:38 -0000 1.15
+++ distinfo 29 Feb 2004 05:16:55 -0000
@@ -1,2 +1,2 @@
-MD5 (docbook-xsl-1.64.1.tar.gz) = ed766902e8381f6206d12f5c326fbd47
-SIZE (docbook-xsl-1.64.1.tar.gz) = 1382015
+MD5 (docbook-xsl-1.65.0.tar.gz) = 94dbb2771fb77428460fe93572a05766
+SIZE (docbook-xsl-1.65.0.tar.gz) = 1538674
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/docbook-xsl/pkg-plist,v
retrieving revision 1.20
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.20 pkg-plist
--- pkg-plist 10 Feb 2004 16:21:38 -0000 1.20
+++ pkg-plist 29 Feb 2004 05:13:16 -0000
@@ -81,6 +81,7 @@
%%PORTDOCS%%%%DOCSDIR%%/fo/example.properties.html
%%PORTDOCS%%%%DOCSDIR%%/fo/figure.properties.html
%%PORTDOCS%%%%DOCSDIR%%/fo/firstterm.only.link.html
+%%PORTDOCS%%%%DOCSDIR%%/fo/footer.column.widths.html
%%PORTDOCS%%%%DOCSDIR%%/fo/footer.content.properties.html
%%PORTDOCS%%%%DOCSDIR%%/fo/footer.rule.html
%%PORTDOCS%%%%DOCSDIR%%/fo/footers.on.blank.pages.html
@@ -119,6 +120,7 @@
%%PORTDOCS%%%%DOCSDIR%%/fo/glossterm.separation.html
%%PORTDOCS%%%%DOCSDIR%%/fo/glossterm.width.html
%%PORTDOCS%%%%DOCSDIR%%/fo/graphic.default.extension.html
+%%PORTDOCS%%%%DOCSDIR%%/fo/header.column.widths.html
%%PORTDOCS%%%%DOCSDIR%%/fo/header.content.properties.html
%%PORTDOCS%%%%DOCSDIR%%/fo/header.rule.html
%%PORTDOCS%%%%DOCSDIR%%/fo/headers.on.blank.pages.html
@@ -657,6 +659,7 @@
share/xsl/docbook/common/ChangeLog
share/xsl/docbook/common/af.xml
share/xsl/docbook/common/ar.xml
+share/xsl/docbook/common/autoidx-ng.xsl
share/xsl/docbook/common/bg.xml
share/xsl/docbook/common/bn.xml
share/xsl/docbook/common/ca.xml
@@ -693,6 +696,7 @@
share/xsl/docbook/common/pt.xml
share/xsl/docbook/common/pt_br.xml
share/xsl/docbook/common/ro.xml
+
share/xsl/docbook/common/ru.xml
share/xsl/docbook/common/sk.xml
share/xsl/docbook/common/sl.xml
@@ -808,6 +812,7 @@
share/xsl/docbook/fo/ChangeLog
share/xsl/docbook/fo/admon.xsl
share/xsl/docbook/fo/autoidx.xsl
+share/xsl/docbook/fo/autoidx-ng.xsl
share/xsl/docbook/fo/autotoc.xsl
share/xsl/docbook/fo/axf.xsl
share/xsl/docbook/fo/biblio.xsl
@@ -816,6 +821,7 @@
share/xsl/docbook/fo/component.xsl
share/xsl/docbook/fo/division.xsl
share/xsl/docbook/fo/docbook.xsl
+share/xsl/docbook/fo/docbookng.xsl
share/xsl/docbook/fo/ebnf.xsl
share/xsl/docbook/fo/fo-patch-for-fop.xsl
share/xsl/docbook/fo/fo-rtf.xsl
@@ -857,6 +863,7 @@
share/xsl/docbook/html/ChangeLog
share/xsl/docbook/html/admon.xsl
share/xsl/docbook/html/autoidx.xsl
+share/xsl/docbook/html/autoidx-ng.xsl
share/xsl/docbook/html/autotoc.xsl
share/xsl/docbook/html/biblio.xsl
share/xsl/docbook/html/block.xsl
@@ -871,6 +878,7 @@
share/xsl/docbook/html/component.xsl
share/xsl/docbook/html/division.xsl
share/xsl/docbook/html/docbook.xsl
+share/xsl/docbook/html/docbookng.xsl
share/xsl/docbook/html/ebnf.xsl
share/xsl/docbook/html/footnote.xsl
share/xsl/docbook/html/formal.xsl
@@ -1082,6 +1090,7 @@
share/xsl/docbook/params/example.properties.xml
share/xsl/docbook/params/figure.properties.xml
share/xsl/docbook/params/firstterm.only.link.xml
+share/xsl/docbook/params/footer.column.widths.xml
share/xsl/docbook/params/footer.content.properties.xml
share/xsl/docbook/params/footer.rule.xml
share/xsl/docbook/params/footers.on.blank.pages.xml
@@ -1113,6 +1122,7 @@
share/xsl/docbook/params/glossterm.width.xml
share/xsl/docbook/params/graphic.default.extension.xml
share/xsl/docbook/params/graphicsize.extension.xml
+share/xsl/docbook/params/header.column.widths.xml
share/xsl/docbook/params/header.content.properties.xml
share/xsl/docbook/params/header.rule.xml
share/xsl/docbook/params/headers.on.blank.pages.xml
@@ -1374,6 +1384,7 @@
share/xsl/docbook/xhtml/ChangeLog
share/xsl/docbook/xhtml/admon.xsl
share/xsl/docbook/xhtml/autoidx.xsl
+share/xsl/docbook/xhtml/autoidx-ng.xsl
share/xsl/docbook/xhtml/autotoc.xsl
share/xsl/docbook/xhtml/biblio.xsl
share/xsl/docbook/xhtml/block.xsl
@@ -1388,6 +1399,7 @@
share/xsl/docbook/xhtml/component.xsl
share/xsl/docbook/xhtml/division.xsl
share/xsl/docbook/xhtml/docbook.xsl
+share/xsl/docbook/xhtml/docbookng.xsl
share/xsl/docbook/xhtml/ebnf.xsl
share/xsl/docbook/xhtml/footnote.xsl
share/xsl/docbook/xhtml/formal.xsl
Index: files/pkg-deinstall.in
===================================================================
RCS file: /home/ncvs/ports/textproc/docbook-xsl/files/pkg-deinstall.in,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 pkg-deinstall.in
--- files/pkg-deinstall.in 8 Jul 2003 09:46:29 -0000 1.1
+++ files/pkg-deinstall.in 29 Feb 2004 05:02:38 -0000
@@ -9,4 +9,5 @@
exit 0
fi
-${XMLCATMGR} -c "${CATALOG_PORTS_XML}" remove http://docbook.sourceforge.net/release/xsl/
+${XMLCATMGR} -c "${CATALOG_PORTS_XML}" remove delegateSystem http://docbook.sourceforge.net/release/xsl/
+${XMLCATMGR} -c "${CATALOG_PORTS_XML}" remove delegateURI http://docbook.sourceforge.net/release/xsl/
Index: files/pkg-install.in
===================================================================
RCS file: /home/ncvs/ports/textproc/docbook-xsl/files/pkg-install.in,v
retrieving revision 1.4
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.4 pkg-install.in
--- files/pkg-install.in 10 Feb 2004 16:21:38 -0000 1.4
+++ files/pkg-install.in 29 Feb 2004 05:35:59 -0000
@@ -19,26 +19,9 @@
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'
-
-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_XML}" add delegateSystem \
http://docbook.sourceforge.net/release/xsl/ \
"file://${CATALOG_XSL}"
${XMLCATMGR} -c "${CATALOG_PORTS_XML}" add delegateURI \
http://docbook.sourceforge.net/release/xsl/ \
"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?200402290549.i1T5nfxU026660>