main/icedtea-web: upgrade to 1.5, build against openjdk7

1 files changed, 12 insertions, 13 deletions

diff --git a/main/icedtea-web/APKBUILD b/main/icedtea-web/APKBUILD
index 57ef20cba8..89c4cad16b 100644
--- a/main/icedtea-web/APKBUILD
+++ b/main/icedtea-web/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=icedtea-web
-pkgver=1.3.2
+pkgver=1.5
 pkgrel=0
 pkgdesc="web integration packages for icedtea"
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 arch="all"
 license="GPL"
-depends=openjdk6-jre
-depends_dev="xulrunner-dev openjdk6 gtk+-dev nspr-dev"
+depends=openjdk7-jre
+depends_dev="xulrunner-dev openjdk7 gtk+-dev nspr-dev"
 makedepends="tar zip $depends_dev"
 install=""
 subpackages="$pkgname-mozilla $pkgname-doc"
@@ -19,7 +19,6 @@ _builddir="$srcdir"/icedtea-web-$pkgver
 prepare() {
         local i
         cd "$_builddir"
-        update_config_sub || return 1
         for i in $source; do
                 case $i in
                 *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -32,13 +31,13 @@ build() {
         ./configure \
                 --build=$CBUILD \
                 --host=$CHOST \
-                --prefix=/usr/lib/jvm/java-1.6-openjdk \
+                --prefix=/usr/lib/jvm/java-1.7-openjdk \
                 --datarootdir=/usr/share \
                 --sysconfdir=/etc \
                 --mandir=/usr/share/man \
                 --infodir=/usr/share/info \
                 --localstatedir=/var \
-                --with-jdk-home=/usr/lib/jvm/java-1.6-openjdk \
+                --with-jdk-home=/usr/lib/jvm/java-1.7-openjdk \
                 --with-pkgversion=Alpine \
                 || return 1
         make || return 1
@@ -51,14 +50,14 @@ package() {
 
 mozilla() {
         mkdir -p "$subpkgdir"/usr/lib/mozilla/plugins
-        mkdir -p "$subpkgdir"/usr/lib/jvm/java-1.6-openjdk/lib
-        mv "$pkgdir"/usr/lib/jvm/java-1.6-openjdk/lib/IcedTeaPlugin.so \
-                "$subpkgdir"/usr/lib/jvm/java-1.6-openjdk/lib
-        ln -sf /usr/lib/jvm/java-1.6-openjdk/lib/IcedTeaPlugin.so \
+        mkdir -p "$subpkgdir"/usr/lib/jvm/java-1.7-openjdk/lib
+        mv "$pkgdir"/usr/lib/jvm/java-1.7-openjdk/lib/IcedTeaPlugin.so \
+                "$subpkgdir"/usr/lib/jvm/java-1.7-openjdk/lib
+        ln -sf /usr/lib/jvm/java-1.7-openjdk/lib/IcedTeaPlugin.so \
                 "$subpkgdir"/usr/lib/mozilla/plugins/libjavaplugin.so
         return 0
 }
 
-md5sums="94ce02c42c1e4d1411357fb3c1014f67  icedtea-web-1.3.2.tar.gz"
-sha256sums="bd25d9a9565271b716e54a19ffe8e34ab339666f72c99da743155320b9ac27f0  icedtea-web-1.3.2.tar.gz"
-sha512sums="5bf09819c7ce855c5c05b27589afbef14a209174d9de2e7ad6d1a7c7ee90e98efe5498718becca046c9aca8525d5fea9636819ccc4b9b18f38f15103d66bcd16  icedtea-web-1.3.2.tar.gz"
+md5sums="a6199869763291879f3a7382b114974c  icedtea-web-1.5.tar.gz"
+sha256sums="1c09f40b873a95c9863178b0f6cd2645fef493cc19d346510655a94948527c2d  icedtea-web-1.5.tar.gz"
+sha512sums="4f665520212012b502434deeb8cb0c27f5d33e88c53052943f50b1e82539a6cd9daaf7488e236e4d7f993dcbc9c498bdee998c21ed4b8058e00307376176be42  icedtea-web-1.5.tar.gz"