From 8616b643678ee1d93d18b347ae01abe893950738 Mon Sep 17 00:00:00 2001 From: onekk Date: Fri, 20 Jun 2014 12:26:30 +0200 Subject: [PATCH 1/2] Modified Package: apache-fop more correctness in files distribution in the various directory. Created /usr7share/doc/fop-${version} and modified INSTALL file. Added README.void. Regards Carlo --- srcpkgs/apache-fop/INSTALL | 29 ++++++++++---- srcpkgs/apache-fop/files/README.void | 60 ++++++++++++++++++++++++++++ srcpkgs/apache-fop/template | 30 +++++++------- 3 files changed, 97 insertions(+), 22 deletions(-) create mode 100644 srcpkgs/apache-fop/files/README.void diff --git a/srcpkgs/apache-fop/INSTALL b/srcpkgs/apache-fop/INSTALL index 4704d521c56..b2afdc09bf0 100644 --- a/srcpkgs/apache-fop/INSTALL +++ b/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="-Xmxm" 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-/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-/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-/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 diff --git a/srcpkgs/apache-fop/files/README.void b/srcpkgs/apache-fop/files/README.void new file mode 100644 index 00000000000..1f4027a41c3 --- /dev/null +++ b/srcpkgs/apache-fop/files/README.void @@ -0,0 +1,60 @@ + +- FOP environment configuration file is: + + /etc/fop.conf + + it is preconfigured as follow: + + FOP_OPTS="-Xmx512m" + FOP_HOME="/usr/share/fop" + + note in FOPS_OPTS="-Xmxm" is preconfigured as 512 Mb + if you want use a different amount of memory modify it according 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/fop/javadocs/ + + ============= + + You may need to reboot to ensure that PATH is update correctly, + for the impatients, if you want you can type + + $ source /etc/profile + + 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/lib/ for the licenses of this parts + of code that for convenience are in the distribution of FOP. + + Happy FOPping! diff --git a/srcpkgs/apache-fop/template b/srcpkgs/apache-fop/template index 12de60237e0..330154daab0 100644 --- a/srcpkgs/apache-fop/template +++ b/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 " 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 - vcopy "conf/*" ${_prefix}/conf - vmkdir ${_prefix}/examples - vcopy "examples/*" ${_prefix}/examples - vmkdir ${_prefix}/hyph - vcopy "hyph/*" ${_prefix}/hyph - vmkdir ${_prefix}/javadocs - vcopy "build/javadocs/*" ${_prefix}/javadocs + vmkdir ${_docs}/conf + vcopy "conf/*" ${_docs}/conf + vmkdir ${_docs}/examples + vcopy "examples/*" ${_docs}/examples + vmkdir ${_docs}/javadocs + vcopy "build/javadocs/*" ${_docs}/javadocs vcopy fop ${_prefix} vcopy fop.js ${_prefix} - vcopy KEYS ${_prefix} - vcopy LICENSE ${_prefix} - vcopy NOTICE ${_prefix} - vcopy README ${_prefix} + vcopy KEYS ${_docs} + vcopy LICENSE ${_docs} + vcopy NOTICE ${_docs} + 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 From 73d3988588d3857bce046f4980d1f5eed1708de9 Mon Sep 17 00:00:00 2001 From: onekk Date: Fri, 20 Jun 2014 15:33:41 +0200 Subject: [PATCH 2/2] Some more editing to apache-fop --- srcpkgs/apache-fop/files/README.void | 40 +++++++++++----------------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/srcpkgs/apache-fop/files/README.void b/srcpkgs/apache-fop/files/README.void index 1f4027a41c3..c53624dcc68 100644 --- a/srcpkgs/apache-fop/files/README.void +++ b/srcpkgs/apache-fop/files/README.void @@ -1,5 +1,8 @@ +README.void -- FOP environment configuration file is: +Information about the Apache-FOP installation in Void Linux. + + The FOP configuration file is in : /etc/fop.conf @@ -8,10 +11,12 @@ FOP_OPTS="-Xmx512m" FOP_HOME="/usr/share/fop" - note in FOPS_OPTS="-Xmxm" is preconfigured as 512 Mb - if you want use a different amount of memory modify it according your - needs. - + The memory used by FOP is stated in FOPS_OPTS="-Xmxm" + 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: @@ -29,32 +34,19 @@ In this package I've included the full documentation in HTML format in: - /usr/share/fop/javadocs/ + /usr/share/doc/fop-${version}/javadocs/ - ============= - You may need to reboot to ensure that PATH is update correctly, - for the impatients, if you want you can type - - $ source /etc/profile - - and check the PATH. - - ============= + HYPHENATION DICTIONARIES The dictionaries for the hyphenationa are available on the package: offo-hyphenation - The package install it in: + The package install it's jar file in /usr/share/fop/lib see the + offo-hyphenation documentation for more info. - /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/lib/ for the licenses of this parts - of code that for convenience are in the distribution of FOP. + 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!