4 files changed, 80 insertions, 59 deletions

diff --git a/devel/glib-java/Makefile b/devel/glib-java/Makefile
index 03b6ec142d2d..3e1fd2d2da7e 100644
--- a/devel/glib-java/Makefile
+++ b/devel/glib-java/Makefile
@@ -7,10 +7,9 @@
 #
 
 PORTNAME=	glib-java
-PORTVERSION=	0.2.6
+PORTVERSION=	0.4.0
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -25,9 +24,9 @@ JAVA_VERSION=	1.2+
 JAVA_OS=	native
 USE_GCC=	3.4+
 USE_GNOME=	gnomehack glib20
-CONFIGURE_ARGS=	--without-gcj-compile
+CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd"
-GLIB_API_VERSION=	0.2
+GLIB_API_VERSION=	0.4
 PLIST_SUB=		GLIB_API_VERSION=${GLIB_API_VERSION} PORTNAME=${PORTNAME}
 PKGMESSAGE=		${WRKDIR}/pkg-message
 
@@ -45,6 +44,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/glib-java.pc ${PREFIX}/libdata/pkgconfig
 	${MKDIR} ${PREFIX}/include/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/src/jni/jg_jnu.h ${PREFIX}/include/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/src/jni/glib_java.h ${PREFIX}/include/${PORTNAME}
 	${MKDIR} ${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/glib${GLIB_API_VERSION}.jar ${JAVAJARDIR}
 	${MKDIR} ${PREFIX}/share/${PORTNAME}/macros
diff --git a/devel/glib-java/distinfo b/devel/glib-java/distinfo
index faeb48896762..02686c183cb7 100644
--- a/devel/glib-java/distinfo
+++ b/devel/glib-java/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-java-0.2.6.tar.bz2) = 80aa32ba4901ed92a1ef8a53fd9157e5
-SHA256 (gnome2/glib-java-0.2.6.tar.bz2) = 57733a9308c9f6781411e38b8936fff99d33298cc65790b63be67b15678a086b
-SIZE (gnome2/glib-java-0.2.6.tar.bz2) = 229797
+MD5 (gnome2/glib-java-0.4.0.tar.bz2) = b1448a6fd68de177f73d84bb824ace74
+SHA256 (gnome2/glib-java-0.4.0.tar.bz2) = 8a68ad478e91d59df8985e2eaf7f41a04937a69b5dab765e781e6a1cf429454c
+SIZE (gnome2/glib-java-0.4.0.tar.bz2) = 262467
diff --git a/devel/glib-java/files/patch-configure b/devel/glib-java/files/patch-configure
index 40f26900d0e7..a70a0c68a76c 100644
--- a/devel/glib-java/files/patch-configure
+++ b/devel/glib-java/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Wed Oct 26 21:01:20 2005
-+++ configure	Wed Oct 26 21:01:45 2005
-@@ -20254,7 +20254,7 @@
+--- configure.orig	Fri Nov  3 20:29:11 2006
++++ configure	Fri Nov  3 20:29:45 2006
+@@ -20270,7 +20270,7 @@
  
- WINDOWS_LIB_VERSION="0-2"
+ WINDOWS_LIB_VERSION="0-4"
  
--INSTALLED_CLASSPATH=\${prefix}/share/java/glib${apiversion}-${VERSION}.jar
-+INSTALLED_CLASSPATH=\${prefix}/share/java/classes/glib${apiversion}.jar
+-INSTALLED_CLASSPATH=\${jardir}/glib${apiversion}-${VERSION}.jar
++INSTALLED_CLASSPATH=\${jardir}/glib${apiversion}.jar
  INSTALLED_JNI_DIR=\${prefix}/lib/
- INSTALLED_MACRO_DIR=\${prefix}/share/glib-java/macros/
+ INSTALLED_MACRO_DIR=\${macrobasedir}/glib-java/macros/
  
diff --git a/devel/glib-java/pkg-plist b/devel/glib-java/pkg-plist
index cc09eec12423..379ec94ef0a3 100644
--- a/devel/glib-java/pkg-plist
+++ b/devel/glib-java/pkg-plist
@@ -1,50 +1,71 @@
+include/%%PORTNAME%%/glib_java.h
 include/%%PORTNAME%%/jg_jnu.h
 lib/libglibjni-%%GLIB_API_VERSION%%.so
 lib/libglibjni-%%GLIB_API_VERSION%%.so.1
 libdata/pkgconfig/%%PORTNAME%%.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/glib/Config.html
-%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glib/Enum.html
-%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glib/Flags.html
-%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glib/Handle.html
-%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glib/Handle32Bits.html
-%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glib/Handle64Bits.html
-%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glib/Struct.html
-%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glib/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glib/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glib/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/api/overview-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/api/package-list
-%%PORTDOCS%%%%DOCSDIR%%/api/packages.html
-%%PORTDOCS%%%%DOCSDIR%%/api/resources/inherit.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/serialized-form.html
-%%PORTDOCS%%%%DOCSDIR%%/api/stylesheet.css
-share/%%PORTNAME%%/macros/ac_prog_jar.m4
-share/%%PORTNAME%%/macros/ac_prog_javac.m4
-share/%%PORTNAME%%/macros/ac_prog_javac_works.m4
-share/%%PORTNAME%%/macros/ac_prog_javadoc.m4
-share/%%PORTNAME%%/macros/am_path_docbook.m4
-share/%%PORTNAME%%/macros/am_path_gcj.m4
-share/%%PORTNAME%%/macros/jg_check_nativecompile.m4
-share/%%PORTNAME%%/macros/jg_common.m4
-share/%%PORTNAME%%/macros/jg_lib.m4
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/NEWS
+%%DOCSDIR%%/README
+%%DOCSDIR%%/api/allclasses-frame.html
+%%DOCSDIR%%/api/allclasses-noframe.html
+%%DOCSDIR%%/api/constant-values.html
+%%DOCSDIR%%/api/deprecated-list.html
+%%DOCSDIR%%/api/help-doc.html
+%%DOCSDIR%%/api/index-all.html
+%%DOCSDIR%%/api/index.html
+%%DOCSDIR%%/api/org/gnu/glib/Boxed.html
+%%DOCSDIR%%/api/org/gnu/glib/Config.html
+%%DOCSDIR%%/api/org/gnu/glib/Enum.html
+%%DOCSDIR%%/api/org/gnu/glib/Error.html
+%%DOCSDIR%%/api/org/gnu/glib/EventMap.html
+%%DOCSDIR%%/api/org/gnu/glib/EventType.html
+%%DOCSDIR%%/api/org/gnu/glib/Fireable.html
+%%DOCSDIR%%/api/org/gnu/glib/Flags.html
+%%DOCSDIR%%/api/org/gnu/glib/GEvent.html
+%%DOCSDIR%%/api/org/gnu/glib/GListString.html
+%%DOCSDIR%%/api/org/gnu/glib/GObject.html
+%%DOCSDIR%%/api/org/gnu/glib/Handle.html
+%%DOCSDIR%%/api/org/gnu/glib/Handle32Bits.html
+%%DOCSDIR%%/api/org/gnu/glib/Handle64Bits.html
+%%DOCSDIR%%/api/org/gnu/glib/Idle.html
+%%DOCSDIR%%/api/org/gnu/glib/JGException.html
+%%DOCSDIR%%/api/org/gnu/glib/List.html
+%%DOCSDIR%%/api/org/gnu/glib/MainLoop.html
+%%DOCSDIR%%/api/org/gnu/glib/MemStruct.html
+%%DOCSDIR%%/api/org/gnu/glib/ParmFlags.html
+%%DOCSDIR%%/api/org/gnu/glib/PropertyNotificationListener.html
+%%DOCSDIR%%/api/org/gnu/glib/Quark.html
+%%DOCSDIR%%/api/org/gnu/glib/Struct.html
+%%DOCSDIR%%/api/org/gnu/glib/Timer.html
+%%DOCSDIR%%/api/org/gnu/glib/Type.html
+%%DOCSDIR%%/api/org/gnu/glib/TypeInterface.html
+%%DOCSDIR%%/api/org/gnu/glib/Value.html
+%%DOCSDIR%%/api/org/gnu/glib/package-frame.html
+%%DOCSDIR%%/api/org/gnu/glib/package-summary.html
+%%DOCSDIR%%/api/org/gnu/glib/package-tree.html
+%%DOCSDIR%%/api/overview-tree.html
+%%DOCSDIR%%/api/package-list
+%%DOCSDIR%%/api/packages.html
+%%DOCSDIR%%/api/resources/inherit.gif
+%%DOCSDIR%%/api/serialized-form.html
+%%DOCSDIR%%/api/stylesheet.css
+%%DATADIR%%/macros/ac_prog_jar.m4
+%%DATADIR%%/macros/ac_prog_javac.m4
+%%DATADIR%%/macros/ac_prog_javac_works.m4
+%%DATADIR%%/macros/ac_prog_javadoc.m4
+%%DATADIR%%/macros/am_path_docbook.m4
+%%DATADIR%%/macros/am_path_gcj.m4
+%%DATADIR%%/macros/jg_check_nativecompile.m4
+%%DATADIR%%/macros/jg_common.m4
+%%DATADIR%%/macros/jg_lib.m4
 share/java/classes/glib%%GLIB_API_VERSION%%.jar
-@dirrm share/%%PORTNAME%%/macros
-@dirrm share/%%PORTNAME%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/resources
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/org/gnu/glib
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/org/gnu
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/org
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/macros
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%/api/resources
+@dirrm %%DOCSDIR%%/api/org/gnu/glib
+@dirrm %%DOCSDIR%%/api/org/gnu
+@dirrm %%DOCSDIR%%/api/org
+@dirrm %%DOCSDIR%%/api
+@dirrm %%DOCSDIR%%
 @dirrm include/%%PORTNAME%%