bump to 0.97.1, removed patch as it has been already applied in upstream revision...

also fix change in package path that prevented patches from being applied

diff --git a/package/java/classpath/classpath-avr32-endianness.patch b/package/java/classpath/classpath-avr32-endianness.patch
deleted file mode 100644 (file)
index 2bb25dd..0000000
--- a/package/java/classpath/classpath-avr32-endianness.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -rup ../classpath-0.96.1.default/ChangeLog ./ChangeLog
---- ../classpath-0.96.1.default/ChangeLog       2007-10-16 17:35:33.000000000
-+0200
-+++ ./ChangeLog 2007-12-18 09:36:39.000000000 +0100
-@@ -1,3 +1,7 @@
-+2007-12-18  Leen Toelen  <toelen@gmail.com>
-+
-+       * native/fdlibm/ieeefp.h: Added avr32 support
-+
- 2007-10-16  Mark Wielaard  <mark@klomp.org>
-
-        * NEWS: Mention small compile/configure/build fixes.
-diff -rup ../classpath-0.96.1.default/native/fdlibm/ieeefp.h
-./native/fdlibm/ieeefp.h
---- ../classpath-0.96.1.default/native/fdlibm/ieeefp.h  2006-04-19
-19:55:13.000000000 +0200
-+++ ./native/fdlibm/ieeefp.h    2007-12-18 09:32:55.000000000 +0100
-@@ -87,6 +87,10 @@
- #define __IEEE_LITTLE_ENDIAN
- #endif
-
-+#ifdef __AVR32__
-+#define __IEEE_BIG_ENDIAN
-+#endif
-+
- #ifdef __MIPSEL__
- #define __IEEE_LITTLE_ENDIAN
- #endif
-

diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk
index dfb69bea588a0c7b14ade1af638c4f70ff53acd4..cd9cc3565f50323a025623a146983bfe79e5b4ee 100644 (file)
--- a/package/java/classpath/classpath.mk
+++ b/package/java/classpath/classpath.mk
@@ -3,14 +3,15 @@
 # classpath 0.96.1
 #
 #############################################################
-CLASSPATH_VERSION = 0.96.1
+CLASSPATH_VERSION = 0.97.1
 CLASSPATH_SOURCE = classpath-$(CLASSPATH_VERSION).tar.gz
 CLASSPATH_SITE = $(BR2_GNU_MIRROR)/classpath
 CLASSPATH_AUTORECONF = NO
 CLASSPATH_INSTALL_STAGING = YES
 CLASSPATH_INSTALL_TARGET = YES
 CLASSPATH_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install 
-CLASSPATH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install 
+CLASSPATH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+CLASSPATH_DIR_PREFIX = package/java
 
 CLASSPATH_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
                glib_cv_uscore=no ac_cv_func_strtod=yes \
@@ -91,4 +92,4 @@ endif
 
 
 
-$(eval $(call AUTOTARGETS,package,classpath))
+$(eval $(call AUTOTARGETS,package/java,classpath))

diff --git a/package/java/concierge/concierge.mk b/package/java/concierge/concierge.mk
index 8d7d76b65cf7a6b03c2bf768c11ca48f9cdcd7e7..68ca4165dc0f6ce55e691c6db4e3c7c1362ba3a4 100644 (file)
--- a/package/java/concierge/concierge.mk
+++ b/package/java/concierge/concierge.mk
@@ -10,19 +10,20 @@ CONCIERGE_DIR=$(BUILD_DIR)/concierge-$(CONCIERGE_VERSION)
 CONCIERGE_SITE_BUNDLES = http://concierge.sourceforge.net/bundles/
 
 $(DL_DIR)/concierge:
-       mkdir -p $(DL_DIR)/concierge/
-       $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE)/concierge-$(CONCIERGE_VERSION).jar
-       $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)shell-1.0.0.RC2.jar
-       $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)service-tracker-1.0.0.RC2.jar
-       $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)event-admin-1.0.0.RC2.jar
+        mkdir -p $(DL_DIR)/concierge/
+        $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE)/concierge-$(CONCIERGE_VERSION).jar
+        $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)shell-1.0.0.RC2.jar
+        $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)service-tracker-1.0.0.RC2.jar
+        $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)event-admin-1.0.0.RC2.jar
 
 $(TARGET_DIR)/usr/lib/concierge/: $(DL_DIR)/concierge
+       mkdir -p $(TARGET_DIR)/usr/lib
        mkdir -p $(TARGET_DIR)/usr/lib/concierge
        cp -dpf $(DL_DIR)/concierge/* $(TARGET_DIR)/usr/lib/concierge/
        cp -dpf package/concierge/files/init.xargs $(TARGET_DIR)/usr/lib/concierge/
        touch -c $@
 
-$(TARGET_DIR)/usr/bin/concierge:
+$(TARGET_DIR)/usr/bin/concierge: 
        cp -dpf package/concierge/files/concierge $(TARGET_DIR)/usr/bin/
        chmod +x $(TARGET_DIR)/usr/bin/concierge
        touch -c $@

diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk
index f2dae14f479cea8a8dcf0a4ac11bdf7e99dfd3e5..8beb20aaecf9c0bcdb213598dcb30a6e48498e19 100644 (file)
--- a/package/java/jamvm/jamvm.mk
+++ b/package/java/jamvm/jamvm.mk
@@ -11,6 +11,7 @@ JAMVM_INSTALL_STAGING = YES
 JAMVM_INSTALL_TARGET = YES
 JAMVM_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
 JAMVM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+JAMVM_DIR_PREFIX = package/java
 
 JAMVM_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
                glib_cv_uscore=no ac_cv_func_strtod=yes \
@@ -102,4 +103,4 @@ ifeq ($(BR2_avr32),y)
                CC="$(STAGING_DIR)/usr/bin/avr32-linux-gcc"
 endif
 
-$(eval $(call AUTOTARGETS,package,jamvm))
+$(eval $(call AUTOTARGETS,package/java,jamvm))