- Update to bsd.java.mk 2.0

- Use JAVAJARDIR
- Use PORTDOCS
- CP -> INSTALL_DATA
- Improve the launcher shell script: use javavmwrapper 2.0 rather than testing
  manually the JDK version
- Use SUB_FILES to configure launcher rather than a perl script

5 files changed, 25 insertions, 261 deletions

diff --git a/textproc/smartdoc-devel/Makefile b/textproc/smartdoc-devel/Makefile
index cc1c6e9edc93..a046b6077ee5 100644
--- a/textproc/smartdoc-devel/Makefile
+++ b/textproc/smartdoc-devel/Makefile
@@ -17,50 +17,49 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML utility to create various documents(devel version)
 
-RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
-SCRIPTS_ENV=	JAVALIBDIR=${JAVALIBDIR}
 WRKSRC=		${WRKDIR}/sdoc
 NO_BUILD=	yes
 USE_ZIP=	yes
-USE_JAVA=	1.3+
-JAVA_EXTRACT=	yes
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
+JAVA_EXTRACT=	jre
+JAVA_RUN=	jre
 EXTRACT_CMD=	${JAVA}
 EXTRACT_BEFORE_ARGS=	-jar ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} \
 			-batch -bindir:${WRKSRC}/bin -installbasedir:${WRKSRC}
 EXTRACT_AFTER_ARGS=	#
 NO_LATEST_LINK=	yes
 
-JAVALIBDIR=	${PREFIX}/share/java
 XMLDIR=		${PREFIX}/share/xml
 EMACSLISPDIR=	${LOCALBASE}/share/emacs/site-lisp
 XEMACSLISPDIR=	${LOCALBASE}/lib/xemacs/site-lisp
 DTDDIR=		${XMLDIR}/${PORTNAME}
 MKCATALOG=	${LOCALBASE}/sbin/mkcatalog
-DOCS=		COPYING.txt OroLICENSE.txt README README.sdoc \
+.if !defined(NOPORTDOCS)
+PORTDOCS=	COPYING.txt OroLICENSE.txt README README.sdoc \
 		README_en.html README_ja.html \
-		XalanLICENSE.txt XercesLICENSE.txt
+		XalanLICENSE.txt XercesLICENSE.txt doc
+.endif
 JARS=		SmartDoc.jar
 ELISPS=		sdoc-helper.el sdoc-mode.el
 
-post-extract:
-	${MKDIR} ${WRKSRC}/bin
-	${CP} ${FILESDIR}/sdoc.in ${WRKSRC}/bin/sdoc
+SUB_FILES=	sdoc.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/sdoc ${PREFIX}/bin
-	${MKDIR} ${JAVALIBDIR}/classes
+	${INSTALL_SCRIPT} ${WRKDIR}/sdoc.sh ${PREFIX}/bin/sdoc
+	${MKDIR} ${JAVAJARDIR}
 .for jar in ${JARS}
-	${INSTALL_DATA} ${WRKSRC}/${jar} ${JAVALIBDIR}/classes
+	${INSTALL_DATA} ${WRKSRC}/${jar} ${JAVAJARDIR}
 .endfor
-	${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/etc/* ${EXAMPLESDIR}
+	cd ${WRKSRC}/etc \
+	  && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; \
+	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \;
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for doc in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
-	${CP} -R ${WRKSRC}/doc ${DOCSDIR}
+	cd ${WRKSRC} \
+	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
+	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
 .endif
 	${MKDIR} ${DTDDIR} ${EMACSLISPDIR} ${XEMACSLISPDIR}
 	${INSTALL_DATA} ${FILESDIR}/catalog ${DTDDIR}
diff --git a/textproc/smartdoc-devel/files/sdoc.in b/textproc/smartdoc-devel/files/sdoc.in
deleted file mode 100644
index 048013019a1b..000000000000
--- a/textproc/smartdoc-devel/files/sdoc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-INSTALLDIR=%%JAVALIBDIR%%/classes
-JAVA_VERSION=`javavm -version 2>&1 | grep "^java.* version" | sed -e 's/^.* version "\([0-9]*\.[0-9]*\)\..*"$/\1/'`
-
-if [ "$JAVA_VERSION" = '1.1' ]; then
-    echo "SmartDoc requires Java newer than 1.2."
-    echo "Fix %%LOCALBASE%%/etc/javavms properly, or set the environment variable JAVAVM to a correct JavaVM."
-    exit 1
-fi
-
-exec javavm -jar $INSTALLDIR/SmartDoc.jar $*
diff --git a/textproc/smartdoc-devel/files/sdoc.sh.in b/textproc/smartdoc-devel/files/sdoc.sh.in
new file mode 100644
index 000000000000..af777cd2cef7
--- /dev/null
+++ b/textproc/smartdoc-devel/files/sdoc.sh.in
@@ -0,0 +1,5 @@
+#! /bin/sh
+#
+# $FreeBSD$
+
+JAVA_VERSION="1.3+" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/SmartDoc.jar" "$@"
diff --git a/textproc/smartdoc-devel/pkg-plist b/textproc/smartdoc-devel/pkg-plist
index f8660b57f047..28499cac9cb8 100644
--- a/textproc/smartdoc-devel/pkg-plist
+++ b/textproc/smartdoc-devel/pkg-plist
@@ -1,208 +1,6 @@
 bin/sdoc
 lib/xemacs/site-lisp/sdoc-helper.el
 lib/xemacs/site-lisp/sdoc-mode.el
-%%DOCSDIR%%/COPYING.txt
-%%DOCSDIR%%/OroLICENSE.txt
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.sdoc
-%%DOCSDIR%%/README_en.html
-%%DOCSDIR%%/README_ja.html
-%%DOCSDIR%%/XalanLICENSE.txt
-%%DOCSDIR%%/XercesLICENSE.txt
-%%DOCSDIR%%/doc/quick/Dl.sdoc
-%%DOCSDIR%%/doc/quick/Figure.sdoc
-%%DOCSDIR%%/doc/quick/HelloWorld.sdoc
-%%DOCSDIR%%/doc/quick/HelloWorld_ja.sdoc
-%%DOCSDIR%%/doc/quick/NaturalP.sdoc
-%%DOCSDIR%%/doc/quick/Ol.sdoc
-%%DOCSDIR%%/doc/quick/P.sdoc
-%%DOCSDIR%%/doc/quick/Sample.java
-%%DOCSDIR%%/doc/quick/Sample.java.cdata
-%%DOCSDIR%%/doc/quick/Sample.java.escape
-%%DOCSDIR%%/doc/quick/SmartDoc.properties
-%%DOCSDIR%%/doc/quick/TableBasic.sdoc
-%%DOCSDIR%%/doc/quick/TableCSV.sdoc
-%%DOCSDIR%%/doc/quick/TreeTable.sdoc
-%%DOCSDIR%%/doc/quick/Ul.sdoc
-%%DOCSDIR%%/doc/quick/figure.eps
-%%DOCSDIR%%/doc/quick/figure.gif
-%%DOCSDIR%%/doc/quick/quick.sdoc
-%%DOCSDIR%%/doc/quick/sample.console
-%%DOCSDIR%%/doc/refman/README.euc
-%%DOCSDIR%%/doc/refman/README.sjis
-%%DOCSDIR%%/doc/refman/SmartDoc.properties
-%%DOCSDIR%%/doc/refman/adapter.sdoc
-%%DOCSDIR%%/doc/refman/bibElement.sdoc
-%%DOCSDIR%%/doc/refman/command.sdoc
-%%DOCSDIR%%/doc/refman/commonAttr.sdoc
-%%DOCSDIR%%/doc/refman/documentElement.sdoc
-%%DOCSDIR%%/doc/refman/html3.sdoc
-%%DOCSDIR%%/doc/refman/html4.sdoc
-%%DOCSDIR%%/doc/refman/index.sdoc
-%%DOCSDIR%%/doc/refman/javahelp.sdoc
-%%DOCSDIR%%/doc/refman/latex2e.sdoc
-%%DOCSDIR%%/doc/refman/normalizer.sdoc
-%%DOCSDIR%%/doc/refman/plain.sdoc
-%%DOCSDIR%%/doc/refman/pure.sdoc
-%%DOCSDIR%%/doc/refman/revised.sdoc
-%%DOCSDIR%%/doc/refman/src/adapter/autoimage.sdoc
-%%DOCSDIR%%/doc/refman/src/adapter/bean/sample.sdoc
-%%DOCSDIR%%/doc/refman/src/adapter/csv.sdoc
-%%DOCSDIR%%/doc/refman/src/adapter/intro.sdoc
-%%DOCSDIR%%/doc/refman/src/adapter/jdbc/jdbc.sdoc
-%%DOCSDIR%%/doc/refman/src/adapter/none.sdoc
-%%DOCSDIR%%/doc/refman/src/adapter/sdoc.sdoc
-%%DOCSDIR%%/doc/refman/src/adapter/stable.sdoc
-%%DOCSDIR%%/doc/refman/src/adapter/text.sdoc
-%%DOCSDIR%%/doc/refman/src/adapter/xslt/conv.xsl
-%%DOCSDIR%%/doc/refman/src/adapter/xslt/data.xml
-%%DOCSDIR%%/doc/refman/src/adapter/xslt/sample.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/article.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/author.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/bibliography.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/bibliopole.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/book.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/edition.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/editor.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/journal.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/month.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/number.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/pages.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/publisher.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/subtitle.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/title.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/uri.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/volume.sdoc
-%%DOCSDIR%%/doc/refman/src/bib/year.sdoc
-%%DOCSDIR%%/doc/refman/src/command/locale.sdoc
-%%DOCSDIR%%/doc/refman/src/command/localeEn.sdoc
-%%DOCSDIR%%/doc/refman/src/command/localeJa.sdoc
-%%DOCSDIR%%/doc/refman/src/commonAttr/adapter.sdoc
-%%DOCSDIR%%/doc/refman/src/commonAttr/class.sdoc
-%%DOCSDIR%%/doc/refman/src/commonAttr/format.sdoc
-%%DOCSDIR%%/doc/refman/src/commonAttr/id.sdoc
-%%DOCSDIR%%/doc/refman/src/commonAttr/idref.sdoc
-%%DOCSDIR%%/doc/refman/src/commonAttr/key.sdoc
-%%DOCSDIR%%/doc/refman/src/commonAttr/locale.sdoc
-%%DOCSDIR%%/doc/refman/src/commonAttr/normalizer.sdoc
-%%DOCSDIR%%/doc/refman/src/commonAttr/src.sdoc
-%%DOCSDIR%%/doc/refman/src/commonAttr/style.sdoc
-%%DOCSDIR%%/doc/refman/src/commonAttr/title.sdoc
-%%DOCSDIR%%/doc/refman/src/commonAttr/xmllang.sdoc
-%%DOCSDIR%%/doc/refman/src/commonAttr/xmlspace.sdoc
-%%DOCSDIR%%/doc/refman/src/element/a.sdoc
-%%DOCSDIR%%/doc/refman/src/element/abbr.sdoc
-%%DOCSDIR%%/doc/refman/src/element/acronym.sdoc
-%%DOCSDIR%%/doc/refman/src/element/appendix.sdoc
-%%DOCSDIR%%/doc/refman/src/element/attribute.sdoc
-%%DOCSDIR%%/doc/refman/src/element/b.sdoc
-%%DOCSDIR%%/doc/refman/src/element/blockquote.sdoc
-%%DOCSDIR%%/doc/refman/src/element/body.sdoc
-%%DOCSDIR%%/doc/refman/src/element/chapter.sdoc
-%%DOCSDIR%%/doc/refman/src/element/cite.sdoc
-%%DOCSDIR%%/doc/refman/src/element/code.sdoc
-%%DOCSDIR%%/doc/refman/src/element/col.sdoc
-%%DOCSDIR%%/doc/refman/src/element/colgroup.sdoc
-%%DOCSDIR%%/doc/refman/src/element/console.sdoc
-%%DOCSDIR%%/doc/refman/src/element/dd.sdoc
-%%DOCSDIR%%/doc/refman/src/element/dfn.sdoc
-%%DOCSDIR%%/doc/refman/src/element/div.sdoc
-%%DOCSDIR%%/doc/refman/src/element/dl.sdoc
-%%DOCSDIR%%/doc/refman/src/element/doc.sdoc
-%%DOCSDIR%%/doc/refman/src/element/dt.sdoc
-%%DOCSDIR%%/doc/refman/src/element/em.sdoc
-%%DOCSDIR%%/doc/refman/src/element/equation.sdoc
-%%DOCSDIR%%/doc/refman/src/element/figure.sdoc
-%%DOCSDIR%%/doc/refman/src/element/fyi.sdoc
-%%DOCSDIR%%/doc/refman/src/element/head.sdoc
-%%DOCSDIR%%/doc/refman/src/element/head2.sdoc
-%%DOCSDIR%%/doc/refman/src/element/i.sdoc
-%%DOCSDIR%%/doc/refman/src/element/img.sdoc
-%%DOCSDIR%%/doc/refman/src/element/index.sdoc
-%%DOCSDIR%%/doc/refman/src/element/kbd.sdoc
-%%DOCSDIR%%/doc/refman/src/element/li.sdoc
-%%DOCSDIR%%/doc/refman/src/element/native.sdoc
-%%DOCSDIR%%/doc/refman/src/element/note.sdoc
-%%DOCSDIR%%/doc/refman/src/element/ol.sdoc
-%%DOCSDIR%%/doc/refman/src/element/p.sdoc
-%%DOCSDIR%%/doc/refman/src/element/part.sdoc
-%%DOCSDIR%%/doc/refman/src/element/pre.sdoc
-%%DOCSDIR%%/doc/refman/src/element/program.sdoc
-%%DOCSDIR%%/doc/refman/src/element/q.sdoc
-%%DOCSDIR%%/doc/refman/src/element/samp.sdoc
-%%DOCSDIR%%/doc/refman/src/element/section.sdoc
-%%DOCSDIR%%/doc/refman/src/element/span.sdoc
-%%DOCSDIR%%/doc/refman/src/element/strong.sdoc
-%%DOCSDIR%%/doc/refman/src/element/subsection.sdoc
-%%DOCSDIR%%/doc/refman/src/element/subsubsection.sdoc
-%%DOCSDIR%%/doc/refman/src/element/table.sdoc
-%%DOCSDIR%%/doc/refman/src/element/tbody.sdoc
-%%DOCSDIR%%/doc/refman/src/element/td.sdoc
-%%DOCSDIR%%/doc/refman/src/element/tfoot.sdoc
-%%DOCSDIR%%/doc/refman/src/element/th.sdoc
-%%DOCSDIR%%/doc/refman/src/element/thead.sdoc
-%%DOCSDIR%%/doc/refman/src/element/title.sdoc
-%%DOCSDIR%%/doc/refman/src/element/tnote.sdoc
-%%DOCSDIR%%/doc/refman/src/element/tr.sdoc
-%%DOCSDIR%%/doc/refman/src/element/tt.sdoc
-%%DOCSDIR%%/doc/refman/src/element/ul.sdoc
-%%DOCSDIR%%/doc/refman/src/element/var.sdoc
-%%DOCSDIR%%/doc/refman/src/hello/HelloWorld.sdoc
-%%DOCSDIR%%/doc/refman/src/hello/HelloWorld_ja.sdoc
-%%DOCSDIR%%/doc/refman/src/intro/demo.sdoc
-%%DOCSDIR%%/doc/refman/src/normalizer/console.sdoc
-%%DOCSDIR%%/doc/refman/src/normalizer/csv.sdoc
-%%DOCSDIR%%/doc/refman/src/normalizer/href.sdoc
-%%DOCSDIR%%/doc/refman/src/normalizer/image.sdoc
-%%DOCSDIR%%/doc/refman/src/normalizer/javasrc.sdoc
-%%DOCSDIR%%/doc/refman/src/normalizer/line.sdoc
-%%DOCSDIR%%/doc/refman/src/normalizer/natural.sdoc
-%%DOCSDIR%%/doc/refman/src/normalizer/naturallabel.sdoc
-%%DOCSDIR%%/doc/refman/src/normalizer/none.sdoc
-%%DOCSDIR%%/doc/refman/src/normalizer/program.sdoc
-%%DOCSDIR%%/doc/refman/src/normalizer/regex.sdoc
-%%DOCSDIR%%/doc/refman/src/normalizer/space.sdoc
-%%DOCSDIR%%/doc/refman/src/normalizer/tag.sdoc
-%%DOCSDIR%%/doc/refman/src/normalizer/tex.sdoc
-%%DOCSDIR%%/doc/refman/src/plain/sample.sdoc
-%%DOCSDIR%%/doc/refman/src/plain/sample_ascii.txt
-%%DOCSDIR%%/doc/refman/src/plain/sample_jis.txt
-%%DOCSDIR%%/doc/refman/src/structure/attr.sdoc
-%%DOCSDIR%%/doc/refman/src/structure/block.sdoc
-%%DOCSDIR%%/doc/refman/src/structure/framework.sdoc
-%%DOCSDIR%%/doc/refman/src/structure/head.sdoc
-%%DOCSDIR%%/doc/refman/src/structure/image.sdoc
-%%DOCSDIR%%/doc/refman/src/structure/index.sdoc
-%%DOCSDIR%%/doc/refman/src/structure/link.sdoc
-%%DOCSDIR%%/doc/refman/src/structure/list.sdoc
-%%DOCSDIR%%/doc/refman/src/structure/logical.sdoc
-%%DOCSDIR%%/doc/refman/src/structure/math.sdoc
-%%DOCSDIR%%/doc/refman/src/structure/note.sdoc
-%%DOCSDIR%%/doc/refman/src/structure/program.sdoc
-%%DOCSDIR%%/doc/refman/src/structure/quote.sdoc
-%%DOCSDIR%%/doc/refman/src/structure/special.sdoc
-%%DOCSDIR%%/doc/refman/src/structure/table.sdoc
-%%DOCSDIR%%/doc/refman/src/structure/text.sdoc
-%%DOCSDIR%%/doc/refman/structure.sdoc
-%%DOCSDIR%%/doc/sample/Sample.java
-%%DOCSDIR%%/doc/sample/SmartDoc.properties.dvi2ps
-%%DOCSDIR%%/doc/sample/SmartDoc.properties.dvips
-%%DOCSDIR%%/doc/sample/figure.eps
-%%DOCSDIR%%/doc/sample/figure.gif
-%%DOCSDIR%%/doc/sample/html.html
-%%DOCSDIR%%/doc/sample/latex.tex
-%%DOCSDIR%%/doc/sample/sample.console
-%%DOCSDIR%%/doc/sample/sample.sdoc
-%%DOCSDIR%%/doc/sampleI18N/Sample.java
-%%DOCSDIR%%/doc/sampleI18N/SmartDoc.properties.dvi2ps
-%%DOCSDIR%%/doc/sampleI18N/SmartDoc.properties.dvips
-%%DOCSDIR%%/doc/sampleI18N/data.csv
-%%DOCSDIR%%/doc/sampleI18N/figure.eps
-%%DOCSDIR%%/doc/sampleI18N/figure.gif
-%%DOCSDIR%%/doc/sampleI18N/html.html
-%%DOCSDIR%%/doc/sampleI18N/latex.tex
-%%DOCSDIR%%/doc/sampleI18N/sample.console
-%%DOCSDIR%%/doc/sampleI18N/sample.sdoc
 share/emacs/site-lisp/sdoc-helper.el
 share/emacs/site-lisp/sdoc-mode.el
 %%EXAMPLESDIR%%/html4/article.css
@@ -212,7 +10,7 @@ share/emacs/site-lisp/sdoc-mode.el
 %%EXAMPLESDIR%%/sdoc-helper.el
 %%EXAMPLESDIR%%/sdoc-mode.el
 %%EXAMPLESDIR%%/sdoc2html.xsl
-share/java/classes/SmartDoc.jar
+%%JAVAJARDIR%%/SmartDoc.jar
 share/xml/smartdoc/PureSmartDoc.dtd
 share/xml/smartdoc/catalog
 @dirrm share/xml/smartdoc
@@ -220,24 +18,4 @@ share/xml/smartdoc/catalog
 @dirrm %%EXAMPLESDIR%%/html4
 @dirrm %%EXAMPLESDIR%%
 @unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
-@dirrm %%DOCSDIR%%/doc/sampleI18N
-@dirrm %%DOCSDIR%%/doc/sample
-@dirrm %%DOCSDIR%%/doc/refman/src/structure
-@dirrm %%DOCSDIR%%/doc/refman/src/plain
-@dirrm %%DOCSDIR%%/doc/refman/src/normalizer
-@dirrm %%DOCSDIR%%/doc/refman/src/intro
-@dirrm %%DOCSDIR%%/doc/refman/src/hello
-@dirrm %%DOCSDIR%%/doc/refman/src/element
-@dirrm %%DOCSDIR%%/doc/refman/src/commonAttr
-@dirrm %%DOCSDIR%%/doc/refman/src/command
-@dirrm %%DOCSDIR%%/doc/refman/src/bib
-@dirrm %%DOCSDIR%%/doc/refman/src/adapter/xslt
-@dirrm %%DOCSDIR%%/doc/refman/src/adapter/jdbc
-@dirrm %%DOCSDIR%%/doc/refman/src/adapter/bean
-@dirrm %%DOCSDIR%%/doc/refman/src/adapter
-@dirrm %%DOCSDIR%%/doc/refman/src
-@dirrm %%DOCSDIR%%/doc/refman
-@dirrm %%DOCSDIR%%/doc/quick
-@dirrm %%DOCSDIR%%/doc
-@dirrm %%DOCSDIR%%
 @unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
diff --git a/textproc/smartdoc-devel/scripts/configure b/textproc/smartdoc-devel/scripts/configure
deleted file mode 100644
index a8ef244b8413..000000000000
--- a/textproc/smartdoc-devel/scripts/configure
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-export JAVALIBDIR
-
-/usr/bin/sed  -i "" -E  -e "s|%%JAVALIBDIR%%|${JAVALIBDIR}|g" \
-			-e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/bin/sdoc