6 files changed, 68 insertions, 54 deletions

diff --git a/textproc/xt/Makefile b/textproc/xt/Makefile
index 175a1ddd8164..1f3c620e5f73 100644
--- a/textproc/xt/Makefile
+++ b/textproc/xt/Makefile
@@ -6,33 +6,55 @@
 #
 
 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
+MAINTAINER=	ports@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
 
-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>
diff --git a/textproc/xt/distinfo b/textproc/xt/distinfo
index af5259304cb0..7aefa471517b 100644
--- a/textproc/xt/distinfo
+++ b/textproc/xt/distinfo
@@ -1,2 +1,2 @@
-MD5 (xt.zip) = 2ac9973f7f9cb2a480af94066f89568a
-SIZE (xt.zip) = 525521
+MD5 (xt-20020426a-src.tgz) = ec70802a81c8a8374928b34d784f081c
+SIZE (xt-20020426a-src.tgz) = 697155
diff --git a/textproc/xt/files/xt-xml4j.sh b/textproc/xt/files/xt-xml4j.sh
deleted file mode 100644
index 8960c80b107a..000000000000
--- a/textproc/xt/files/xt-xml4j.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-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
diff --git a/textproc/xt/files/xt-xp.sh b/textproc/xt/files/xt-xp.sh
deleted file mode 100644
index d857f10b4d00..000000000000
--- a/textproc/xt/files/xt-xp.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-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 $*
diff --git a/textproc/xt/files/xt.sh b/textproc/xt/files/xt.sh
new file mode 100644
index 000000000000..640fa6c165b5
--- /dev/null
+++ b/textproc/xt/files/xt.sh
@@ -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 $*
diff --git a/textproc/xt/pkg-plist b/textproc/xt/pkg-plist
index 5a7355db6a33..d8148b556d18 100644
--- a/textproc/xt/pkg-plist
+++ b/textproc/xt/pkg-plist
@@ -1,23 +1,15 @@
+bin/xt
 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
+%%JAVAJARDIR%%/xt.jar
+%%EXAMPLESDIR%%/date.xsl
+%%EXAMPLESDIR%%/nxml.xsl
+%%EXAMPLESDIR%%/slides.xml
+%%EXAMPLESDIR%%/slides.xsl
+%%EXAMPLESDIR%%/sort-uniq.xml
+%%EXAMPLESDIR%%/sort-uniq.xsl
+%%EXAMPLESDIR%%/split.xml
+%%EXAMPLESDIR%%/split.xsl
+%%EXAMPLESDIR%%/textfile.xml
+%%EXAMPLESDIR%%/textfile.xsl
+@dirrm %%EXAMPLESDIR%%