From 361d6ff17fc6f0099a6ce160ed9c6c8768357ad3 Mon Sep 17 00:00:00 2001 From: onekk Date: Wed, 18 Jun 2014 11:35:12 +0200 Subject: [PATCH 1/2] Modified Package: Apache-fop modified directory eliminating the version so it is easy to add library or other thing to it especially hyphenation patterns without bother to the installation directory, the management is done through the ${version} in the template file Regards Carlo --- srcpkgs/apache-fop/files/fop.conf | 2 +- srcpkgs/apache-fop/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/apache-fop/files/fop.conf b/srcpkgs/apache-fop/files/fop.conf index 8c5ef85b50e..7d9194ddb83 100644 --- a/srcpkgs/apache-fop/files/fop.conf +++ b/srcpkgs/apache-fop/files/fop.conf @@ -1,2 +1,2 @@ FOP_OPTS="-Xmx512m" -FOP_HOME="/usr/share/fop-1.1" +FOP_HOME="/usr/share/fop" diff --git a/srcpkgs/apache-fop/template b/srcpkgs/apache-fop/template index 15f153dcd25..22fdae3b523 100644 --- a/srcpkgs/apache-fop/template +++ b/srcpkgs/apache-fop/template @@ -13,7 +13,7 @@ hostmakedepends="jdk" makedepends="apache-ant" depends="jre " wrksrc="fop-${version}" -_prefix="usr/share/fop-${version}" +_prefix="usr/share/fop" conf_files="/etc/fop.conf" if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then @@ -53,6 +53,6 @@ do_install() { vinstall ${FILESDIR}/fop.conf 644 etc/ #create a handy symlink vmkdir usr/bin - ln -sf /usr/share/fop-${version}/fop $DESTDIR/usr/bin/fop + ln -sf /usr/share/fop/fop $DESTDIR/usr/bin/fop } From 7ce27c0c6aa4f4f34dcb51b63b6ef9feca236ebc Mon Sep 17 00:00:00 2001 From: onekk Date: Wed, 18 Jun 2014 11:55:47 +0200 Subject: [PATCH 2/2] Apche-fop: fixed version --- srcpkgs/apache-fop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/apache-fop/template b/srcpkgs/apache-fop/template index 22fdae3b523..12de60237e0 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=1 +revision=2 short_desc="Java print formatter driven by XSL formatting objects (XSL-FO) and an output independent formatter" maintainer="Carlo Dormeletti " license="Apache-2.0"