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

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2223 df743ca5-7f9a-e211-a948-0013205c9059
---
 devel/libglade-java/Makefile                    |  8 ++++----
 devel/libglade-java/distinfo                    |  4 ++--
 devel/libglade-java/files/patch-src_Makefile.in | 15 ++++++++++++---
 devel/libglade-java/pkg-plist                   |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'devel')

diff --git a/devel/libglade-java/Makefile b/devel/libglade-java/Makefile
index cbb1eaded..e3b519f0a 100644
--- a/devel/libglade-java/Makefile
+++ b/devel/libglade-java/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libglade-java
-PORTVERSION=	2.3.6
+PORTVERSION=	2.3.7
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
@@ -34,9 +34,9 @@ CONFIGURE_ENV=	DB2="/dev/null"
 GLADE_API_VERSION=	2.4
 GTK_API_VERSION=	2.4
 GNOME_API_VERSION=	2.6
-GTK_JAVA_VERSION=	beta1
-GNOME_JAVA_VERSION=	beta1
-VERSION=		beta1
+GTK_JAVA_VERSION=	beta2
+GNOME_JAVA_VERSION=	beta2
+VERSION=		beta2
 PLIST_SUB=		GLADE_API_VERSION=${GLADE_API_VERSION} \
 			PORTVERSION=${VERSION}
 
diff --git a/devel/libglade-java/distinfo b/devel/libglade-java/distinfo
index 0d208298a..189d02990 100644
--- a/devel/libglade-java/distinfo
+++ b/devel/libglade-java/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libglade-java-2.3.6.tar.bz2) = 45d7a64c2c521029a8482a263420d4f1
-SIZE (gnome2/libglade-java-2.3.6.tar.bz2) = 51429
+MD5 (gnome2/libglade-java-2.3.7.tar.bz2) = 22b803f9af4448a056381ff6a2103e3e
+SIZE (gnome2/libglade-java-2.3.7.tar.bz2) = 52313
diff --git a/devel/libglade-java/files/patch-src_Makefile.in b/devel/libglade-java/files/patch-src_Makefile.in
index dfaeedb05..de59543d6 100644
--- a/devel/libglade-java/files/patch-src_Makefile.in
+++ b/devel/libglade-java/files/patch-src_Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	Sun Feb 29 00:06:56 2004
-+++ src/Makefile.in	Sun Feb 29 00:07:36 2004
-@@ -105,7 +105,7 @@
+--- src/Makefile.in.orig	Mon Mar 29 13:37:37 2004
++++ src/Makefile.in	Tue Mar 30 17:32:50 2004
+@@ -107,7 +107,7 @@
  COMPILED_CLASSES:=$(shell echo $(CLASSES) | sed -e 's=\.class=\.o=g' )
  
  ../lib/glade${apiversion}.jar: $(CLASSES)
@@ -9,3 +9,12 @@
  	@(cd ../lib; test ! -L glade${apiversion}.jar && ln -s glade${apiversion}-${version}.jar glade${apiversion}.jar) || exit 0
  
  jar: dirs ../lib/glade${apiversion}.jar
+@@ -117,7 +117,7 @@
+ 	@(test ! -d ../lib && mkdir ../lib) || exit 0
+ 	$(CC) $(CFLAGS) -shared -o ../lib/libgladejava${apiversion}.so.${version} \
+ 		$(OBJECTS) \
+-		$(CFLAGS) @LIBGLADE_LIBS@ @LIBGLADE_CFLAGS@ $(JAVA_INCLUDES) -Xlinker --no-undefined
++		$(CFLAGS) @LIBGLADE_LIBS@ @LIBGLADE_CFLAGS@ $(JAVA_INCLUDES) -lc -Xlinker --no-undefined
+ 	@(cd ../lib; test ! -L libgladejava${apiversion}.so && ln -s libgladejava${apiversion}.so.${version} libgladejava${apiversion}.so) || exit 0
+ 
+ nativelib: ../lib/libgladejava${apiversion}.so.${version}
diff --git a/devel/libglade-java/pkg-plist b/devel/libglade-java/pkg-plist
index 38de64e9b..f84b43b96 100644
--- a/devel/libglade-java/pkg-plist
+++ b/devel/libglade-java/pkg-plist
@@ -1,4 +1,4 @@
 lib/libgladejava%%GLADE_API_VERSION%%.so
 lib/libgladejava%%GLADE_API_VERSION%%.so.%%PORTVERSION%%
-share/java/classes/glade2.3-%%PORTVERSION%%.jar
+share/java/classes/glade%%GLADE_API_VERSION%%-%%PORTVERSION%%.jar
 share/java/classes/glade%%GLADE_API_VERSION%%.jar
-- 
cgit v1.2.3