diff options
| -rw-r--r-- | devel/libglade-java/Makefile | 69 | ||||
| -rw-r--r-- | devel/libglade-java/distinfo | 4 | ||||
| -rw-r--r-- | devel/libglade-java/files/patch-configure | 11 | ||||
| -rw-r--r-- | devel/libglade-java/files/patch-glade-java.pc.in | 8 | ||||
| -rw-r--r-- | devel/libglade-java/files/patch-src_Makefile.in | 20 | ||||
| -rw-r--r-- | devel/libglade-java/pkg-plist | 72 |
6 files changed, 123 insertions, 61 deletions
diff --git a/devel/libglade-java/Makefile b/devel/libglade-java/Makefile index e050ac462ef9..f7eca9877691 100644 --- a/devel/libglade-java/Makefile +++ b/devel/libglade-java/Makefile @@ -6,67 +6,66 @@ # PORTNAME= libglade-java -PORTVERSION= 2.4.0 -PORTREVISION= 2 +PORTVERSION= 2.10.1 CATEGORIES= devel java MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Java wrapper for libglade -BUILD_DEPENDS= ${LOCALBASE}/share/java/classes/gtk${GTK_API_VERSION}-${GTK_JAVA_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java \ - ${LOCALBASE}/share/java/classes/gnome${GNOME_API_VERSION}-${GNOME_JAVA_VERSION}.jar:${PORTSDIR}/x11/libgnome-java -RUN_DEPENDS= ${LOCALBASE}/share/java/classes/gtk${GTK_API_VERSION}-${GTK_JAVA_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java \ - ${LOCALBASE}/share/java/classes/gnome${GNOME_API_VERSION}-${GNOME_JAVA_VERSION}.jar:${PORTSDIR}/x11/libgnome-java +BUILD_DEPENDS= ${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java \ + ${JAVALIBDIR}/gnome${GNOME_API_VERSION}.jar:${PORTSDIR}/x11/libgnome-java +RUN_DEPENDS= ${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java \ + ${JAVALIBDIR}/gnome${GNOME_API_VERSION}.jar:${PORTSDIR}/x11/libgnome-java USE_BZIP2= yes USE_XLIB= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +INSTALLS_SHLIB= yes +USE_LIBTOOL_VER=15 USE_JAVA= yes +USE_GCC= 3.4+ JAVA_VERSION= 1.2+ JAVA_OS= native USE_GNOME= gnomehack libglade2 USE_REINPLACE= yes -CONFIGURE_ARGS= --without-gcj-compile \ - --with-java-prefix=${JAVA_HOME} -CONFIGURE_ENV= DB2="/dev/null" +CONFIGURE_ARGS= --without-gcj-compile +CONFIGURE_ENV= CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd" -GLADE_API_VERSION= 2.4 -GTK_API_VERSION= 2.4 -GNOME_API_VERSION= 2.6 -GTK_JAVA_VERSION= 2.4.0 -GNOME_JAVA_VERSION= 2.6.0 -VERSION= 2.4.0 +GLADE_API_VERSION= 2.10 +GTK_API_VERSION= 2.6 +GNOME_API_VERSION= 2.10 PLIST_SUB= GLADE_API_VERSION=${GLADE_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| ; \ - s|^GNOMEJAR=.*|GNOMEJAR=${LOCALBASE}/share/java/classes/gnome${GNOME_API_VERSION}-${GNOME_JAVA_VERSION}.jar|' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|@gtkapiversion@|${GTK_API_VERSION}|g ; \ - s|@apiversion@|${GLADE_API_VERSION}|g ; \ - s|@version@|${VERSION}|g' \ - ${WRKSRC}/src/Makefile.in \ - ${WRKSRC}/src/java/org/gnu/glade/LibGlade.java.in - do-install: ${MKDIR} ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/lib/libgladejava${GLADE_API_VERSION}.so.${VERSION} \ - ${PREFIX}/lib - ${LN} -sf ${PREFIX}/lib/libgladejava${GLADE_API_VERSION}.so.${VERSION} ${PREFIX}/lib/libgladejava${GLADE_API_VERSION}.so + ${INSTALL_DATA} ${WRKSRC}/.libs/libgladejni-${GLADE_API_VERSION}.so \ + ${PREFIX}/lib/libgladejni-${GLADE_API_VERSION}.so.1 + ${LN} -sf ${PREFIX}/lib/libgladejni-${GLADE_API_VERSION}.so.1 \ + ${PREFIX}/lib/libgladejni-${GLADE_API_VERSION}.so + ${MKDIR} ${PREFIX}/libdata/pkgconfig + ${INSTALL_DATA} ${WRKSRC}/glade-java.pc ${PREFIX}/libdata/pkgconfig ${MKDIR} ${JAVAJARDIR} - ${INSTALL_DATA} ${WRKSRC}/lib/glade${GLADE_API_VERSION}-${VERSION}.jar \ - ${JAVAJARDIR} - ${LN} -sf ${JAVAJARDIR}/lib/glade${GLADE_API_VERSION}-${VERSION}.jar \ - ${JAVAJARDIR}/glade${GLADE_API_VERSION}.jar + ${INSTALL_DATA} ${WRKSRC}/glade${GLADE_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|%%GLADE_API_VERSION%%|${GLADE_API_VERSION}|g' \ diff --git a/devel/libglade-java/distinfo b/devel/libglade-java/distinfo index 6a1fa74fa65f..8d65dfb52c3e 100644 --- a/devel/libglade-java/distinfo +++ b/devel/libglade-java/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libglade-java-2.4.0.tar.bz2) = 991a7bacf4141e76b011c553a3b44a55 -SIZE (gnome2/libglade-java-2.4.0.tar.bz2) = 52469 +MD5 (gnome2/libglade-java-2.10.1.tar.bz2) = edf7e9e113afa9f002f048d62c87920b +SIZE (gnome2/libglade-java-2.10.1.tar.bz2) = 251071 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} diff --git a/devel/libglade-java/pkg-plist b/devel/libglade-java/pkg-plist index f84b43b9612f..58fa5a8b87e5 100644 --- a/devel/libglade-java/pkg-plist +++ b/devel/libglade-java/pkg-plist @@ -1,4 +1,68 @@ -lib/libgladejava%%GLADE_API_VERSION%%.so -lib/libgladejava%%GLADE_API_VERSION%%.so.%%PORTVERSION%% -share/java/classes/glade%%GLADE_API_VERSION%%-%%PORTVERSION%%.jar -share/java/classes/glade%%GLADE_API_VERSION%%.jar +lib/libgladejni-%%GLADE_API_VERSION%%.so +lib/libgladejni-%%GLADE_API_VERSION%%.so.1 +libdata/pkgconfig/glade-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/glade/CellEditableDelegate.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/CheckMenuItemDelegate.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/ColorButtonDelegate.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/ComboBoxDelegate.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/ExpanderDelegate.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/ExposeDelegate.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/FontButtonDelegate.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/GenerateStubs.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/GladeXMLException.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/ItemDelegate.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/LibGlade.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/LibGladeStubs.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/MouseMotionDelegate.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/OptionMenuDelegate.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/ToolBarDelegate.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/ToolButtonDelegate.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/TreeModelDelegate.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/TreeViewDelegate.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/package-frame.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/package-summary.html +%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glade/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/glade/Example1.java +%%PORTDOCS%%%%DOCSDIR%%/examples/glade/LibGladeTest.java +%%PORTDOCS%%%%DOCSDIR%%/examples/glade/Test.java +%%PORTDOCS%%%%DOCSDIR%%/examples/glade/custom.glade +%%PORTDOCS%%%%DOCSDIR%%/examples/glade/example1.glade +%%PORTDOCS%%%%DOCSDIR%%/examples/glade/gtk.glade +%%PORTDOCS%%%%DOCSDIR%%/examples/glade/simple.glade +%%PORTDOCS%%%%DOCSDIR%%/examples/glade/test.glade +%%PORTDOCS%%%%DOCSDIR%%/examples/gladegnome/LibGladeGnomeTest.java +%%PORTDOCS%%%%DOCSDIR%%/examples/gladegnome/gnome-druid.glade +%%PORTDOCS%%%%DOCSDIR%%/examples/gladegnome/gnome-propertybox.glade +%%PORTDOCS%%%%DOCSDIR%%/examples/gladegnome/gnome-widgets.glade +%%PORTDOCS%%%%DOCSDIR%%/examples/overholt/Simple.java +%%PORTDOCS%%%%DOCSDIR%%/examples/overholt/simple.glade +%%PORTDOCS%%%%DOCSDIR%%/examples/runExample.sh +%%PORTDOCS%%%%DOCSDIR%%/examples/runExample.sh.in +%%JAVAJARDIR%%/glade%%GLADE_API_VERSION%%.jar +%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/overholt +%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/gladegnome +%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/glade +%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples +%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/resources +%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/org/gnu/glade +%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/org/gnu +%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/org +%%PORTDOCS%%@dirrm %%DOCSDIR%%/api +%%PORTDOCS%%@dirrm %%DOCSDIR%% |