Update to 2.12.6

5 files changed, 21 insertions, 21 deletions

diff --git a/devel/libglade-java/Makefile b/devel/libglade-java/Makefile
index 67bbb95eeb8b..d8f3b5f9479a 100644
--- a/devel/libglade-java/Makefile
+++ b/devel/libglade-java/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	libglade-java
-PORTVERSION=	2.12.4
+PORTVERSION=	2.12.6
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
@@ -31,11 +31,11 @@ USE_GCC=	3.4+
 JAVA_VERSION=	1.2+
 JAVA_OS=	native
 USE_GNOME=	gnomehack libglade2
-CONFIGURE_ARGS=	--without-gcj-compile
+CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd"
 
 GLADE_API_VERSION=	2.12
-GTK_API_VERSION=	2.8
+GTK_API_VERSION=	2.10
 GNOME_API_VERSION=	2.12
 PLIST_SUB=		GLADE_API_VERSION=${GLADE_API_VERSION} \
 			PORTNAME=${PORTNAME}
diff --git a/devel/libglade-java/distinfo b/devel/libglade-java/distinfo
index e6b99e48b56d..2ee7a32aa66c 100644
--- a/devel/libglade-java/distinfo
+++ b/devel/libglade-java/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libglade-java-2.12.4.tar.bz2) = 2427ad75063ea45a8b580615b7553bde
-SHA256 (gnome2/libglade-java-2.12.4.tar.bz2) = 91788493d4f6b8f8d17f4b3fc78e92abf91c99325514ba14e3769e06ab9439ab
-SIZE (gnome2/libglade-java-2.12.4.tar.bz2) = 255508
+MD5 (gnome2/libglade-java-2.12.6.tar.bz2) = d41faea18e4c4d73227a431f8671a733
+SHA256 (gnome2/libglade-java-2.12.6.tar.bz2) = 293c4e54e6add177708aafc8d1121b845511c6921951bbc92e13c1755780d438
+SIZE (gnome2/libglade-java-2.12.6.tar.bz2) = 257483
diff --git a/x11/libgnome-java/Makefile b/x11/libgnome-java/Makefile
index 46f16a02d9de..149d58f043f1 100644
--- a/x11/libgnome-java/Makefile
+++ b/x11/libgnome-java/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	libgnome-java
-PORTVERSION=	2.12.3
+PORTVERSION=	2.12.6
 CATEGORIES=	x11 java
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
@@ -22,14 +22,14 @@ RUN_DEPENDS=	${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/li
 USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 JAVA_OS=	native
 USE_GCC=	3.4+
 USE_GNOME=	gnomehack libgnomeui
-CONFIGURE_ARGS=	--without-gcj-compile
+CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd"
 
 # jikes related
@@ -37,7 +37,7 @@ CONFIGURE_ENV+=	BOOTCLASSPATH=${JAVA_CLASSES}
 MAKE_ENV+=	BOOTCLASSPATH=${JAVA_CLASSES}
 
 GNOME_API_VERSION=	2.12
-GTK_API_VERSION=	2.8
+GTK_API_VERSION=	2.10
 PLIST_SUB=		GNOME_API_VERSION=${GNOME_API_VERSION} PORTNAME=${PORTNAME}
 
 PKGMESSAGE=		${WRKDIR}/pkg-message
diff --git a/x11/libgnome-java/distinfo b/x11/libgnome-java/distinfo
index 91fe11a22029..d8cce0bba9f9 100644
--- a/x11/libgnome-java/distinfo
+++ b/x11/libgnome-java/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnome-java-2.12.3.tar.bz2) = 38cf6c95d7882ffcaffd3ec7c05ff10a
-SHA256 (gnome2/libgnome-java-2.12.3.tar.bz2) = da1ef28eb4df454cd8d61395ccc022ece5519bdeed2cc79f291e8aef4d3e862e
-SIZE (gnome2/libgnome-java-2.12.3.tar.bz2) = 340034
+MD5 (gnome2/libgnome-java-2.12.6.tar.bz2) = b4e3cd22e1949674e0b04a4ab759db37
+SHA256 (gnome2/libgnome-java-2.12.6.tar.bz2) = ae70907bd8d744178efabe78e73f53ac3956b985a1c562681067e344959ace72
+SIZE (gnome2/libgnome-java-2.12.6.tar.bz2) = 341407
diff --git a/x11/libgnome-java/files/patch-configure b/x11/libgnome-java/files/patch-configure
index 7c48d2829c25..b3931d666221 100644
--- a/x11/libgnome-java/files/patch-configure
+++ b/x11/libgnome-java/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Sun Jun 19 13:17:59 2005
-+++ configure	Sun Jun 19 13:18:46 2005
-@@ -19514,7 +19514,7 @@
- apiversion="2.10"
- VERSION="2.10.1"
- 
--INSTALLED_CLASSPATH=\${prefix}/share/java/gnome${apiversion}-${VERSION}.jar
-+INSTALLED_CLASSPATH=\${prefix}/share/java/classes/gnome${apiversion}.jar
+--- configure.orig	Sat Nov  4 10:31:02 2006
++++ configure	Sat Nov  4 10:31:30 2006
+@@ -20049,7 +20049,7 @@
+ 
+ apiversion="2.12"
+ 
+-INSTALLED_CLASSPATH=\${jardir}/gnome${apiversion}-${VERSION}.jar
++INSTALLED_CLASSPATH=\${jardir}/gnome${apiversion}.jar
  INSTALLED_JNI_DIR=\${prefix}/lib/