Update to 2.3.3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1695 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 14 insertions, 66 deletions

diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile
index db431b8fd..fea566527 100644
--- a/x11-toolkits/libgtk-java/Makefile
+++ b/x11-toolkits/libgtk-java/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgtk-java
-PORTVERSION=	2.3.2
+PORTVERSION=	2.3.3
 CATEGORIES=	x11-toolkits java
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
diff --git a/x11-toolkits/libgtk-java/distinfo b/x11-toolkits/libgtk-java/distinfo
index 35a5db6fa..236091fa8 100644
--- a/x11-toolkits/libgtk-java/distinfo
+++ b/x11-toolkits/libgtk-java/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgtk-java-2.3.2.tar.bz2) = 2172452a6b500112094917c850bd0d5d
+MD5 (gnome2/libgtk-java-2.3.3.tar.bz2) = 65665f51a03543a251cb8a0a99954c72
diff --git a/x11-toolkits/libgtk-java/files/patch-gtk_src_Makefile.in b/x11-toolkits/libgtk-java/files/patch-gtk_src_Makefile.in
index 01cd6ac45..bb499db74 100644
--- a/x11-toolkits/libgtk-java/files/patch-gtk_src_Makefile.in
+++ b/x11-toolkits/libgtk-java/files/patch-gtk_src_Makefile.in
@@ -1,6 +1,15 @@
---- gtk/src/Makefile.in.orig	Tue Dec 23 00:13:53 2003
-+++ gtk/src/Makefile.in	Tue Dec 23 00:24:04 2003
-@@ -146,7 +144,7 @@
+--- gtk/src/Makefile.in.orig	Thu Jan 22 02:59:16 2004
++++ gtk/src/Makefile.in	Thu Jan 22 03:36:50 2004
+@@ -136,7 +136,7 @@
+ COMPILED_CLASSES:=$(shell echo $(CLASSES) | sed -e 's=\.class=\.o=g' )
+ 
+ ../lib/gtk${gtkapiversion}.jar: $(CLASSES)
+-	@(cd build-java; $(JAR) cf ../../lib/gtk${gtkapiversion}-${gtkversion}.jar `find -name "*.class"` )
++	@(cd build-java; $(JAR) cf ../../lib/gtk${gtkapiversion}-${gtkversion}.jar `find . -name "*.class"` )
+ 	@(cd ../lib; test ! -L gtk${gtkapiversion}.jar && ln -s gtk${gtkapiversion}-${gtkversion}.jar gtk${gtkapiversion}.jar) || exit 0
+ 
+ jar: dirs ../lib/gtk${gtkapiversion}.jar
+@@ -146,7 +146,7 @@
  	@(test ! -d ../lib && mkdir ../lib) || exit 0
  	$(CC) $(CFLAGS) -shared -o ../lib/libgtkjava${gtkapiversion}.so.${gtkversion} \
  		$(OBJECTS) \
diff --git a/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_Action.c b/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_Action.c
deleted file mode 100644
index dcffad8c1..000000000
--- a/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_Action.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- gtk/src/jni/org_gnu_gtk_Action.c.orig	Mon Jan  5 13:06:32 2004
-+++ gtk/src/jni/org_gnu_gtk_Action.c	Mon Jan  5 13:07:18 2004
-@@ -115,11 +115,13 @@
-   (JNIEnv *env, jclass cls, jint action)
- {
- 	GSList *list = gtk_action_get_proxies((GtkAction*)action);
-+	guint len;
-+	jintArray ar;
-+	int i = 0;
- 	if (NULL == list)
- 		return NULL;
--	 guint len = g_slist_length(list);
--	 jintArray ar = (*env)->NewIntArray(env, len);
--	 int i = 0;
-+	 len = g_slist_length(list);
-+	 ar = (*env)->NewIntArray(env, len);
- 	for (i = 0; i < len; i++) {
- 		GSList *item = g_slist_nth(list, i);
- 		(*env)->SetIntArrayRegion(env, ar, i, 1, (jint*)item->data);
diff --git a/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_ActionGroup.c b/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_ActionGroup.c
deleted file mode 100644
index 87a5bef5f..000000000
--- a/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_ActionGroup.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- gtk/src/jni/org_gnu_gtk_ActionGroup.c.orig	Mon Jan  5 13:09:08 2004
-+++ gtk/src/jni/org_gnu_gtk_ActionGroup.c	Mon Jan  5 13:09:35 2004
-@@ -76,11 +76,13 @@
-   (JNIEnv *env, jclass cls, jint group)
- {
- 	GList *list = gtk_action_group_list_actions((GtkActionGroup*)group);
-+	guint len;
-+	jintArray ar;
-+	int i = 0;
- 	if (NULL == list)
- 		return NULL;
--	 guint len = g_list_length(list);
--	 jintArray ar = (*env)->NewIntArray(env, len);
--	 int i = 0;
-+	 len = g_list_length(list);
-+	 ar = (*env)->NewIntArray(env, len);
- 	for (i = 0; i < len; i++) {
- 		GList *item = g_list_nth(list, i);
- 		(*env)->SetIntArrayRegion(env, ar, i, 1, (jint*)item->data);
diff --git a/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_UIManager.c b/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_UIManager.c
deleted file mode 100644
index 4a6bdf742..000000000
--- a/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_UIManager.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- gtk/src/jni/org_gnu_gtk_UIManager.c.orig	Mon Jan  5 13:16:49 2004
-+++ gtk/src/jni/org_gnu_gtk_UIManager.c	Mon Jan  5 13:17:13 2004
-@@ -92,11 +92,13 @@
-   (JNIEnv *env, jclass cls, jint uim)
- {
- 	GList *list = gtk_ui_manager_get_action_groups((GtkUIManager*)uim);
-+	guint len;
-+	jintArray ar;
-+	int i = 0;
- 	if (NULL == list)
- 		return NULL;
--	 guint len = g_list_length(list);
--	 jintArray ar = (*env)->NewIntArray(env, len);
--	 int i = 0;
-+	 len = g_list_length(list);
-+	 ar = (*env)->NewIntArray(env, len);
- 	for (i = 0; i < len; i++) {
- 		GList *item = g_list_nth(list, i);
- 		(*env)->SetIntArrayRegion(env, ar, i, 1, (jint*)item->data);
diff --git a/x11-toolkits/libgtk-java/pkg-message b/x11-toolkits/libgtk-java/pkg-message
index 819988189..c572e5839 100644
--- a/x11-toolkits/libgtk-java/pkg-message
+++ b/x11-toolkits/libgtk-java/pkg-message
@@ -4,8 +4,4 @@ Java applications, you must add the following to your CLASSPATH:
 
 %%JAVAJARDIR%%/gtk%%GTK_API_VERSION%%-%%PORTVERSION%%.jar
 
-Then add the following to your LD_LIBRARY_PATH:
-
-%%PREFIX%%/lib
-
 ************************************************************************