Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/text
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv726/10.3/unstable/main/finkinfo/text
Modified Files:
fop.info fop.patch
Log Message:
make sure bytecode is 1.4 regardless of the jdk used
Index: fop.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/text/fop.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fop.info 4 Jan 2006 07:03:31 -0000 1.5
+++ fop.info 15 Jun 2006 14:55:21 -0000 1.6
@@ -1,6 +1,6 @@
Package: fop
Version: 0.20.5
-Revision: 6
+Revision: 8
Maintainer: Thomas Kotzian <[EMAIL PROTECTED]>
Source: mirror:custom:/xml/%n/%n-%v-src.tar.gz
CustomMirror: <<
@@ -24,21 +24,26 @@
<<
Source-MD5: 1a31eb1357e5d4b8d32d4cb3edae2da2
SourceDirectory: %n-%v
+Type: java (1.4)
PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
CompileScript: <<
#!/bin/sh -e
- JAVA_HOME=/Library/Java/Home ./build.sh
+ ## Not needed since Type: java (1.4) is set
+ ## JAVA_HOME=/Library/Java/Home ./build.sh
+ ./build.sh
rm -f lib/ant*.jar
<<
JarFiles: build/fop.jar lib/*.jar
RuntimeVars: <<
- JAVA_HOME: /Library/Java/Home
+ ## Need to adjust to the right Framework
+ JAVA_HOME: /System/Library/Frameworks/JavaVM.Framework/Versions/1.4.2/Home
<<
InstallScript: <<
mkdir -p %i/bin
install -m 0755 fop.sh %i/bin/fop
install -m 0755 fop_pfmreader.sh %i/bin/fop_pfmreader
install -m 0755 fop_ttfreader.sh %i/bin/fop_ttfreader
+ install -m 0755 xalan.sh %i/bin/xalan
mkdir -p %i/share/doc/%n/xslfoRef
cp -r docs/* %i/share/doc/%n/xslfoRef/
cp -r build/site/* %i/share/doc/%n/
@@ -53,5 +58,16 @@
the resulting pages to a specified output. Output formats currently supported
are PDF, PCL, PS, SVG, XML (area tree representation), Print, AWT, MIF and
TXT.
<<
+DescUsage: <<
+See the documentation in %p/share/doc/fop.
+<<
+DescPort: <<
+Modified by Michele Garoche <[EMAIL PROTECTED]>
+Changed all references to java-home in patch to specific java 1.4.2 version
+Added xalan script to allow debugging xsl-fo step results.
+Modified by Benjamin Reed <[EMAIL PROTECTED]>
+Changed <javac> ant call to force source="1.4" to be sure the bytecode
+is generated properly.
+<<
License: BSD
Homepage: http://xml.apache.org/fop
Index: fop.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/text/fop.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fop.patch 17 Nov 2004 17:13:31 -0000 1.3
+++ fop.patch 15 Jun 2006 14:55:21 -0000 1.4
@@ -8,7 +8,7 @@
- Darwin*) darwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_HOME" ] ; then
-+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
++
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home
+ fi
+ ;;
esac
@@ -62,7 +62,7 @@
+ CYGWIN*) cygwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_HOME" ] ; then
-+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
++
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home
+ fi
+ ;;
+esac
@@ -176,7 +176,7 @@
+ CYGWIN*) cygwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_HOME" ] ; then
-+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
++
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home
+ fi
+ ;;
+esac
@@ -271,3 +271,60 @@
+
+$JAVACMD -Xms64M -Xmx320M -Djava.awt.headless=true -classpath
"$LOCALCLASSPATH" $FOP_OPTS org.apache.fop.fonts.apps.TTFReader "$@"
+
+
+diff -urN fop-0.20.5.orig/xalan.sh fop-0.20.5/xalan.sh
+--- fop-0.20.5.orig/xalan.sh 2003-07-15 04:03:25.000000000 +0200
++++ fop-0.20.5/xalan.sh 2006-06-01 10:43:21.000000000 +0200
+@@ -11,7 +11,11 @@
+ darwin=false;
+ case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+- Darwin*) darwin=true ;;
++ Darwin*) darwin=true
++ if [ -z "$JAVA_HOME" ] ; then
++
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home
++ fi
++ ;;
+ esac
+
+ if [ -z "$FOP_HOME" ] ; then
+@@ -42,6 +46,8 @@
+
+ fi
+
[EMAIL PROTECTED]@/share/java/fop
++
+ # For Cygwin, ensure paths are in UNIX format before anything is touched
+ if $cygwin ; then
+ [ -n "$FOP_HOME" ] &&
+@@ -76,10 +82,10 @@
+ fi
+
+ # add fop.jar, which resides in $FOP_HOME/build
+-LOCALCLASSPATH=${FOP_HOME}/build/fop.jar:$LOCALCLASSPATH
++LOCALCLASSPATH=${FOP_HOME}/fop.jar:$LOCALCLASSPATH
+
+ # add in the dependency .jar files, which reside in $FOP_HOME/lib
+-DIRLIBS=${FOP_HOME}/lib/*.jar
++DIRLIBS=${FOP_HOME}/*.jar
+ for i in ${DIRLIBS}
+ do
+ # if the directory is empty, then it will return the input string
+@@ -100,5 +106,5 @@
+ LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
+ fi
+
+-$JAVACMD -classpath "$LOCALCLASSPATH" $FOP_OPTS org.apache.xalan.xslt.Process
"$@"
++$JAVACMD -Xms64M -Xmx320M -Djava.awt.headless=true -classpath
"$LOCALCLASSPATH" $FOP_OPTS org.apache.xalan.xslt.Process "$@"
+
+--- fop-0.20.5/build.xml 2003-07-14 22:03:22.000000000 -0400
++++ fop-0.20.5-new/build.xml 2006-06-15 10:27:25.000000000 -0400
+@@ -548,7 +548,7 @@
+ <fileset dir="${viewer.images.src.dir}"/>
+ </copy>
+
+- <javac srcdir="${build.src}"
++ <javac srcdir="${build.src}" source="1.4"
+ destdir="${build.dest}"
+ debug="${debug}"
+ deprecation="${deprecation}"
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
