From 2cb8f699f7ad31a1cadb29a4c01639b9c799539a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 26 Aug 2014 10:25:14 +0200
Subject: update to latest stable version

---
 package/classpath/Makefile                    | 14 ++++++++------
 package/classpath/patches/classpath-fix.patch |  6 +++---
 package/classpath/patches/patch-configure     | 11 -----------
 3 files changed, 11 insertions(+), 20 deletions(-)
 delete mode 100644 package/classpath/patches/patch-configure

(limited to 'package/classpath')

diff --git a/package/classpath/Makefile b/package/classpath/Makefile
index f7652d00e..824899b71 100644
--- a/package/classpath/Makefile
+++ b/package/classpath/Makefile
@@ -4,20 +4,21 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		classpath
-PKG_VERSION:=		0.98
+PKG_VERSION:=		0.99
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		90c6571b8b0309e372faa0f9f6255ea9
+PKG_MD5SUM:=		0ae1571249172acd82488724a3b8acb4 acfa69f928a0f1653555bda73091efca
 PKG_DESCR:=		java classpath
 PKG_SECTION:=		dev/tools
 PKG_BUILDDEP:=		gtk+ gdk-pixbuf orbit2 gconf
 PKG_DEPENDS:=		libgtk gdk-pixbuf orbit2 gconf
+HOST_BUILDDEP:=		gcj-host ecj-host
 PKG_URL:=		http://www.gnu.org/software/classpath/home.html
-PKG_SITES:=		${MASTER_SITE_GNU:=classpath/}
+PKG_SITES:=		ftp.gnu.org/classpath/ \
+			http://www.antlr3.org/download/
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz antlr-3.5.2-complete.jar
 
 PKG_HOST_DEPENDS:=	linux
-PKG_ARCH_DEPENDS:=	!arm
 
 include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
@@ -26,7 +27,8 @@ $(eval $(call HOST_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 HOST_CONFIGURE_ARGS+=	--disable-plugin \
-			--disable-tools \
+			--enable-tools \
+			--with-antlr-jar=${WRKBUILD}/antlr-3.5.2-complete.jar \
 			--disable-examples \
 			--disable-gtk-peer \
 			--disable-gconf-peer \
diff --git a/package/classpath/patches/classpath-fix.patch b/package/classpath/patches/classpath-fix.patch
index e03eb2342..80fef0f35 100644
--- a/package/classpath/patches/classpath-fix.patch
+++ b/package/classpath/patches/classpath-fix.patch
@@ -1,7 +1,7 @@
 diff -Nur classpath-0.98.orig//lib/Makefile.in classpath-0.98/lib/Makefile.in
---- classpath-0.98.orig//lib/Makefile.in	2009-02-06 02:01:32.000000000 +0100
-+++ classpath-0.98/lib/Makefile.in	2011-08-05 22:55:25.965284504 +0200
-@@ -272,7 +272,7 @@
+--- classpath-0.99.orig/lib/Makefile.in	2012-03-09 00:54:14.000000000 +0100
++++ classpath-0.99/lib/Makefile.in	2014-08-24 21:21:19.000000000 +0200
+@@ -305,7 +305,7 @@ top_srcdir = @top_srcdir@
  uudecode = @uudecode@
  vm_classes = @vm_classes@
  JAVA_DEPEND = java.dep
diff --git a/package/classpath/patches/patch-configure b/package/classpath/patches/patch-configure
deleted file mode 100644
index df2f41eae..000000000
--- a/package/classpath/patches/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- classpath-0.98.orig/configure	2009-02-06 02:01:30.000000000 +0100
-+++ classpath-0.98/configure	2011-04-11 17:08:29.347661221 +0200
-@@ -30403,7 +30403,7 @@ fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gmp___gmpz_mul_si" >&5
- $as_echo "$ac_cv_lib_gmp___gmpz_mul_si" >&6; }
- if test "x$ac_cv_lib_gmp___gmpz_mul_si" = x""yes; then
--  GMP_CFLAGS=-I/usr/include
-+  GMP_CFLAGS=
-        GMP_LIBS=-lgmp
- else
-   GMP_CFLAGS=
-- 
cgit v1.2.3