[arch-commits] Commit in java-gcj-compat/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Tuesday, September 2, 2008 @ 02:19:54
  Author: andyrtr
Revision: 11738

upgpkg: java-gcj-compat 1.0.78-1

Modified:
  java-gcj-compat/trunk/PKGBUILD

----------+
 PKGBUILD |   53 +++++++++++++++++++++++++----------------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-02 05:51:13 UTC (rev 11737)
+++ PKGBUILD	2008-09-02 06:19:54 UTC (rev 11738)
@@ -2,13 +2,13 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=java-gcj-compat
-pkgver=1.0.77
-pkgrel=4
+pkgver=1.0.78
+pkgrel=1
 pkgdesc="Wrapper package to wrap free tools into a java 1.5.0.0 compatible java environment"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.eclipse.org/"
-depends=('gcc-gcj>=4.3.1' 'gjdoc>=0.7.8-4')
+depends=('gcc-gcj>=4.3.2' 'gjdoc>=0.7.9')
 makedepends=('perl' 'python')
 provides=('java-environment' 'java-runtime')
 conflicts=('java-environment' 'java-runtime')
@@ -16,27 +16,27 @@
 	java-gcj-compat.profile
 	ca-bundle.crt)
 options=('!makeflags')
-md5sums=('cafa8e490957ad2c56fc61802332e9a4'
+md5sums=('03d8e7e4a52608878600cd16f5c8454a'
          'eee3645b754a5dc77644e8973c077c0e'
          '02410297423b187bd4c6e6e295314e4c')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   sed -i -e 's/sinjdoc/gjdoc/g' Makefile.* || return 1
   sed -i -e 's/fastjar/gjar/g' Makefile.* || return 1
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  mkdir -p ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib
-  mkdir -p ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib
-  mkdir -p ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/include
-  ln -s /usr/share/java/libgcj-4.?.jar ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/rt.jar
-  ln -s /usr/share/java/libgcj-tools-4.?.jar ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib/tools.jar
-  ln -s /usr/lib/gcj-4.?/libjawt.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib/
-  ln -s /usr/lib/libgcj*.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib/
-  ln -s /usr/lib/libgij.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib/
+  make DESTDIR=${pkgdir} install
+  mkdir -p ${pkgdir}/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib
+  mkdir -p ${pkgdir}/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib
+  mkdir -p ${pkgdir}/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/include
+  ln -s /usr/share/java/libgcj-4.?.jar ${pkgdir}/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/rt.jar
+  ln -s /usr/share/java/libgcj-tools-4.?.jar ${pkgdir}/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib/tools.jar
+  ln -s /usr/lib/gcj-4.?/libjawt.so ${pkgdir}/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib/
+  ln -s /usr/lib/libgcj*.so ${pkgdir}/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib/
+  ln -s /usr/lib/libgij.so ${pkgdir}/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib/
   for i in jni.h jni_md.h jawt.h jawt_md.h gcj; do
-    ln -s `gcj -print-file-name=include/${i}` ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/include/
+    ln -s `gcj -print-file-name=include/${i}` ${pkgdir}/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/include/
   done
 
   if [ "${CARCH}" = "x86_64" ]; then
@@ -44,20 +44,17 @@
   else
     _arch=i386
   fi
-  mkdir -p ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/${_arch}/{client,server}
-  ln -s /usr/lib/gcj-4.?/libjvm.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/${_arch}/client/
-  ln -s /usr/lib/gcj-4.?/libjvm.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/${_arch}/server/
-  ln -s /usr/lib/gcj-4.?/libjawt.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/${_arch}/
+  mkdir -p ${pkgdir}/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/${_arch}/{client,server}
+  ln -s /usr/lib/gcj-4.?/libjvm.so ${pkgdir}/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/${_arch}/client/
+  ln -s /usr/lib/gcj-4.?/libjvm.so ${pkgdir}/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/${_arch}/server/
+  ln -s /usr/lib/gcj-4.?/libjawt.so ${pkgdir}/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/${_arch}/
 
-  mkdir -p ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/security
-  sed -i -e "s|/etc/pki/tls/cert.pem|${startdir}/src/ca-bundle.crt|" generate-cacerts.pl || return 1
+  mkdir -p ${pkgdir}/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/security
+  sed -i -e "s|/etc/pki/tls/cert.pem|${srcdir}/ca-bundle.crt|" generate-cacerts.pl || return 1
   perl generate-cacerts.pl || return 1
-  install -m644 cacerts ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/security/cacerts
+  install -m644 cacerts ${pkgdir}/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/security/cacerts
 
 
-  mkdir -p ${startdir}/pkg/etc/profile.d
-  install -m755 ${startdir}/src/java-gcj-compat.profile ${startdir}/pkg/etc/profile.d/java-gcj-compat.sh
-
-  mkdir -p ${startdir}/pkg/usr/lib/mozilla/plugins
-  ln -sf /usr/lib/gcj-4.?/libgcjwebplugin.so ${startdir}/pkg/usr/lib/mozilla/plugins/
+  mkdir -p ${pkgdir}/etc/profile.d
+  install -m755 ${srcdir}/java-gcj-compat.profile ${pkgdir}/etc/profile.d/java-gcj-compat.sh
 }