[arch-commits] Commit in gjdoc/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Sunday, June 29, 2008 @ 09:04:38
  Author: jgc
Revision: 3698

Merged revisions 2-3697 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gjdoc/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r3684 | jgc | 2008-06-28 21:05:36 +0000 (Sat, 28 Jun 2008) | 2 lines
  
  upgpkg: gjdoc 0.7.9-1
      Remove makedepend on antlr, use antlr binary jar instead. This way we can upgrade or delete antlr. Antlr needs a full java toolchain to build for 3.0
........

Modified:
  gjdoc/repos/extra-i686/	(properties)
  gjdoc/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)


Property changes on: gjdoc/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /gjdoc/trunk:1
   + /gjdoc/trunk:1-3697

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-29 12:44:48 UTC (rev 3697)
+++ extra-i686/PKGBUILD	2008-06-29 13:04:38 UTC (rev 3698)
@@ -2,21 +2,23 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gjdoc
-pkgver=0.7.8
-pkgrel=4
+pkgver=0.7.9
+pkgrel=1
 pkgdesc="GNU Classpath JavaDoc implementation"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://savannah.gnu.org/projects/classpath/"
-depends=('gcc-gcj>=4.3.0')
-makedepends=('antlr')
+depends=('gcc-gcj>=4.3.1')
 options=('!libtool')
-source=(http://ftp.gnu.org/gnu/classpath/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a60c6bb229025120412b8a9d69ef1800')
+noextract=('antlr-2.7.5.jar')
+source=(http://ftp.gnu.org/gnu/classpath/${pkgname}-${pkgver}.tar.gz
+	http://www.antlr2.org/download/antlr-2.7.5.jar)
+md5sums=('24cade2efe22d5adefcbabb21f094803'
+         '6d57df718efd2a03981c309ce3330a1f')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --with-antlr-jar=${startdir}/src/antlr-2.7.5.jar || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${startdir}/pkg install || return 1
 }