diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-21 11:13:53 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-21 11:13:53 -0300 |
| commit | 0fc81a2f2d55fa67c0c719ec87371f0cce0dc344 (patch) | |
| tree | f615e5bac43a9f0977a687dffc56a866624fddf3 /extra/openjdk6 | |
| parent | 65d9286f54bc65d71cf50737006c9d4c08512070 (diff) | |
| parent | 1b21445a8e9097b0bb0542ed847fbb1eb832848f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/haskell-hslogger/PKGBUILD
Diffstat (limited to 'extra/openjdk6')
| -rw-r--r-- | extra/openjdk6/PKGBUILD | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index 9d178ac62..c9e2aa45d 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 132227 2011-07-21 17:20:32Z andyrtr $ +# $Id: PKGBUILD 140782 2011-10-19 08:19:12Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -6,7 +6,7 @@ pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" #_date=20100715 _javaver=6 -_icedteaver=1.10.3 +_icedteaver=1.10.4 _openjdk_version=b22 _openjdk_date=28_feb_2011 #pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date} @@ -31,8 +31,11 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar nonreparenting-wm.diff openjdk6.profile openjdk6.profile.csh) -noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz) -md5sums=('0a1301785e9826d7c87ed7e8b10a6985' +noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz + jaxp144_01.zip + jdk6-jaxws-b20.zip + jdk6-jaf-b20.zip) +md5sums=('c381d987f8d2facece8c54e98fd547f8' '2d2bbbb0f9b81f1fec41ec730da8a933' 'ef7a8b3624ea904bf584bc46d79b5e75' '91adfd41e6f001add4f92ae31216b1e3' @@ -168,7 +171,7 @@ package_openjdk6() { install -m755 ${srcdir}/openjdk6.profile.csh ${pkgdir}/etc/profile.d/openjdk6.csh # install license - install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } package_openjdk6-src() { |