apache-fop: use openjdk; fix rdeps; switch to INSTALL.msg.

srcpkgs/apache-fop/INSTALL.msg

@@ -1,13 +1,3 @@
-#
-# This script will advise the user of the needed steps to 
-# configure apache-fop
-#
-case "${ACTION}" in
-post)
-    	
-    cat << _EOF
-=====================================================================
-
 - FOP environment configuration file is:
 
   /etc/fop.conf
@@ -45,7 +35,7 @@ post)
   You may need to reboot to ensure that PATH is update correctly,
   for the impatients, if you want you can type
 
-  $ source /etc/profile
+  $ . /etc/profile
 
   and check the PATH.
 
@@ -61,17 +51,8 @@ post)
 
   as a jar file, see the offo-hyphenation documentation for more info.
 
-
   Some part of the code of FOP are not licensed under Apache-2.0,
   see in /usr/share/fop/lib/ for the licenses of this parts
   of code that for convenience are in the distribution of FOP.
 
   Happy FOPping!
-
-=====================================================================
-
-
-_EOF
-    ;;
-esac
-

srcpkgs/apache-fop/template

@@ -1,7 +1,7 @@
 # Template file for 'apache-fop'
 pkgname="apache-fop"
 version="1.1"
-revision=4
+revision=5
 short_desc="Java print formatter driven by XSL formatting objects (XSL-FO) and an output independent formatter"
 maintainer="Carlo Dormeletti <carlo.dormeletti@email.it>"
 license="Apache-2.0"
@@ -11,23 +11,15 @@ distfiles="http://mirror.dkd.de/apache/xmlgraphics/fop/source/fop-${version}-src
 checksum="58164cb3298d130522ecd445b8082c71c36242ea6464c8f02ab4157e4a332522
 	0697a90c2f0b0602bf707070267caecc59638a8bf7a719d5950acff764f57b8e"
 only_for_archs="i686 x86_64"
-hostmakedepends="oracle-jdk"
+hostmakedepends="openjdk"
 makedepends="apache-ant"
-depends="oracle-jre "
+depends="virtual?java-runtime JAI"
 wrksrc="fop-${version}"
 
 conf_files="/etc/fop.conf"
 
-if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-    makedepends+=" JAI"
-    depends+=" JAI"
-elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-    makedepends+=" JAI"
-    depends+=" JAI"
-fi
-
 do_build(){
-    source /etc/profile.d/oracle-jdk.sh
+    export JAVA_HOME=/usr/lib/jvm/openjdk
     ant package
 }