Update to 2.10.1.

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

3 files changed, 19 insertions, 20 deletions

diff --git a/devel/libglade-java/files/patch-configure b/devel/libglade-java/files/patch-configure
new file mode 100644
index 000000000000..93a8dab817d0
--- /dev/null
+++ b/devel/libglade-java/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Mon Jun 20 16:08:34 2005
++++ configure	Mon Jun 20 16:09:54 2005
+@@ -19760,7 +19760,7 @@
+ VERSION="2.10.1"
+ WINDOWS_LIB_VERSION="2-10"
+ 
+-INSTALLED_CLASSPATH=\${prefix}/share/java/glade${apiversion}-${VERSION}.jar
++INSTALLED_CLASSPATH=\${prefix}/share/java/classes/glade${apiversion}.jar
+ INSTALLED_JNI_DIR=\${prefix}/lib/
+ 
+ 
diff --git a/devel/libglade-java/files/patch-glade-java.pc.in b/devel/libglade-java/files/patch-glade-java.pc.in
new file mode 100644
index 000000000000..906731f9dda6
--- /dev/null
+++ b/devel/libglade-java/files/patch-glade-java.pc.in
@@ -0,0 +1,8 @@
+--- glade-java.pc.in.orig	Mon Jun 20 16:00:00 2005
++++ glade-java.pc.in	Mon Jun 20 16:02:11 2005
+@@ -9,4 +9,4 @@
+ Version: @VERSION@
+ api_version=@apiversion@
+ classpath=@INSTALLED_CLASSPATH@
+-Libs: -L@libdir@ -lgladejava
++Libs: -L@libdir@ -lgladejni-@apiversion@
diff --git a/devel/libglade-java/files/patch-src_Makefile.in b/devel/libglade-java/files/patch-src_Makefile.in
deleted file mode 100644
index de59543d67e2..000000000000
--- a/devel/libglade-java/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Makefile.in.orig	Mon Mar 29 13:37:37 2004
-+++ src/Makefile.in	Tue Mar 30 17:32:50 2004
-@@ -107,7 +107,7 @@
- COMPILED_CLASSES:=$(shell echo $(CLASSES) | sed -e 's=\.class=\.o=g' )
- 
- ../lib/glade${apiversion}.jar: $(CLASSES)
--	@(cd build-java; $(JAR) cf ../../lib/glade${apiversion}-${version}.jar `find -name "*.class"` )
-+	@(cd build-java; $(JAR) cf ../../lib/glade${apiversion}-${version}.jar `find . -name "*.class"` )
- 	@(cd ../lib; test ! -L glade${apiversion}.jar && ln -s glade${apiversion}-${version}.jar glade${apiversion}.jar) || exit 0
- 
- jar: dirs ../lib/glade${apiversion}.jar
-@@ -117,7 +117,7 @@
- 	@(test ! -d ../lib && mkdir ../lib) || exit 0
- 	$(CC) $(CFLAGS) -shared -o ../lib/libgladejava${apiversion}.so.${version} \
- 		$(OBJECTS) \
--		$(CFLAGS) @LIBGLADE_LIBS@ @LIBGLADE_CFLAGS@ $(JAVA_INCLUDES) -Xlinker --no-undefined
-+		$(CFLAGS) @LIBGLADE_LIBS@ @LIBGLADE_CFLAGS@ $(JAVA_INCLUDES) -lc -Xlinker --no-undefined
- 	@(cd ../lib; test ! -L libgladejava${apiversion}.so && ln -s libgladejava${apiversion}.so.${version} libgladejava${apiversion}.so) || exit 0
- 
- nativelib: ../lib/libgladejava${apiversion}.so.${version}