Update to 2.10.1.

PR:		82446
Submitted by:	Panagiotis Astithas <past@ebs.gr>

7 files changed, 96 insertions, 71 deletions

diff --git a/devel/libgconf-java/Makefile b/devel/libgconf-java/Makefile
index 4621c973db56..1114eca86d70 100644
--- a/devel/libgconf-java/Makefile
+++ b/devel/libgconf-java/Makefile
@@ -6,57 +6,63 @@
 #
 
 PORTNAME=	libgconf-java
-PORTVERSION=	2.6.0
-PORTREVISION=	2
+PORTVERSION=	2.10.1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Java wrapper for GConf
 
-BUILD_DEPENDS=	${LOCALBASE}/share/java/classes/gtk${GTK_API_VERSION}-${GTK_JAVA_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java
-RUN_DEPENDS=	${LOCALBASE}/share/java/classes/gtk${GTK_API_VERSION}-${GTK_JAVA_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java
+BUILD_DEPENDS=	${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java
+RUN_DEPENDS=	${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java
 
 USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
+USE_LIBTOOL_VER=15
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 JAVA_OS=	native
+USE_GCC=	3.4+
 USE_GNOME=	gnomehack gconf2
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=	--without-gcj-compile \
-		--with-java-prefix=${JAVA_HOME}
-CONFIGURE_ENV=	DB2="/dev/null"
+CONFIGURE_ARGS=	--without-gcj-compile
+CONFIGURE_ENV=	CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd"
 
-GCONF_API_VERSION=	2.6
-GTK_API_VERSION=	2.4
-VERSION=		2.6.0
-GTK_JAVA_VERSION=	2.4.0
+GCONF_API_VERSION=	2.10
+GTK_API_VERSION=	2.6
 PLIST_SUB=		GCONF_API_VERSION=${GCONF_API_VERSION} \
-			PORTVERSION=${VERSION}
+			PORTNAME=${PORTNAME}
 
 PKGMESSAGE=		${WRKDIR}/pkg-message
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|^GTKJAR=.*|GTKJAR=${LOCALBASE}/share/java/classes/gtk${GTK_API_VERSION}-${GTK_JAVA_VERSION}.jar|' \
-		${WRKSRC}/configure
-
 do-install:
 	${MKDIR} ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/libgconfjava${GCONF_API_VERSION}.so.${VERSION} \
-		${PREFIX}/lib
-	${LN} -sf ${PREFIX}/lib/libgconfjava${GCONF_API_VERSION}.so.${VERSION} ${PREFIX}/lib/libgconfjava${GCONF_API_VERSION}.so
+	${INSTALL_DATA} ${WRKSRC}/.libs/libgconfjni-${GCONF_API_VERSION}.so \
+		${PREFIX}/lib/libgconfjni-${GCONF_API_VERSION}.so.1
+	${LN} -sf ${PREFIX}/lib/libgconfjni-${GCONF_API_VERSION}.so.1 \
+		${PREFIX}/lib/libgconfjni-${GCONF_API_VERSION}.so
+	${MKDIR} ${PREFIX}/libdata/pkgconfig
+	${INSTALL_DATA} ${WRKSRC}/gconf-java.pc	${PREFIX}/libdata/pkgconfig
 	${MKDIR} ${JAVAJARDIR}
-	${INSTALL_DATA} ${WRKSRC}/lib/gconf${GCONF_API_VERSION}-${VERSION}.jar \
-		${JAVAJARDIR}
-	${LN} -sf ${JAVAJARDIR}/gconf${GCONF_API_VERSION}-${VERSION}.jar \
-		${JAVAJARDIR}/gconf${GCONF_API_VERSION}.jar
+	${INSTALL_DATA} ${WRKSRC}/gconf${GCONF_API_VERSION}.jar ${JAVAJARDIR}
 
 post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}/api
+	cd ${WRKSRC}/doc/api && ${FIND} . | ${CPIO} -pdmu ${DOCSDIR}/api
+	${MKDIR} ${DOCSDIR}/examples
+	cd ${WRKSRC}/doc/examples && ${FIND} . \
+		| ${CPIO} -pdmu ${DOCSDIR}/examples
+.endif
 	@${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g ; \
 		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%GCONF_API_VERSION%%|${GCONF_API_VERSION}|g' \
diff --git a/devel/libgconf-java/distinfo b/devel/libgconf-java/distinfo
index 55ba57830665..6d93fbf304d8 100644
--- a/devel/libgconf-java/distinfo
+++ b/devel/libgconf-java/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgconf-java-2.6.0.tar.bz2) = 7ff555e10e1a034f664f9d608da26036
-SIZE (gnome2/libgconf-java-2.6.0.tar.bz2) = 52205
+MD5 (gnome2/libgconf-java-2.10.1.tar.bz2) = 73efb6effd65e1fe1b949adb8c70d5db
+SIZE (gnome2/libgconf-java-2.10.1.tar.bz2) = 232533
diff --git a/devel/libgconf-java/files/patch-configure b/devel/libgconf-java/files/patch-configure
new file mode 100644
index 000000000000..895b26720efd
--- /dev/null
+++ b/devel/libgconf-java/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Mon Jun 20 17:31:06 2005
++++ configure	Mon Jun 20 17:31:49 2005
+@@ -19514,7 +19514,7 @@
+ apiversion="2.10"
+ VERSION="2.10.1"
+ 
+-INSTALLED_CLASSPATH=\${prefix}/share/java/gconf${apiversion}-${VERSION}.jar
++INSTALLED_CLASSPATH=\${prefix}/share/java/classes/gconf${apiversion}.jar
+ INSTALLED_JNI_DIR=\${prefix}/lib/
+ 
+ 
diff --git a/devel/libgconf-java/files/patch-gconf-java.pc.in b/devel/libgconf-java/files/patch-gconf-java.pc.in
new file mode 100644
index 000000000000..8f6fa504367a
--- /dev/null
+++ b/devel/libgconf-java/files/patch-gconf-java.pc.in
@@ -0,0 +1,8 @@
+--- gconf-java.pc.in.orig	Mon Jun 20 17:29:54 2005
++++ gconf-java.pc.in	Mon Jun 20 17:30:13 2005
+@@ -9,4 +9,4 @@
+ Version: @VERSION@
+ api_version=@apiversion@
+ classpath=@INSTALLED_CLASSPATH@
+-Libs: -L@libdir@ -lgconfjava
++Libs: -L@libdir@ -lgconfjni-@apiversion@
diff --git a/devel/libgconf-java/files/patch-src_Makefile.in b/devel/libgconf-java/files/patch-src_Makefile.in
deleted file mode 100644
index c954fde513a6..000000000000
--- a/devel/libgconf-java/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/Makefile.in.orig	Tue Mar 30 17:05:19 2004
-+++ src/Makefile.in	Tue Mar 30 17:06:06 2004
-@@ -60,6 +60,7 @@
- LIBGTKHTML_LIBS=@LIBGTKHTML_LIBS@
- GNOME_CFLAGS=@GNOME_CFLAGS@
- GNOME_LIBS=@GNOME_LIBS@
-+GCONF_CFLAGS=@GCONF_CFLAGS@
- LIBGLADE_CFLAGS=@LIBGLADE_CFLAGS@
- LIBGLADE_LIBS=@LIBGLADE_LIBS@
- GCJ=@GCJ@ -fPIC -fjni
-@@ -71,6 +72,7 @@
- .c.o:
- 	$(CC) -c $(CFLAGS) $< $(JAVA_INCLUDES) $(GTK_CFLAGS) \
- 	    $(LIBGTKHTML_CFLAGS) $(GNOME_CFLAGS) $(LIBGLADE_CFLAGS) \
-+	    $(GCONF_CFLAGS) \
- 		\
- 		-o $@		
- 
-@@ -106,7 +108,7 @@
- COMPILED_CLASSES:=$(shell echo $(CLASSES) | sed -e 's=\.class=\.o=g' )
- 
- ../lib/gconf${apiversion}.jar: $(CLASSES)
--	@(cd build-java; $(JAR) cf ../../lib/gconf${apiversion}-${version}.jar `find -name "*.class"` )
-+	@(cd build-java; $(JAR) cf ../../lib/gconf${apiversion}-${version}.jar `find . -name "*.class"` )
- 	@(cd ../lib; test ! -L gconf${apiversion}.jar && ln -s gconf${apiversion}-${version}.jar gconf${apiversion}.jar) || exit 0
- 
- jar: dirs ../lib/gconf${apiversion}.jar
diff --git a/devel/libgconf-java/files/patch-src_jni_org_gnu_gconf_ConfValue.c b/devel/libgconf-java/files/patch-src_jni_org_gnu_gconf_ConfValue.c
deleted file mode 100644
index 45e65648aad8..000000000000
--- a/devel/libgconf-java/files/patch-src_jni_org_gnu_gconf_ConfValue.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/jni/org_gnu_gconf_ConfValue.c.orig	Thu Feb 19 16:19:17 2004
-+++ src/jni/org_gnu_gconf_ConfValue.c	Thu Feb 19 16:19:46 2004
-@@ -111,8 +111,9 @@
- 	jclass aCls = NULL;
- 	guint len;
- 	jobjectArray ar;
-+	GConfValueType vt;
- 	len = g_slist_length(list);
--	GConfValueType vt = gconf_value_get_list_type((GConfValue*)value);
-+	vt = gconf_value_get_list_type((GConfValue*)value);
- 	if (vt == GCONF_VALUE_STRING)
- 		aCls = (*env)->FindClass(env, "java/lang/String");
- 	else if (vt == GCONF_VALUE_INT)
diff --git a/devel/libgconf-java/pkg-plist b/devel/libgconf-java/pkg-plist
index bd5a55f13b38..1df1d7507ac5 100644
--- a/devel/libgconf-java/pkg-plist
+++ b/devel/libgconf-java/pkg-plist
@@ -1,4 +1,44 @@
-lib/libgconfjava%%GCONF_API_VERSION%%.so
-lib/libgconfjava%%GCONF_API_VERSION%%.so.%%PORTVERSION%%
-share/java/classes/gconf%%GCONF_API_VERSION%%-%%PORTVERSION%%.jar
-share/java/classes/gconf%%GCONF_API_VERSION%%.jar
+lib/libgconfjni-%%GCONF_API_VERSION%%.so
+lib/libgconfjni-%%GCONF_API_VERSION%%.so.1
+libdata/pkgconfig/gconf-java.pc
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/api/allclasses-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/api/allclasses-noframe.html
+%%PORTDOCS%%%%DOCSDIR%%/api/constant-values.html
+%%PORTDOCS%%%%DOCSDIR%%/api/deprecated-list.html
+%%PORTDOCS%%%%DOCSDIR%%/api/help-doc.html
+%%PORTDOCS%%%%DOCSDIR%%/api/index-all.html
+%%PORTDOCS%%%%DOCSDIR%%/api/index.html
+%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/gconf/ConfClient.html
+%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/gconf/ConfClientListener.html
+%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/gconf/ConfClientPreloadType.html
+%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/gconf/ConfEntry.html
+%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/gconf/ConfException.html
+%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/gconf/ConfMetaInfo.html
+%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/gconf/ConfSchema.html
+%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/gconf/ConfValue.html
+%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/gconf/ConfValueType.html
+%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/gconf/package-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/gconf/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/gconf/package-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/api/overview-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/api/packages.html
+%%PORTDOCS%%%%DOCSDIR%%/api/package-list
+%%PORTDOCS%%%%DOCSDIR%%/api/resources/inherit.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/serialized-form.html
+%%PORTDOCS%%%%DOCSDIR%%/api/stylesheet.css
+%%PORTDOCS%%%%DOCSDIR%%/examples/gconf/BasicGConfApp.java
+%%PORTDOCS%%%%DOCSDIR%%/examples/runExample.sh
+%%PORTDOCS%%%%DOCSDIR%%/examples/runExample.sh.in
+%%JAVAJARDIR%%/gconf%%GCONF_API_VERSION%%.jar
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/gconf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/resources
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/org/gnu/gconf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/org/gnu
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/org
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/api
+%%PORTDOCS%%@dirrm %%DOCSDIR%%