Update to 2.3.2.

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

8 files changed, 66 insertions, 32 deletions

diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile
index e9cb9e4e4..db431b8fd 100644
--- a/x11-toolkits/libgtk-java/Makefile
+++ b/x11-toolkits/libgtk-java/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgtk-java
-PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTVERSION=	2.3.2
 CATEGORIES=	x11-toolkits java
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
@@ -26,7 +25,8 @@ CONFIGURE_ARGS=	--without-gcj-compile \
 		--with-java-prefix=${JAVA_HOME}
 
 GTK_API_VERSION=	2.3
-API_VERSION=		2.5
+PLIST_SUB=		GTK_API_VERSION=${GTK_API_VERSION} \
+			PORTVERSION=${PORTVERSION}
 
 PKGMESSAGE=		${WRKDIR}/pkg-message
 
@@ -34,7 +34,7 @@ do-install:
 	${MKDIR} ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/gtk/lib/libgtkjava${GTK_API_VERSION}.so.${PORTVERSION} \
 		${PREFIX}/lib
-	${LN} -s ${PREFIX}/lib/libgtkjava${GTK_API_VERSION}.so.${PORTVERSION} ${PREFIX}/lib/libgtkjava${API_VERSION}.so
+	${LN} -sf ${PREFIX}/lib/libgtkjava${GTK_API_VERSION}.so.${PORTVERSION} ${PREFIX}/lib/libgtkjava${GTK_API_VERSION}.so
 	${MKDIR} ${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/gtk/lib/gtk${GTK_API_VERSION}-${PORTVERSION}.jar \
 		${JAVAJARDIR}
@@ -42,8 +42,7 @@ do-install:
 post-install:
 	@${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g ; \
 		s|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%GTK_API_VERSION%%|${GTK_API_VERSION}|g ; \
-		s|%%PORTVERSION%%|${API_VERSION}|g' \
+		s|%%GTK_API_VERSION%%|${GTK_API_VERSION}|g' \
 		 < ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/x11-toolkits/libgtk-java/distinfo b/x11-toolkits/libgtk-java/distinfo
index 37c2f3d25..35a5db6fa 100644
--- a/x11-toolkits/libgtk-java/distinfo
+++ b/x11-toolkits/libgtk-java/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgtk-java-2.3.1.tar.bz2) = 53f7f6eaedccb6e8abf98f192db93182
+MD5 (gnome2/libgtk-java-2.3.2.tar.bz2) = 2172452a6b500112094917c850bd0d5d
diff --git a/x11-toolkits/libgtk-java/files/patch-Makefile.in b/x11-toolkits/libgtk-java/files/patch-Makefile.in
deleted file mode 100644
index ef9861ee5..000000000
--- a/x11-toolkits/libgtk-java/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Tue Dec 23 00:25:42 2003
-+++ Makefile.in	Tue Dec 23 00:25:51 2003
-@@ -32,7 +32,7 @@
- 
- install:
- 	for MODULE in $(MODULES); do \
--		$(MAKE) -C $$MODULE install \
-+		$(MAKE) -C $$MODULE install ; \
- 	done
- 
- mostlyclean:
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 10523f38c..01cd6ac45 100644
--- a/x11-toolkits/libgtk-java/files/patch-gtk_src_Makefile.in
+++ b/x11-toolkits/libgtk-java/files/patch-gtk_src_Makefile.in
@@ -1,16 +1,5 @@
 --- gtk/src/Makefile.in.orig	Tue Dec 23 00:13:53 2003
 +++ gtk/src/Makefile.in	Tue Dec 23 00:24:04 2003
-@@ -77,9 +77,7 @@
- .SUFFIXES: .java .class
- 
- .c.o:
--	$(CC) -c $(CFLAGS) $< -o $@ $(JAVA_INCLUDES) $(GTK_CFLAGS) \
--	    $(LIBGTKHTML_CFLAGS) $(GNOME_CFLAGS) $(LIBGLADE_CFLAGS)
--		#-D@MACRO_FLAG@
-+	$(CC) -c $(CFLAGS) $< -o $@ $(JAVA_INCLUDES) $(GTK_CFLAGS)
- 
- .java.o:
- 	$(GCJ) $(GCJFLAGS) -g -O --classpath=${GCJ_CLASSPATH} -o $@ -c $<
 @@ -146,7 +144,7 @@
  	@(test ! -d ../lib && mkdir ../lib) || exit 0
  	$(CC) $(CFLAGS) -shared -o ../lib/libgtkjava${gtkapiversion}.so.${gtkversion} \
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
new file mode 100644
index 000000000..dcffad8c1
--- /dev/null
+++ b/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_Action.c
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 000000000..87a5bef5f
--- /dev/null
+++ b/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_ActionGroup.c
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 000000000..4a6bdf742
--- /dev/null
+++ b/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_UIManager.c
@@ -0,0 +1,19 @@
+--- 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-plist b/x11-toolkits/libgtk-java/pkg-plist
index b265d1c3c..6786648ca 100644
--- a/x11-toolkits/libgtk-java/pkg-plist
+++ b/x11-toolkits/libgtk-java/pkg-plist
@@ -1,3 +1,3 @@
-lib/libgtkjava2.3.so.2.3.1
-lib/libgtkjava2.5.so
-share/java/classes/gtk2.3-2.3.1.jar
+lib/libgtkjava%%GTK_API_VERSION%%.so.%%PORTVERSION%%
+lib/libgtkjava%%GTK_API_VERSION%%.so
+share/java/classes/gtk%%GTK_API_VERSION%%-%%PORTVERSION%%.jar