4 files changed, 19 insertions, 40 deletions

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)