Merge pull request #447 from onekk/master

Modified Package: apache-fop, better directory splitting

srcpkgs/apache-fop/INSTALL

@@ -15,7 +15,7 @@ post)
   it is preconfigured as follow:
 
   FOP_OPTS="-Xmx512m"
-  FOP_HOME="/usr/share/fop-1.1"
+  FOP_HOME="/usr/share/fop"
   
   note in FOPS_OPTS="-Xmx<your memory size>m" is preconfigured as 512 Mb
   if you want use a different amount of memory modify it according your
@@ -25,7 +25,7 @@ post)
   the part that produce the documentations reside in a different file in
   XML format, see an example in:
 
-  /usr/share/fop-<version>/conf/
+  /usr/share/doc/fop/conf/
 
   For hint about this configurations see the proper page at:
 
@@ -38,11 +38,9 @@ post)
   In this package I've included the full documentation in HTML format
   in:
 
-  /usr/share/fop-<version>/javadocs/
+  /usr/share/doc/fop/javadocs/ 
 
-  Happy FOPping!
+ =============
-
-=====================================================================
 
   You may need to reboot to ensure that PATH is update correctly,
   for the impatients, if you want you can type
@@ -51,13 +49,28 @@ post)
 
   and check the PATH.
 
-=====================================================================
+ =============
+
+  The dictionaries for the hyphenationa are available on the package:
+
+  offo-hyphenation
+
+  The package install it in:
+
+  /usr/share/fop/lib
+
+  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-<version>/lib/ for the licenses of this parts
+  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/files/README.void

@@ -0,0 +1,52 @@
+README.void
+
+Information about the Apache-FOP installation in Void Linux.
+
+  The FOP configuration file is in :
+
+  /etc/fop.conf
+
+  it is preconfigured as follow:
+
+  FOP_OPTS="-Xmx512m"
+  FOP_HOME="/usr/share/fop"
+  
+  The memory used by FOP is stated in FOPS_OPTS="-Xmx<your memory size>m"
+  It is usually set to limit the memory used by the application 
+  and the maximun value must be the memory installed in your system.
+  The supplied configuration file preconfigure it at 512 Mb. Modify it
+  according to your needs. 
+  
+  According to my limited knowledge of FOP the configuration file for
+  the part that produce the documentations reside in a different file in
+  XML format, see an example in:
+
+  /usr/share/fop/conf/
+
+  For hint about this configurations see the proper page at:
+
+  http://xmlgraphics.apache.org/fop/1.1/configuration.html
+
+  For hints on usign fop see:
+
+  http://wiki.apache.org/xmlgraphics-fop/FrontPage
+
+  In this package I've included the full documentation in HTML format
+  in:
+
+  /usr/share/doc/fop-${version}/javadocs/ 
+
+
+  HYPHENATION DICTIONARIES
+
+  The dictionaries for the hyphenationa are available on the package:
+
+  offo-hyphenation
+
+  The package install it's jar file in /usr/share/fop/lib see the 
+  offo-hyphenation documentation for more info. 	
+
+  Some part of the libraries used by FOP are not licensed under Apache-2.0,
+  see in /usr/share/fop/lib/ for the detailed licenses.
+
+  Happy FOPping!

srcpkgs/apache-fop/template

@@ -1,7 +1,7 @@
 # Template file for 'apache-fop'
 pkgname="apache-fop"
 version="1.1"
-revision=2
+revision=3
 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"
@@ -13,7 +13,7 @@ hostmakedepends="jdk"
 makedepends="apache-ant"
 depends="jre "
 wrksrc="fop-${version}"
-_prefix="usr/share/fop"  
+
 conf_files="/etc/fop.conf"
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
@@ -30,26 +30,28 @@ do_build(){
 }
 
 do_install() {
+    _prefix="usr/share/fop" 
+    _docs="usr/share/doc/fop-${version}"
     vmkdir ${_prefix}
+    vmkdir ${_docs}
     vmkdir ${_prefix}/build
     vcopy "build/fop*.jar" ${_prefix}/build
     vmkdir ${_prefix}/lib
     vcopy "lib/*" ${_prefix}/lib
-    vmkdir ${_prefix}/conf
+    vmkdir ${_docs}/conf
-    vcopy "conf/*" ${_prefix}/conf
+    vcopy "conf/*" ${_docs}/conf
-    vmkdir ${_prefix}/examples
+    vmkdir ${_docs}/examples
-    vcopy "examples/*" ${_prefix}/examples
+    vcopy "examples/*" ${_docs}/examples
-    vmkdir ${_prefix}/hyph
+    vmkdir ${_docs}/javadocs
-    vcopy "hyph/*" ${_prefix}/hyph
+    vcopy "build/javadocs/*" ${_docs}/javadocs
-    vmkdir ${_prefix}/javadocs
-    vcopy "build/javadocs/*" ${_prefix}/javadocs
     vcopy fop ${_prefix}
     vcopy fop.js ${_prefix}
-    vcopy KEYS ${_prefix}
+    vcopy KEYS ${_docs}
-    vcopy LICENSE ${_prefix}
+    vcopy LICENSE ${_docs}
-    vcopy NOTICE ${_prefix}
+    vcopy NOTICE ${_docs}
-    vcopy README ${_prefix}
+    vcopy README ${_docs}
     vcopy status.xml ${_prefix}
+    vcopy ${FILESDIR}/README.void ${_docs}
     vinstall ${FILESDIR}/fop.conf 644 etc/
     #create a handy symlink
     vmkdir usr/bin