Date: Sat, 19 Jan 2002 03:05:43 +0100 (CET) From: Dag-Erling Smorgrav <des@ofug.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/34054: Numerous errors in textproc/docbook-xml Message-ID: <20020119020543.BAC4F55F4@des.thinksec.com>
next in thread | raw e-mail | index | archive | help
>Number: 34054
>Category: ports
>Synopsis: Numerous errors in textproc/docbook-xml
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 18 18:10:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Dag-Erling Smorgrav
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD des.thinksec.com 5.0-CURRENT FreeBSD 5.0-CURRENT #124: Sat Jan 12 19:11:47 CET 2002 des@des.thinksec.com:/usr/src/sys/i386/compile/DES i386
>Description:
The textproc/docbook-xml port has numerous issues:
- directory structure does not match other docbook ports
- installation directory does not include version number, so multiple
versions cannot co-exist
- the port installs its own catalog file instead of using the one
provided by the author of the DTD
- the port overwrites the existing top-level catalog file, so it cannot
co-exist with other XML DTDs (such as textproc/xhtml)
- various ports style bugs
- ...
>How-To-Repeat:
# porteasy -bu textproc/docbook-xml
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/docbook-xml/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 5 Feb 2001 16:34:33 -0000 1.14
+++ Makefile 19 Jan 2002 02:00:40 -0000
@@ -5,37 +5,44 @@
# $FreeBSD: ports/textproc/docbook-xml/Makefile,v 1.14 2001/02/05 16:34:33 olgeni Exp $
#
-PORTNAME= docbook-xml
+PORTNAME= docbook
+PKGNAMESUFFIX= -xml
PORTVERSION= 4.1.2
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://www.docbook.org/xml/4.1.2/
DISTNAME= docbkx412
+EXTRACT_ONLY= # empty
MAINTAINER= kuriyama@FreeBSD.org
-USE_ZIP= YES
+RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+
+USE_ZIP= yes
NO_MTREE= yes
NO_BUILD= yes
-WRKSRC= ${WRKDIR}
+NO_WRKSUBDIR= yes
+PLIST_SUB= DTD_NAME=${PORTNAME} \
+ DTD_VERSION=${PORTVERSION} \
+ MKCATALOG=${MKCATALOG} \
+ CATALOG=${CATALOG}
INSTDIR= ${PREFIX}/share/xml
-DTDDIR= ${INSTDIR}/docbook
-ENTDIR= ${INSTDIR}/docbook/ent
-DTDFILES= calstblx.dtd dbcentx.mod dbgenent.mod dbhierx.mod \
- dbnotnx.mod dbpoolx.mod docbookx.dtd soextblx.dtd
-MISCFILES= 40chg.txt 41chg.txt readme.txt
+DOCBOOKDIR= ${INSTDIR}/${PORTNAME}/${PORTVERSION}
+MKCATALOG= ${LOCALBASE}/sbin/mkcatalog
+CATALOG= ${INSTDIR}/catalog
-post-extract:
- ${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/catalog.tmpl > ${WRKSRC}/catalog
+#do-configure:
+# ${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/catalog.tmpl > ${WRKSRC}/catalog
pre-install:
- ${MKDIR} ${ENTDIR}
+ @[ -d ${DOCBOOKDIR} ] || ${MKDIR} ${DOCBOOKDIR}
do-install:
- @(cd ${WRKSRC}; ${INSTALL_DATA} ${DTDFILES} ${DTDDIR})
- @(cd ${WRKSRC}/ent; ${INSTALL_DATA} *.ent ${ENTDIR})
- @(cd ${WRKSRC}; ${INSTALL_DATA} ${MISCFILES} ${DTDDIR})
- ${INSTALL_DATA} ${WRKSRC}/catalog ${INSTDIR}
- ${INSTALL_DATA} ${FILESDIR}/catalog.docbook ${DTDDIR}/catalog
+ unzip -a -q -o ${DISTDIR}/${DISTFILES} -d${DOCBOOKDIR}
+# ${INSTALL_DATA}
+
+post-install:
+ ${MKCATALOG} -q -c ${CATALOG} install ${PORTNAME}/${PORTVERSION} docbook.cat
.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/docbook-xml/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist 26 Dec 2000 02:25:42 -0000 1.5
+++ pkg-plist 19 Jan 2002 01:52:06 -0000
@@ -1,35 +1,37 @@
-share/xml/catalog
-share/xml/docbook/40chg.txt
-share/xml/docbook/41chg.txt
-share/xml/docbook/calstblx.dtd
-share/xml/docbook/catalog
-share/xml/docbook/dbcentx.mod
-share/xml/docbook/dbgenent.mod
-share/xml/docbook/dbhierx.mod
-share/xml/docbook/dbnotnx.mod
-share/xml/docbook/dbpoolx.mod
-share/xml/docbook/docbookx.dtd
-share/xml/docbook/ent/iso-amsa.ent
-share/xml/docbook/ent/iso-amsb.ent
-share/xml/docbook/ent/iso-amsc.ent
-share/xml/docbook/ent/iso-amsn.ent
-share/xml/docbook/ent/iso-amso.ent
-share/xml/docbook/ent/iso-amsr.ent
-share/xml/docbook/ent/iso-box.ent
-share/xml/docbook/ent/iso-cyr1.ent
-share/xml/docbook/ent/iso-cyr2.ent
-share/xml/docbook/ent/iso-dia.ent
-share/xml/docbook/ent/iso-grk1.ent
-share/xml/docbook/ent/iso-grk2.ent
-share/xml/docbook/ent/iso-grk3.ent
-share/xml/docbook/ent/iso-grk4.ent
-share/xml/docbook/ent/iso-lat1.ent
-share/xml/docbook/ent/iso-lat2.ent
-share/xml/docbook/ent/iso-num.ent
-share/xml/docbook/ent/iso-pub.ent
-share/xml/docbook/ent/iso-tech.ent
-share/xml/docbook/readme.txt
-share/xml/docbook/soextblx.dtd
-@dirrm share/xml/docbook/ent
-@unexec rmdir %D/share/xml/docbook 2>/dev/null || true
-@unexec rmdir %D/share/xml 2>/dev/null || true
+share/xml/docbook/4.1.2/40chg.txt
+share/xml/docbook/4.1.2/41chg.txt
+share/xml/docbook/4.1.2/ChangeLog
+share/xml/docbook/4.1.2/calstblx.dtd
+share/xml/docbook/4.1.2/dbcentx.mod
+share/xml/docbook/4.1.2/dbgenent.mod
+share/xml/docbook/4.1.2/dbhierx.mod
+share/xml/docbook/4.1.2/dbnotnx.mod
+share/xml/docbook/4.1.2/dbpoolx.mod
+@unexec %%MKCATALOG%% -q -c%%CATALOG%% deinstall %%DTD_NAME%%/%%DTD_VERSION%% docbook.cat
+share/xml/docbook/4.1.2/docbook.cat
+@exec %%MKCATALOG%% -q -c%%CATALOG%% install %%DTD_NAME%%/%%DTD_VERSION%% docbook.cat
+share/xml/docbook/4.1.2/docbookx.dtd
+share/xml/docbook/4.1.2/ent/iso-amsa.ent
+share/xml/docbook/4.1.2/ent/iso-amsb.ent
+share/xml/docbook/4.1.2/ent/iso-amsc.ent
+share/xml/docbook/4.1.2/ent/iso-amsn.ent
+share/xml/docbook/4.1.2/ent/iso-amso.ent
+share/xml/docbook/4.1.2/ent/iso-amsr.ent
+share/xml/docbook/4.1.2/ent/iso-box.ent
+share/xml/docbook/4.1.2/ent/iso-cyr1.ent
+share/xml/docbook/4.1.2/ent/iso-cyr2.ent
+share/xml/docbook/4.1.2/ent/iso-dia.ent
+share/xml/docbook/4.1.2/ent/iso-grk1.ent
+share/xml/docbook/4.1.2/ent/iso-grk2.ent
+share/xml/docbook/4.1.2/ent/iso-grk3.ent
+share/xml/docbook/4.1.2/ent/iso-grk4.ent
+share/xml/docbook/4.1.2/ent/iso-lat1.ent
+share/xml/docbook/4.1.2/ent/iso-lat2.ent
+share/xml/docbook/4.1.2/ent/iso-num.ent
+share/xml/docbook/4.1.2/ent/iso-pub.ent
+share/xml/docbook/4.1.2/ent/iso-tech.ent
+share/xml/docbook/4.1.2/readme.txt
+share/xml/docbook/4.1.2/soextblx.dtd
+@dirrm share/xml/docbook/4.1.2/ent
+@dirrm share/xml/docbook/4.1.2
+@dirrm share/xml/docbook
Index: files/catalog.docbook
===================================================================
RCS file: files/catalog.docbook
diff -N files/catalog.docbook
--- files/catalog.docbook 26 Dec 2000 02:25:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
-PUBLIC "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" "calstblx.dtd"
-PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "soextblx.dtd"
-PUBLIC "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" "dbpoolx.mod"
-PUBLIC "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" "dbhierx.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" "dbgenent.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" "dbnotnx.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" "dbcentx.mod"
-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ent/iso-dia.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "ent/iso-tech.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "ent/iso-lat2.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "ent/iso-grk1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "ent/iso-grk2.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "ent/iso-grk3.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "ent/iso-grk4.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "ent/iso-amsa.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "ent/iso-amsb.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "ent/iso-amsc.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "ent/iso-amsn.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "ent/iso-amso.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "ent/iso-amsr.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "ent/iso-box.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "ent/iso-cyr1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "ent/iso-cyr2.ent"
Index: files/catalog.tmpl
===================================================================
RCS file: files/catalog.tmpl
diff -N files/catalog.tmpl
--- files/catalog.tmpl 26 Dec 2000 02:25:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-CATALOG "%%PREFIX%%/share/xml/docbook/catalog"
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020119020543.BAC4F55F4>