Date: Fri, 27 Jun 2003 21:12:31 +0900 (JST) From: Hiroki Sato <hrs@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/53836: Switch to use xmlcatmgr: textproc/docbook-310 Message-ID: <200306271212.h5RCCV7L002291@alph.allbsd.org> Resent-Message-ID: <200306271220.h5RCKJZj049318@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 53836
>Category: ports
>Synopsis: Switch to use xmlcatmgr: textproc/docbook-310
>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: Fri Jun 27 05:20:19 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Hiroki Sato
>Release: FreeBSD 4.8-STABLE i386
>Organization:
Tokyo University of Science
>Environment:
System: FreeBSD alph.allbsd.org 4.8-STABLE FreeBSD 4.8-STABLE #7: Tue May 20 00:05:43 JST 2003 hrs@alph.allbsd.org:/home/obj/home/src/sys/ALPH i386
>Description:
Change this port to use textproc/xmlcatmgr and bump ${PORTREVISION}.
This PR supersedes ports/52640 and please read the original PR
for the motivation.
>How-To-Repeat:
N/A
>Fix:
Index: docbook-310/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/docbook-310/Makefile,v
retrieving revision 1.17
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.17 Makefile
--- docbook-310/Makefile 7 Mar 2003 06:11:38 -0000 1.17
+++ docbook-310/Makefile 27 Jun 2003 11:02:37 -0000
@@ -9,6 +9,7 @@
PORTNAME= docbook
PORTVERSION= 3.1
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://www.docbook.org/sgml/3.1/
DISTNAME= docbk31
@@ -17,33 +18,36 @@
COMMENT= V3.1 of the DocBook DTD, designed for technical documentation
RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
- ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+ ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
USE_ZIP= yes
NO_MTREE= yes
EXTRACT_ONLY= # empty
NO_BUILD= yes
NO_WRKSUBDIR= yes
-PLIST_SUB= DTD_NAME=${PORTNAME} DTD_VERSION=${PORTVERSION} \
- MKCATALOG=${MKCATALOG}
+PLIST_SUB= DTD_NAME=${PORTNAME}
+PLIST_SUB+= DTD_VERSION=${PORTVERSION}
+PLIST_SUB+= XMLCATMGR=${XMLCATMGR}
+PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
INSTDIR= ${PREFIX}/share/sgml/docbook
ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog
-MKCATALOG= ${PREFIX}/sbin/mkcatalog
+XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr
+CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports
LATEST_LINK= docbook-310
pre-install:
- @[ -d ${INSTDIR}/3.1 ] || ${MKDIR} ${INSTDIR}/3.1
+ @[ -d ${INSTDIR}/${PORTVERSION} ] || ${MKDIR} ${INSTDIR}/${PORTVERSION}
do-install:
- @unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/3.1
- @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/3.1/catalog
- @${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.1/catalog
- @${CHMOD} ${SHAREMODE} ${INSTDIR}/3.1/*
+ @unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/${PORTVERSION}
+ @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/${PORTVERSION}/catalog
+ @${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/${PORTVERSION}/catalog
+ @${CHMOD} ${SHAREMODE} ${INSTDIR}/${PORTVERSION}/*
@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
post-install:
- @${MKCATALOG} -q install ${PORTNAME}/${PORTVERSION}
+ @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/${PORTVERSION}/catalog
.include <bsd.port.mk>
Index: docbook-310/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/docbook-310/pkg-plist,v
retrieving revision 1.3
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.3 pkg-plist
--- docbook-310/pkg-plist 27 Oct 2000 15:29:04 -0000 1.3
+++ docbook-310/pkg-plist 27 Jun 2003 09:09:43 -0000
@@ -11,9 +11,9 @@
share/sgml/docbook/3.1/docbook.cat
share/sgml/docbook/3.1/docbook.dcl
share/sgml/docbook/3.1/docbook.dtd
-@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%%/%%DTD_VERSION%%
+@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/%%DTD_VERSION%%/catalog
share/sgml/docbook/3.1/catalog
-@exec %%MKCATALOG%% -q install %%DTD_NAME%%/%%DTD_VERSION%%
+@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add %%DTD_NAME%%/%%DTD_VERSION%%/catalog
share/sgml/docbook/3.1/readme.txt
@dirrm share/sgml/docbook/3.1
@unexec rmdir %D/share/sgml/docbook 2>/dev/null || true
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306271212.h5RCCV7L002291>