From 7d11e9346ebd0f9c378952caee0c82d6ca815f4e Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 8 Jun 2012 00:01:46 +0000
Subject: Fri Jun  8 00:01:46 UTC 2012

---
 libre/apache-ant/PKGBUILD       | 12 +++++++-----
 libre/apache-ant/apache-ant.csh |  3 +--
 libre/your-freedom/PKGBUILD     |  5 +++--
 3 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'libre')

diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD
index b6b429442..77e0dfe94 100644
--- a/libre/apache-ant/PKGBUILD
+++ b/libre/apache-ant/PKGBUILD
@@ -3,13 +3,13 @@
 # Contributor: Andrew Wright <andreww@photism.org>
 
 pkgname=apache-ant
-pkgver=1.8.2
+pkgver=1.8.4
 
 provides=("apache-ant-libre=$pkgver")
 replaces=("apache-ant-libre")
 conflicts=("apache-ant-libre")
 
-pkgrel=4.2
+pkgrel=1.1
 pkgdesc="A Java-based build tool"
 arch=('any')
 license=('Apache')
@@ -64,12 +64,14 @@ build() {
     ln -sf ${jar%::*} lib/optional/`basename ${jar/*::}`
   done
   # Build
+  source "/etc/profile.d/jdk.sh"   # Get the JAVA_HOME env var
   sh build.sh -Ddist.dir="${srcdir}"/${pkgname}-${pkgver}-bin dist
 }
 
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}-bin
-  source "${srcdir}"/${pkgname}.sh   # Get the ANT_HOME env var
+  source "${srcdir}"/${pkgname}.sh # Get the ANT_HOME env var
+  source "/etc/profile.d/jdk.sh"   # Get the JAVA_HOME env var
 
   ## Install profile.d script
   install -d "${pkgdir}"/etc/profile.d
@@ -103,6 +105,6 @@ package() {
   ln -sf ${ANT_HOME}/{LICENSE,NOTICE} "${pkgdir}"/usr/share/licenses/${pkgname}
 }
 
-md5sums=('0d9e108afcd15b820150b8085c96d2b1'
+md5sums=('c474fa9d0c35a24037c23b6e476862c1'
          'bd63c881be406f515fc4d22635e8326a'
-         '298e8ba2e99ccda7706113ea37e030f2')
+         'aaa615512cbe1ed7f3b62c1ff46802f8')
diff --git a/libre/apache-ant/apache-ant.csh b/libre/apache-ant/apache-ant.csh
index 490a17b65..fdc04b2f8 100644
--- a/libre/apache-ant/apache-ant.csh
+++ b/libre/apache-ant/apache-ant.csh
@@ -1,3 +1,2 @@
 #!/bin/csh
-setenv ANT_HOME /usr/share/java/apache-ant
-setenv PATH ${PATH}:${ANT_HOME}/bin
+setenv ANT_HOME /opt/apache-ant
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 84a6f47fa..840a7f922 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Parabola Project <dev@list.parabolagnulinux.org>
 pkgname=your-freedom
 pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=1
+pkgrel=3
 pkgdesc="This package conflicts with every unfree package known to date to ensure your system is free."
 arch=('any')
 url="https://parabolagnulinux.org"
@@ -23,4 +23,5 @@ package() {
         sort -u
         ))
 }
-md5sums=('0025025765e754425e381e8e2d136740')
+
+md5sums=('e2527b2b2bada2b4115f72bccef281c3')
-- 
cgit v1.2.3-54-g00ecf