Date: Mon, 20 Jun 2005 18:00:09 +0300 From: "\"Panagiotis Astithas\" <Panagiotis Astithas" <past@ebs.gr> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/82446: Update port: devel/libgconf-java from 2.6.0 to 2.10.1 Message-ID: <1119279609.0@edgar.gr> Resent-Message-ID: <200506201510.j5KFAKY8053277@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 82446
>Category: ports
>Synopsis: Update port: devel/libgconf-java from 2.6.0 to 2.10.1
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 20 15:10:20 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Panagiotis Astithas
>Release: FreeBSD 5.4-STABLE i386
>Organization:
EBS Ltd.
>Environment:
System: FreeBSD 5.4-STABLE #0: Fri Apr 29 18:44:16 EEST 2005
past@edgar.gr:/usr/obj/usr/src/sys/EDGAR
>Description:
This patch updates the java bindings for the GConf library to version
2.10.1, in order to support the latest version of the GNOME desktop.
It requires the small fixes from ports/82411 to be applied first to
x11-toolkits/libgtk-java.
>How-To-Repeat:
>Fix:
--- libgconf-java.patch begins here ---
diff -ruN /usr/ports/devel/libgconf-java/Makefile libgconf-java/Makefile
--- /usr/ports/devel/libgconf-java/Makefile Sat Mar 12 12:53:01 2005
+++ libgconf-java/Makefile Mon Jun 20 17:28:41 2005
@@ -6,57 +6,64 @@
#
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
+INSTALLS_SHLIB= yes
+USE_LIBTOOL_VER= 15
GNU_CONFIGURE= yes
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"
-
-GCONF_API_VERSION= 2.6
-GTK_API_VERSION= 2.4
-VERSION= 2.6.0
-GTK_JAVA_VERSION= 2.4.0
+CONFIGURE_ARGS= --without-gcj-compile
+CONFIGURE_ENV= CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd"
+
+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 -ruN /usr/ports/devel/libgconf-java/distinfo libgconf-java/distinfo
--- /usr/ports/devel/libgconf-java/distinfo Tue Apr 20 19:45:28 2004
+++ libgconf-java/distinfo Mon Jun 20 17:20:37 2005
@@ -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 -ruN /usr/ports/devel/libgconf-java/files/patch-configure libgconf-java/files/patch-configure
--- /usr/ports/devel/libgconf-java/files/patch-configure Thu Jan 1 02:00:00 1970
+++ libgconf-java/files/patch-configure Mon Jun 20 17:32:06 2005
@@ -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 -ruN /usr/ports/devel/libgconf-java/files/patch-gconf-java.pc.in libgconf-java/files/patch-gconf-java.pc.in
--- /usr/ports/devel/libgconf-java/files/patch-gconf-java.pc.in Thu Jan 1 02:00:00 1970
+++ libgconf-java/files/patch-gconf-java.pc.in Mon Jun 20 17:30:48 2005
@@ -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 -ruN /usr/ports/devel/libgconf-java/files/patch-src_Makefile.in libgconf-java/files/patch-src_Makefile.in
--- /usr/ports/devel/libgconf-java/files/patch-src_Makefile.in Mon Apr 5 07:02:06 2004
+++ libgconf-java/files/patch-src_Makefile.in Thu Jan 1 02:00:00 1970
@@ -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 -ruN /usr/ports/devel/libgconf-java/files/patch-src_jni_org_gnu_gconf_ConfValue.c libgconf-java/files/patch-src_jni_org_gnu_gconf_ConfValue.c
--- /usr/ports/devel/libgconf-java/files/patch-src_jni_org_gnu_gconf_ConfValue.c Mon Apr 5 07:02:06 2004
+++ libgconf-java/files/patch-src_jni_org_gnu_gconf_ConfValue.c Thu Jan 1 02:00:00 1970
@@ -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 -ruN /usr/ports/devel/libgconf-java/pkg-plist libgconf-java/pkg-plist
--- /usr/ports/devel/libgconf-java/pkg-plist Mon Apr 5 07:02:05 2004
+++ libgconf-java/pkg-plist Mon Jun 20 17:43:14 2005
@@ -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%%
--- libgconf-java.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1119279609.0>