From 4686883b1e3c40d180877f03eccaba4b128636a3 Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Tue, 30 Mar 2004 22:00:43 +0000
Subject: Update to 2.3.7.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2220 df743ca5-7f9a-e211-a948-0013205c9059
---
 x11-toolkits/libgtk-java/Makefile                  |  4 +--
 x11-toolkits/libgtk-java/distinfo                  |  4 +--
 .../libgtk-java/files/patch-gtk_src_Makefile.in    | 30 +++++++++++-----------
 3 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'x11-toolkits/libgtk-java')

diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile
index 2ef3352b7..16f8299ad 100644
--- a/x11-toolkits/libgtk-java/Makefile
+++ b/x11-toolkits/libgtk-java/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgtk-java
-PORTVERSION=	2.3.6
+PORTVERSION=	2.3.7
 CATEGORIES=	x11-toolkits java
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
@@ -26,7 +26,7 @@ CONFIGURE_ARGS=	--without-gcj-compile \
 CONFIGURE_ENV=	DB2="/dev/null"
 
 GTK_API_VERSION=	2.4
-VERSION=		beta1
+VERSION=		beta2
 PLIST_SUB=		GTK_API_VERSION=${GTK_API_VERSION} \
 			PORTVERSION=${VERSION}
 
diff --git a/x11-toolkits/libgtk-java/distinfo b/x11-toolkits/libgtk-java/distinfo
index 4b589b40d..e3b43b973 100644
--- a/x11-toolkits/libgtk-java/distinfo
+++ b/x11-toolkits/libgtk-java/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgtk-java-2.3.6.tar.bz2) = 34267eea69bed295aeace367870363fb
-SIZE (gnome2/libgtk-java-2.3.6.tar.bz2) = 378287
+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-gtk_src_Makefile.in b/x11-toolkits/libgtk-java/files/patch-gtk_src_Makefile.in
index bb499db74..c7a9ab59c 100644
--- a/x11-toolkits/libgtk-java/files/patch-gtk_src_Makefile.in
+++ b/x11-toolkits/libgtk-java/files/patch-gtk_src_Makefile.in
@@ -1,20 +1,20 @@
---- 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' )
- 
+--- 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"` )
-+	@(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
+ 	(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
-@@ -146,7 +146,7 @@
+@@ -149,7 +149,7 @@
+ ../lib/libgtkjava${gtkapiversion}.so.${gtkversion} : $(OBJECTS)
  	@(test ! -d ../lib && mkdir ../lib) || exit 0
- 	$(CC) $(CFLAGS) -shared -o ../lib/libgtkjava${gtkapiversion}.so.${gtkversion} \
+ 	$(CC) $(CFLAGS) -shared  \
+-		$(CFLAGS) $(GTK_LIBS) $(JAVA_INCLUDES) -Xlinker --no-undefined \
++		$(CFLAGS) $(GTK_LIBS) $(JAVA_INCLUDES) -lc -Xlinker --no-undefined \
  		$(OBJECTS) \
--		$(CFLAGS) $(GTK_LIBS) $(JAVA_INCLUDES) -Xlinker --no-undefined
-+		$(CFLAGS) $(GTK_LIBS) -lc $(JAVA_INCLUDES) -Xlinker --no-undefined
- 	@(cd ../lib; test ! -L libgtkjava${gtkapiversion}.so && ln -s libgtkjava${gtkapiversion}.so.${gtkversion} libgtkjava${gtkapiversion}.so) || exit 0
- 
- nativelib: ../lib/libgtkjava${gtkapiversion}.so.${gtkversion}
+ 		-o ../lib/libgtkjava${gtkapiversion}.so.${gtkversion} 
+ 	(cd ../lib; test ! -L libgtkjava${gtkapiversion}.so && ln -s libgtkjava${gtkapiversion}.so.${gtkversion} libgtkjava${gtkapiversion}.so) || exit 0
-- 
cgit v1.2.3