Date: Fri, 27 Jun 2003 21:12:37 +0900 (JST) From: Hiroki Sato <hrs@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/53820: Switch to use xmlcatmgr: textproc/jade Message-ID: <200306271212.h5RCCbUW002663@alph.allbsd.org> Resent-Message-ID: <200306271220.h5RCKD1S049029@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 53820
>Category: ports
>Synopsis: Switch to use xmlcatmgr: textproc/jade
>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:12 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: jade/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/jade/Makefile,v
retrieving revision 1.36
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.36 Makefile
--- jade/Makefile 22 Feb 2003 07:48:49 -0000 1.36
+++ jade/Makefile 27 Jun 2003 11:04:05 -0000
@@ -7,7 +7,7 @@
PORTNAME= jade
PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.jclark.com/pub/jade/
@@ -18,10 +18,17 @@
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= An object-oriented SGML/XML parser toolkit and DSSSL engine
+RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+
USE_GMAKE= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog
+PLIST_SUB= XMLCATMGR=${XMLCATMGR}
+PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
+
+CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports
+XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr
post-extract:
@${CHMOD} u+w ${WRKSRC}/configure
@@ -45,10 +52,6 @@
${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${PREFIX}/share/doc/jade
${MKDIR} ${PREFIX}/share/sgml/jade
${INSTALL_DATA} ${WRKSRC}/dsssl/* ${PREFIX}/share/sgml/jade
- @if [ ! -f ${PREFIX}/share/sgml/catalog ]; then \
- ${ECHO_CMD} "CATALOG \"${PREFIX}/share/sgml/jade/catalog\"" > ${PREFIX}/share/sgml/catalog; \
- else \
- ${SETENV} LANG=C ${PERL} -ni -e 'print if !m|${PREFIX}/share/sgml/jade/catalog|;print "CATALOG \"${PREFIX}/share/sgml/jade/catalog\"\n" if eof;' ${PREFIX}/share/sgml/catalog; \
- fi
+ @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/catalog
.include <bsd.port.post.mk>
Index: jade/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/jade/pkg-plist,v
retrieving revision 1.13
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.13 pkg-plist
--- jade/pkg-plist 10 Nov 2002 22:30:18 -0000 1.13
+++ jade/pkg-plist 27 Jun 2003 10:12:05 -0000
@@ -169,10 +169,9 @@
share/doc/jade/xml.htm
share/sgml/jade/FOT.tex
share/sgml/jade/Makefile.jadetex
+@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove jade/catalog
share/sgml/jade/catalog
-@unexec env LANG=C perl -ni -e 'print if !m|%D/%F|;' %D/share/sgml/catalog
-@unexec if [ -f %D/share/sgml/catalog -a ! -s %D/share/sgml/catalog ]; then rm -f %D/share/sgml/catalog; fi
-@exec if [ ! -f %D/share/sgml/catalog ]; then echo "CATALOG \"%D/%F\"" > %D/share/sgml/catalog; else env LANG=C perl -ni -e 'print if !m|%D/%F|;print "CATALOG \"%D/%F\"\n" if eof;' %D/share/sgml/catalog; fi
+@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add jade/catalog
share/sgml/jade/demo.dsl
share/sgml/jade/demo.sgm
share/sgml/jade/demoMaster.tex
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306271212.h5RCCbUW002663>