10 files changed, 164 insertions, 0 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index d164ef2186a7..4f320410545d 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -108,6 +108,7 @@
     SUBDIR += libgnomeui
     SUBDIR += libgnomeuimm
     SUBDIR += libgtkeditor
+    SUBDIR += libgtk-java
     SUBDIR += libj2dplot
     SUBDIR += libjparser
     SUBDIR += libjsearch
diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile
new file mode 100644
index 000000000000..62490b2ec166
--- /dev/null
+++ b/x11-toolkits/libgtk-java/Makefile
@@ -0,0 +1,55 @@
+# New ports collection makefile for:   libgtk-java
+# Date created:        22 December 2003
+# Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libgtk-java
+PORTVERSION=	2.3.7
+CATEGORIES=	x11-toolkits java
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Java wrapper for Gtk+, Pango, Atk, and Glib
+
+USE_BZIP2=	yes
+USE_XLIB=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
+JAVA_OS=	native
+USE_GNOME=	gnomehack gtk20
+CONFIGURE_ARGS=	--without-gcj-compile \
+		--with-java-prefix=${JAVA_HOME}
+CONFIGURE_ENV=	DB2="/dev/null"
+
+GTK_API_VERSION=	2.4
+VERSION=		beta2
+PLIST_SUB=		GTK_API_VERSION=${GTK_API_VERSION} \
+			PORTVERSION=${VERSION}
+
+PKGMESSAGE=		${WRKDIR}/pkg-message
+
+do-install:
+	${MKDIR} ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/gtk/lib/libgtkjava${GTK_API_VERSION}.so.${VERSION} \
+		${PREFIX}/lib
+	${LN} -sf ${PREFIX}/lib/libgtkjava${GTK_API_VERSION}.so.${VERSION} ${PREFIX}/lib/libgtkjava${GTK_API_VERSION}.so
+	${MKDIR} ${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/gtk/lib/gtk${GTK_API_VERSION}-${VERSION}.jar \
+		${JAVAJARDIR}
+	${LN} -sf ${JAVAJARDIR}/gtk${GTK_API_VERSION}-${VERSION}.jar \
+		${JAVAJARDIR}/gtk${GTK_API_VERSION}.jar
+
+post-install:
+	@${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g ; \
+		s|%%GTK_API_VERSION%%|${GTK_API_VERSION}|g' \
+		 < ${PKGDIR}/pkg-message > ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/libgtk-java/distinfo b/x11-toolkits/libgtk-java/distinfo
new file mode 100644
index 000000000000..e3b43b97329c
--- /dev/null
+++ b/x11-toolkits/libgtk-java/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/libgtk-java-2.3.7.tar.bz2) = 72e67744126d48f4e893fa71cda107cd
+SIZE (gnome2/libgtk-java-2.3.7.tar.bz2) = 380154
diff --git a/x11-toolkits/libgtk-java/files/patch-gdk_src_jni_org_gnu_gdk_Display.c b/x11-toolkits/libgtk-java/files/patch-gdk_src_jni_org_gnu_gdk_Display.c
new file mode 100644
index 000000000000..d87d1195d5a0
--- /dev/null
+++ b/x11-toolkits/libgtk-java/files/patch-gdk_src_jni_org_gnu_gdk_Display.c
@@ -0,0 +1,12 @@
+--- gdk/src/jni/org_gnu_gdk_Display.c.orig	Sat Feb  7 20:32:44 2004
++++ gdk/src/jni/org_gnu_gdk_Display.c	Sat Feb  7 20:39:35 2004
+@@ -272,7 +272,8 @@
+ JNIEXPORT jint JNICALL Java_org_gnu_gdk_Display_gdk_1display_1get_1window_1at_1pointer
+   (JNIEnv *env, jclass cls, jint display, jint x, jint y)
+ {
+-	return (jint)gdk_display_get_window_at_pointer((GdkDisplay*)display, &(gint)x, &(gint)y);
++    	gint gy = (gint)y, gx = (gint)x;
++	return (jint)gdk_display_get_window_at_pointer((GdkDisplay*)display, &gx, &gy);
+ }
+ 
+ /*
diff --git a/x11-toolkits/libgtk-java/files/patch-gtk_src_Makefile.in b/x11-toolkits/libgtk-java/files/patch-gtk_src_Makefile.in
new file mode 100644
index 000000000000..c7a9ab59ca0a
--- /dev/null
+++ b/x11-toolkits/libgtk-java/files/patch-gtk_src_Makefile.in
@@ -0,0 +1,20 @@
+--- gtk/src/Makefile.in.orig	Tue Mar 30 15:56:57 2004
++++ gtk/src/Makefile.in	Tue Mar 30 15:57:38 2004
+@@ -140,7 +140,7 @@
+ ../lib/gtk${gtkapiversion}.jar: $(CLASSES)
+ 	(cd build-java; \
+ 	$(JAR) cf ../../lib/gtk${gtkapiversion}-${gtkversion}.jar \
+-		`find -name "*.class"` 	)
++		`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
+@@ -149,7 +149,7 @@
+ ../lib/libgtkjava${gtkapiversion}.so.${gtkversion} : $(OBJECTS)
+ 	@(test ! -d ../lib && mkdir ../lib) || exit 0
+ 	$(CC) $(CFLAGS) -shared  \
+-		$(CFLAGS) $(GTK_LIBS) $(JAVA_INCLUDES) -Xlinker --no-undefined \
++		$(CFLAGS) $(GTK_LIBS) $(JAVA_INCLUDES) -lc -Xlinker --no-undefined \
+ 		$(OBJECTS) \
+ 		-o ../lib/libgtkjava${gtkapiversion}.so.${gtkversion} 
+ 	(cd ../lib; test ! -L libgtkjava${gtkapiversion}.so && ln -s libgtkjava${gtkapiversion}.so.${gtkversion} libgtkjava${gtkapiversion}.so) || exit 0
diff --git a/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_IconInfo.c b/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_IconInfo.c
new file mode 100644
index 000000000000..3c42fe4cf777
--- /dev/null
+++ b/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_IconInfo.c
@@ -0,0 +1,17 @@
+--- gtk/src/jni/org_gnu_gtk_IconInfo.c.orig	Thu Feb 19 14:18:04 2004
++++ gtk/src/jni/org_gnu_gtk_IconInfo.c	Thu Feb 19 14:18:54 2004
+@@ -129,12 +129,13 @@
+ 	GdkPoint** point = g_malloc(sizeof(GdkPoint*) * (gint)numPoints);
+ 	jint* elements = (*env)->GetIntArrayElements(env, points, NULL);
+ 	int index;
++	gint gNumPoints = (gint)numPoints;
+ 	
+ 	for (index = 0; index < (gint)numPoints; index++)
+ 	{
+ 		point[index] = (GdkPoint*)elements[index];
+ 	}
+-	return gtk_icon_info_get_attach_points((GtkIconInfo*)info, point, &(gint)numPoints);
++	return gtk_icon_info_get_attach_points((GtkIconInfo*)info, point, &gNumPoints);
+ }
+ 
+ /*
diff --git a/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_TreeStore.c b/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_TreeStore.c
new file mode 100644
index 000000000000..aaceca7c2d73
--- /dev/null
+++ b/x11-toolkits/libgtk-java/files/patch-gtk_src_jni_org_gnu_gtk_TreeStore.c
@@ -0,0 +1,38 @@
+--- gtk/src/jni/org_gnu_gtk_TreeStore.c.orig	Sun Mar  7 00:56:20 2004
++++ gtk/src/jni/org_gnu_gtk_TreeStore.c	Sun Mar  7 00:57:03 2004
+@@ -388,7 +388,7 @@
+     *env, jclass cls, jint treeStore, jint parent, jint sibling) 
+ {
+     GtkTreeStore *treeStore_g = (GtkTreeStore *)treeStore;
+-    GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));;
++    GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));
+     GtkTreeIter *parent_g = (GtkTreeIter *)parent;
+     GtkTreeIter *sibling_g = (GtkTreeIter *)sibling;
+     gtk_tree_store_insert_before (treeStore_g, iter_g, parent_g, sibling_g);
+@@ -404,7 +404,7 @@
+     jclass cls, jint treeStore, jint parent, jint sibling) 
+ {
+     GtkTreeStore *treeStore_g = (GtkTreeStore *)treeStore;
+-    GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));;
++    GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));
+     GtkTreeIter *parent_g = (GtkTreeIter *)parent;
+     GtkTreeIter *sibling_g = (GtkTreeIter *)sibling;
+ 	gtk_tree_store_insert_after (treeStore_g, iter_g, parent_g, sibling_g);
+@@ -420,7 +420,7 @@
+     jclass cls, jint treeStore, jint parent) 
+ {
+     GtkTreeStore *treeStore_g = (GtkTreeStore *)treeStore;
+-    GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));;
++    GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));
+     GtkTreeIter *parent_g = (GtkTreeIter *)parent;
+ 	gtk_tree_store_prepend (treeStore_g, iter_g, parent_g);
+     return (jint)iter_g;
+@@ -435,7 +435,7 @@
+     cls, jint treeStore, jint parent) 
+ {
+     GtkTreeStore *treeStore_g = (GtkTreeStore *)treeStore;
+-    GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));;
++    GtkTreeIter *iter_g = (GtkTreeIter *)g_malloc(sizeof(GtkTreeIter));
+     GtkTreeIter *parent_g = (GtkTreeIter *)parent;
+ 	gtk_tree_store_append (treeStore_g, iter_g, parent_g);
+     return (jint)iter_g;
diff --git a/x11-toolkits/libgtk-java/pkg-descr b/x11-toolkits/libgtk-java/pkg-descr
new file mode 100644
index 000000000000..abc1cdd10d2f
--- /dev/null
+++ b/x11-toolkits/libgtk-java/pkg-descr
@@ -0,0 +1,8 @@
+Java-GNOME is a set of Java bindings for GNOME and GTK libraries,
+so GNOME applications can be written in Java.  It is implemented
+as a JNI layer that delegates the Java calls out to the underlying
+C library.
+
+-- Java-GNOME README
+
+WWW: http://java-gnome.sourceforge.net/
diff --git a/x11-toolkits/libgtk-java/pkg-message b/x11-toolkits/libgtk-java/pkg-message
new file mode 100644
index 000000000000..a7b10557370d
--- /dev/null
+++ b/x11-toolkits/libgtk-java/pkg-message
@@ -0,0 +1,7 @@
+************************************************************************
+Libgtk-java was successfully installed.  In order to build and run GTK+
+Java applications, you must add the following to your CLASSPATH:
+
+%%JAVAJARDIR%%/gtk%%GTK_API_VERSION%%.jar
+
+************************************************************************
diff --git a/x11-toolkits/libgtk-java/pkg-plist b/x11-toolkits/libgtk-java/pkg-plist
new file mode 100644
index 000000000000..2c8e8158b00d
--- /dev/null
+++ b/x11-toolkits/libgtk-java/pkg-plist
@@ -0,0 +1,4 @@
+lib/libgtkjava%%GTK_API_VERSION%%.so.%%PORTVERSION%%
+lib/libgtkjava%%GTK_API_VERSION%%.so
+share/java/classes/gtk%%GTK_API_VERSION%%-%%PORTVERSION%%.jar
+share/java/classes/gtk%%GTK_API_VERSION%%.jar