Date: Sun, 5 Jun 2005 22:30:10 GMT From: Panagiotis Astithas <past@ebs.gr> To: gnome@FreeBSD.org Subject: Re: ports/81632: Upgrade port: x11-toolkits/libgtj-java to version 2.6.2 Message-ID: <200506052230.j55MUAdn030580@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/81632; it has been noted by GNATS.
From: Panagiotis Astithas <past@ebs.gr>
To: bug-followup@FreeBSD.org, past@ebs.gr
Cc:
Subject: Re: ports/81632: Upgrade port: x11-toolkits/libgtj-java to version
2.6.2
Date: Mon, 06 Jun 2005 01:23:51 +0300
While updating the libgnome-java port I discovered a bug with the
installation of the shared library in my patch. I fixed it in the
following patch (to be applied after the first patch above), as well as
making some improvements in the handling of the pkg-plist files.
diff -ruN libgtk-java/Makefile libgtk-java.new/Makefile
--- libgtk-java/Makefile Mon Jun 6 01:14:02 2005
+++ libgtk-java.new/Makefile Mon Jun 6 01:03:42 2005
@@ -19,7 +19,8 @@
USE_XLIB= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+INSTALLS_SHLIB= yes
+USE_LIBTOOL_VER=15
USE_JAVA= yes
JAVA_VERSION= 1.2+
JAVA_OS= native
@@ -33,7 +34,10 @@
do-install:
${MKDIR} ${PREFIX}/lib
- ${INSTALL_DATA} ${WRKSRC}/libgtkjni.la ${PREFIX}/lib
+ ${INSTALL_DATA} ${WRKSRC}/.libs/libgtkjni-${GTK_API_VERSION}.so \
+ ${PREFIX}/lib/libgtkjni-${GTK_API_VERSION}.so.1
+ ${LN} -sf ${PREFIX}/lib/libgtkjni-${GTK_API_VERSION}.so.1 \
+ ${PREFIX}/lib/libgtkjni-${GTK_API_VERSION}.so
${MKDIR} ${PREFIX}/libdata/pkgconfig
${INSTALL_DATA} ${WRKSRC}/gtk2-java.pc ${PREFIX}/libdata/pkgconfig
${MKDIR} ${PREFIX}/include/${PORTNAME}
diff -ruN libgtk-java/pkg-plist libgtk-java.new/pkg-plist
--- libgtk-java/pkg-plist Mon Jun 6 01:14:02 2005
+++ libgtk-java.new/pkg-plist Mon Jun 6 01:03:53 2005
@@ -1,6 +1,8 @@
include/%%PORTNAME%%/jg_jnu.h
-lib/libgtkjni.la
+lib/libgtkjni-%%GTK_API_VERSION%%.so
+lib/libgtkjni-%%GTK_API_VERSION%%.so.1
libdata/pkgconfig/gtk2-java.pc
+@unexec rmdir %B 2>/dev/null || true
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -685,6 +687,7 @@
%%PORTDOCS%%%%DOCSDIR%%/examples/treestore/TreeStoreExample.java
%%PORTDOCS%%%%DOCSDIR%%/examples/uimanager/UIManagerExample.java
%%JAVAJARDIR%%/gtk%%GTK_API_VERSION%%.jar
+@unexec rmdir %B 2>/dev/null || true
share/%%PORTNAME%%/macros/ac_prog_jar.m4
share/%%PORTNAME%%/macros/ac_prog_javac.m4
share/%%PORTNAME%%/macros/ac_prog_javac_works.m4
@@ -697,7 +700,6 @@
share/%%PORTNAME%%/macros/jg_gtk_java.m4
@dirrm share/%%PORTNAME%%/macros
@dirrm share/%%PORTNAME%%
-@dirrm %%JAVAJARDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/uimanager
%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/treestore
%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/tree
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506052230.j55MUAdn030580>