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..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" @@ -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 }