- Update to bsd.java.mk 2.0

- Cleanup unused PLIST_SUB entry
- Use MASTER_SITE_APACHE_XML
- Use INSTALL_DATA to install documentation and JAR files
- Add a new FreeBSD specific launcher shell script which uses javavmwrapper
- Use %%DATADIR%% to calm portlint

2 files changed, 18 insertions, 37 deletions

diff --git a/textproc/fop/files/fop.sh.in b/textproc/fop/files/fop.sh.in
new file mode 100644
index 000000000000..2c685be75fdc
--- /dev/null
+++ b/textproc/fop/files/fop.sh.in
@@ -0,0 +1,18 @@
+#! /bin/sh
+#
+# $FreeBSD$
+
+if [ -f $HOME/.foprc ] ; then 
+	. $HOME/.foprc
+fi
+
+# add fop.jar, which resides in $FOP_HOME/build
+CLASSPATH="%%DATADIR%%/build/fop.jar:${CLASSPATH}"
+
+# add in the dependency .jar files, which reside in $FOP_HOME/lib
+for jarfile in %%DATADIR%%/lib/*.jar
+do
+	CLASSPATH="${jarfile}:${CLASSPATH}"
+done
+
+JAVA_VERSION="1.2+" "%%LOCALBASE%%/bin/java" ${JAVA_OPTS} -classpath "${CLASSPATH}" ${FOP_OPTS} org.apache.fop.apps.Fop "$@"
diff --git a/textproc/fop/files/patch-aa b/textproc/fop/files/patch-aa
deleted file mode 100644
index 060b93d09a56..000000000000
--- a/textproc/fop/files/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
---- fop.sh.orig	Fri Oct  3 00:24:47 2003
-+++ fop.sh	Fri Oct  3 00:25:24 2003
-@@ -1,5 +1,25 @@
- #! /bin/sh
- #
-+# Common variables
-+PREFIX=%%PREFIX%%
-+
-+# Default JAVACMD, JAVA_HOME, FOP_HOME
-+JAVACMD=${JAVACMD:-`which javavm`}
-+if [ -f ${PREFIX}/etc/javavms ]; then
-+    JAVA_HOME=`head -1 /usr/local/etc/javavms | sed -e 's,/bin/java *#.*$,,'`
-+elif [ -n "`echo ${PREFIX}/jdk*/bin/java 2> /dev/null`" ]; then
-+    JAVA_HOME=`ls -d /usr/local/jdk*/bin/java | sort -r | head -1 | sed -e 's,/bin/java *$,,'`
-+fi
-+SHAREDIR=${PREFIX}/share
-+FOP_HOME=${SHAREDIR}/fop
-+DIRLIBS="\
-+    ${FOP_HOME}/lib/xml-apis.jar
-+    ${FOP_HOME}/lib/xercesImpl-2.2.1.jar
-+    ${FOP_HOME}/lib/xalan-2.4.1.jar
-+    ${FOP_HOME}/lib/batik.jar
-+    ${FOP_HOME}/lib/avalon-framework-cvs-20020806.jar
-+    ${FOP_HOME}/lib/ant-1.5.1.jar"
-+
- # Shell script to run FOP, adapted from the Jakarta-Ant project.
- 
- if [ -f $HOME/.foprc ] ; then 
-@@ -79,7 +99,7 @@
- LOCALCLASSPATH=${FOP_HOME}/build/fop.jar:$LOCALCLASSPATH
- 
- # add in the dependency .jar files, which reside in $FOP_HOME/lib
--DIRLIBS=${FOP_HOME}/lib/*.jar
-+
- for i in ${DIRLIBS}
- do
-     # if the directory is empty, then it will return the input string