View | Details | Raw Unified | Return to bug 82446
Collapse All | Expand All

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

Return to bug 82446