Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Oct 2004 14:16:37 +0200 (CEST)
From:      Herve Quiroz <hq@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        kuriyama@FreeBSD.org
Subject:   ports/73114: [PATCH] textproc/xt: update to 20020426a
Message-ID:  <200410251216.i9PCGb1m076693@arabica.esil.univ-mrs.fr>
Resent-Message-ID: <200410251220.i9PCKWjh091644@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         73114
>Category:       ports
>Synopsis:       [PATCH] textproc/xt: update to 20020426a
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 25 12:20:31 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Herve Quiroz
>Release:        FreeBSD 5.2.1-RELEASE-p11 i386
>Organization:
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 5.2.1-RELEASE-p11 FreeBSD 5.2.1-RELEASE-p11 #8: Fri Oct 15 15:12:37 CEST 2004
>Description:

- Update to 20020426a
- Update to bsd.java.mk 2.0
- Register dependencies on textproc/xp and textproc/xml4j
- Honor hier(7): install docs in DOCSDIR, samples in EXAMPLESDIR
- Honor NOPORTDOCS
- Single script with symlinks
- Use 'classpath' from java/javavmwrapper

Added file(s):
- files/xt.sh

Removed file(s):
- pkg-plist
- files/xt-xml4j.sh
- files/xt-xp.sh

Port maintainer (kuriyama@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- xt-20020426a.patch begins here ---
Index: Makefile
===================================================================
RCS file: /var/fcvs/ports/textproc/xt/Makefile,v
retrieving revision 1.19
diff -u -u -r1.19 Makefile
--- Makefile	7 May 2003 00:47:47 -0000	1.19
+++ Makefile	25 Oct 2004 12:11:26 -0000
@@ -6,33 +6,57 @@
 #
 
 PORTNAME=	xt
-PORTVERSION=	19991105
-PORTREVISION=	1
+PORTVERSION=	20020426a
 CATEGORIES=	textproc java
-MASTER_SITES=	ftp://ftp.jclark.com/pub/xml/
-DISTNAME=	${PORTNAME}
+MASTER_SITES=	http://www.blnz.com/xt/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	XSL Transformations (XSLT) implementation in Java
 
-USE_JAVA=	1.1+
-USE_ZIP=	YES
-NO_BUILD_DEPENDS_JAVA=	YES
-NO_WRKSUBDIR=	YES
+RUN_DEPENDS=	${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xml4j \
+		${JAVALIBDIR}/xp.jar:${PORTSDIR}/textproc/xp \
+		${LOCALBASE}/bin/classpath:${PORTSDIR}/java/javavmwrapper
+
+USE_JAVA=	YES
+JAVA_VERSION=	1.1+
+NO_BUILD=	YES
 ONLY_FOR_ARCHS=	i386
 
-DIR=		${PREFIX}/share/java
+.if !defined(NOPORTDOCS)
+OTHERDOCS=	copying.txt copyingjc.txt index.html
+PORTDOCS=	${OTHERDOCS} api
+.endif
+SAMPLES=	date.xsl nxml.xsl slides.xml slides.xsl sort-uniq.xml \
+		sort-uniq.xsl split.xml split.xsl textfile.xml textfile.xsl
+PLIST_FILES=	%%JAVAJARDIR%%/xt.jar ${SAMPLES:S,^,%%EXAMPLESDIR%%/,} \
+		bin/xt bin/xt-xml4j bin/xt-xp
 
-do-build:
-	${SED} -e s,%%PREFIX%%,${PREFIX},g ${FILESDIR}/xt-xml4j.sh > ${WRKSRC}/xt-xml4j
-	${SED} -e s,%%PREFIX%%,${PREFIX},g ${FILESDIR}/xt-xp.sh > ${WRKSRC}/xt-xp
+do-configure:
+	${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},g' ${FILESDIR}/xt.sh > ${WRKSRC}/xt
 
 do-install:
-	${MKDIR} ${DIR}/classes ${DIR}/xt
-	(cd ${WRKSRC};\
-	 ${INSTALL_DATA} xt.jar sax.jar ${DIR}/classes; \
-	 ${CP} -R copying.txt demo xt.htm ${DIR}/xt; \
-	 ${INSTALL_SCRIPT} ${WRKSRC}/xt-xml4j ${PREFIX}/bin; \
-	 ${INSTALL_SCRIPT} ${WRKSRC}/xt-xp ${PREFIX}/bin)
+	@${ECHO_MSG} ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
+	${MKDIR} ${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/xt.jar ${JAVAJARDIR}/
+	@${ECHO_MSG} "  [ DONE ]"
+	@${ECHO_MSG} ">> Installing scripts in ${PREFIX}/bin/..."
+	${INSTALL_SCRIPT} ${WRKSRC}/xt ${PREFIX}/bin/
+	cd ${PREFIX}/bin && ${LN} xt xt-xp
+	cd ${PREFIX}/bin && ${LN} xt xt-xml4j
+	@${ECHO_MSG} "  [ DONE ]"
+	@${ECHO_MSG} ">> Installing samples in ${EXAMPLESDIR}..."
+	${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}/demo && ${INSTALL_DATA} ${SAMPLES} ${EXAMPLESDIR}/
+	@${ECHO_MSG} "  [ DONE ]"
+.if !defined(NOPORTDOCS)
+	@${ECHO_MSG} ">> Installing documentation in ${DOCSDIR}..."
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${FIND} api \
+	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
+	cd ${WRKSRC} && ${INSTALL_DATA} ${OTHERDOCS} ${DOCSDIR}/
+	@${ECHO_MSG} "  [ DONE ]"
+.endif
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /var/fcvs/ports/textproc/xt/distinfo,v
retrieving revision 1.8
diff -u -u -r1.8 distinfo
--- distinfo	18 Mar 2004 00:48:53 -0000	1.8
+++ distinfo	7 Aug 2004 17:27:40 -0000
@@ -1,2 +1,2 @@
-MD5 (xt.zip) = 2ac9973f7f9cb2a480af94066f89568a
-SIZE (xt.zip) = 525521
+MD5 (xt-20020426a-src.tgz) = ec70802a81c8a8374928b34d784f081c
+SIZE (xt-20020426a-src.tgz) = 697155
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- pkg-plist	25 Jul 2000 07:24:02 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-bin/xt-xml4j
-bin/xt-xp
-share/java/classes/sax.jar
-share/java/classes/xt.jar
-share/java/xt/copying.txt
-share/java/xt/demo/DOMDemo.java
-share/java/xt/demo/date.xsl
-share/java/xt/demo/multiout.xsl
-share/java/xt/demo/nxml.xsl
-share/java/xt/demo/out.xml
-share/java/xt/demo/out1.xml
-share/java/xt/demo/out2.xml
-share/java/xt/demo/slides.xml
-share/java/xt/demo/slides.xsl
-share/java/xt/demo/sort-uniq.xml
-share/java/xt/demo/sort-uniq.xsl
-share/java/xt/demo/split.xml
-share/java/xt/demo/split.xsl
-share/java/xt/demo/textfile.xml
-share/java/xt/demo/textfile.xsl
-share/java/xt/xt.htm
-@dirrm share/java/xt/demo
-@dirrm share/java/xt
Index: files/xt-xml4j.sh
===================================================================
RCS file: files/xt-xml4j.sh
diff -N files/xt-xml4j.sh
--- files/xt-xml4j.sh	29 Jul 2002 04:34:38 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/textproc/xt/files/xt-xml4j.sh,v 1.5 2002/07/29 04:34:38 kuriyama Exp $
-
-export CLASSPATH=%%PREFIX%%/share/java/classes/xt.jar:%%PREFIX%%/share/java/classes/xerces.jar:${CLASSPATH}
-
-javavm -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $*
\ No newline at end of file
Index: files/xt-xp.sh
===================================================================
RCS file: files/xt-xp.sh
diff -N files/xt-xp.sh
--- files/xt-xp.sh	29 Jul 2002 04:34:38 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/textproc/xt/files/xt-xp.sh,v 1.2 2002/07/29 04:34:38 kuriyama Exp $
-
-export CLASSPATH=%%PREFIX%%/share/java/classes/xt.jar:%%PREFIX%%/share/java/classes/xp-0.5.jar:%%PREFIX%%/share/java/classes/sax.jar:${CLASSPATH}
-
-javavm com.jclark.xsl.sax.Driver $*
Index: files/xt.sh
===================================================================
RCS file: files/xt.sh
diff -N files/xt.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/xt.sh	25 Oct 2004 12:00:45 -0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+# $FreeBSD$
+
+IAM=`basename ${0}`
+
+if [ "${IAM}" = "xt-xml4j" ]
+then
+	JAVA_ARGS="${JAVA_ARGS} -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser"
+fi
+
+export CLASSPATH=`"%%LOCALBASE%%/bin/classpath"`
+"%%LOCALBASE%%/bin/javavm" ${JAVA_ARGS} com.jclark.xsl.sax.Driver $*
--- xt-20020426a.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410251216.i9PCGb1m076693>