Update to 1.9.8. This update breaks gnucash, which now uses

devel/g-wrap196 instead.  Changes since 1.9.6:

Version 1.9.8

  - New feature: function flags. At the moment there is a single flag
    specifying whether to leave "Guile mode" when calling the wrapper
    functions. See the Guile manual on "scm_without_guile" for more
    information.

  - Don't rely on libc to provide (v)asprintf, take the implementation
    from gnulib.

  - The minimal GLib bindings now build against GLib 2.x. However,
    their use is deprecated in favour of the much more complete GLib
    bindings in guile-gnome
    (http://www.gnu.org/software/guile-gnome/).

Version 1.9.7

  - The shared libraries now reside in $(pkglibdir)/modules
    (e.g. /usr/lib/g-wrap/modules).

  - Users are now allowed to chose in which module generic functions
    should be defined.

  - New feature: aggregated typespecs.  See the node `Wrapping a C
    Function' of the manual for details.

  - Users can now specify a free and a mark function, as well as an
    equality predicate for wrapped C types (WCTs) in `wrap-as-wct!'.

  - Improved documentation with an API reference (yet to be finished).

  - Several bugfixes.

6 files changed, 49 insertions, 49 deletions

diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index dca88105d5b..fea4787436c 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2007/05/17 17:34:32 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2007/05/17 23:59:34 gdt Exp $
 
-DISTNAME=	g-wrap-1.9.6
-PKGREVISION=	2
+DISTNAME=	g-wrap-1.9.8
 CATEGORIES=	devel
 MASTER_SITES=	http://savannah.nongnu.org/download/g-wrap/
 
@@ -9,9 +8,10 @@ MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/g-wrap/
 COMMENT=	Tool for generating guile wrappers for C code
 
-DEPENDS+=	guile-lib>=0.1.2:../../devel/guile-lib
+# not sure
+MAKE_JOBS_SAFE=	no
 
-MAKE_JOBS_SAFE=		no
+DEPENDS+=	guile-lib>=0.1.2:../../devel/guile-lib
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake makeinfo pkg-config
@@ -23,5 +23,7 @@ pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/guile/site/g-wrap/guile/ws
 
 .include "../../devel/glib2/buildlink3.mk"
+# wrong version
+#.include "../../devel/libffi/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/g-wrap/PLIST b/devel/g-wrap/PLIST
index 8db07bad318..8f6fccf693a 100644
--- a/devel/g-wrap/PLIST
+++ b/devel/g-wrap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2007/01/21 12:52:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/05/17 23:59:34 gdt Exp $
 bin/g-wrap-config
 include/ffi.h
 include/ffitarget.h
@@ -9,25 +9,29 @@ include/g-wrap/guile-compatibility.h
 include/g-wrap/guile-runtime.h
 include/g-wrap/guile-wct.h
 info/g-wrap.info
+lib/g-wrap/modules/libgw-guile-standard.la
 lib/libffi.la
-lib/libgw-guile-gw-glib.la
-lib/libgw-guile-standard.la
+lib/libgw-guile-miscutils.la
 lib/libgwrap-core-runtime.la
 lib/libgwrap-guile-runtime.la
+lib/libmiscutils.la
 lib/pkgconfig/g-wrap-2.0-guile.pc
+share/aclocal/g-wrap.m4
 share/guile/site/g-wrap.scm
+share/guile/site/g-wrap/c-codegen.scm
 share/guile/site/g-wrap/c-types.scm
 share/guile/site/g-wrap/compat.scm
+share/guile/site/g-wrap/config.scm
 share/guile/site/g-wrap/enumeration.scm
 share/guile/site/g-wrap/guile.scm
 share/guile/site/g-wrap/guile/ws/standard.scm
 share/guile/site/g-wrap/gw-glib-spec.scm
-share/guile/site/g-wrap/gw-glib.scm
 share/guile/site/g-wrap/gw-standard-spec.scm
 share/guile/site/g-wrap/gw-wct-spec.scm
 share/guile/site/g-wrap/gw-wct.scm
 share/guile/site/g-wrap/gw/standard.scm
 share/guile/site/g-wrap/rti.scm
+share/guile/site/g-wrap/scm-codegen.scm
 share/guile/site/g-wrap/simple-type.scm
 share/guile/site/g-wrap/util.scm
 share/guile/site/g-wrap/ws/standard.scm
@@ -36,4 +40,6 @@ share/guile/site/g-wrap/ws/standard.scm
 @dirrm share/guile/site/g-wrap/guile/ws
 @dirrm share/guile/site/g-wrap/guile
 @dirrm share/guile/site/g-wrap
+@dirrm lib/g-wrap/modules
+@dirrm lib/g-wrap
 @dirrm include/g-wrap
diff --git a/devel/g-wrap/distinfo b/devel/g-wrap/distinfo
index 176a11913bf..63054a0d429 100644
--- a/devel/g-wrap/distinfo
+++ b/devel/g-wrap/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.17 2007/01/21 12:52:44 wiz Exp $
+$NetBSD: distinfo,v 1.18 2007/05/17 23:59:34 gdt Exp $
 
-SHA1 (g-wrap-1.9.6.tar.gz) = 754116dd5d9af2fe0e1f8386e69721618e0eefdf
-RMD160 (g-wrap-1.9.6.tar.gz) = 1e3d86e38061a217b9dde06885301f4a46433d39
-Size (g-wrap-1.9.6.tar.gz) = 826045 bytes
+SHA1 (g-wrap-1.9.8.tar.gz) = 5f774c2379e362434d82c5aef4e416a4e8f9cac2
+RMD160 (g-wrap-1.9.8.tar.gz) = 609f73e608d3676b03660cee78ef2eab3aa24a37
+Size (g-wrap-1.9.8.tar.gz) = 964660 bytes
 SHA1 (patch-aa) = 57ee87da372c0d43f384767d7b585a7d09b87b8b
 SHA1 (patch-ab) = 0b19af560b7fdebdf9a6379eb0e2b9e3980071c8
-SHA1 (patch-ac) = 2ba8274c02993c0036da498cf76238a923468f86
+SHA1 (patch-ad) = ff192225decfa27442c980c1d4fad83cee44fc22
+SHA1 (patch-ae) = 69e350900fc59024cddac5b137582439d1edabaf
diff --git a/devel/g-wrap/patches/patch-ac b/devel/g-wrap/patches/patch-ac
deleted file mode 100644
index cf484b3a384..00000000000
--- a/devel/g-wrap/patches/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2007/01/21 12:52:44 wiz Exp $
-
---- configure.orig	2005-04-14 14:57:14.000000000 +0000
-+++ configure
-@@ -21699,8 +21699,8 @@ else
-   if test "x$ac_cv_env_GLIB_CFLAGS_set" = "xset"; then
- 	pkg_cv_GLIB_CFLAGS=$ac_cv_env_GLIB_CFLAGS_value
- elif test -n "$PKG_CONFIG"; then
--	if $PKG_CONFIG --exists "glib" >/dev/null 2>&1; then
--		pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib" 2>/dev/null`
-+	if $PKG_CONFIG --exists "glib-2.0" >/dev/null 2>&1; then
-+		pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null`
- 	else
- 		pkg_failed=yes
- 	fi
-@@ -21718,8 +21718,8 @@ else
-   if test "x$ac_cv_env_GLIB_LIBS_set" = "xset"; then
- 	pkg_cv_GLIB_LIBS=$ac_cv_env_GLIB_LIBS_value
- elif test -n "$PKG_CONFIG"; then
--	if $PKG_CONFIG --exists "glib" >/dev/null 2>&1; then
--		pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib" 2>/dev/null`
-+	if $PKG_CONFIG --exists "glib-2.0" >/dev/null 2>&1; then
-+		pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null`
- 	else
- 		pkg_failed=yes
- 	fi
-@@ -21731,7 +21731,7 @@ echo "$as_me:$LINENO: result: $pkg_cv_GL
- echo "${ECHO_T}$pkg_cv_GLIB_LIBS" >&6
- 
- if test $pkg_failed = yes; then
--	GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib"`
-+	GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"`
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GLIB_PKG_ERRORS" 1>&5
- 
diff --git a/devel/g-wrap/patches/patch-ad b/devel/g-wrap/patches/patch-ad
new file mode 100644
index 00000000000..49574267176
--- /dev/null
+++ b/devel/g-wrap/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2007/05/17 23:59:35 gdt Exp $
+
+--- guile/examples/Makefile.am.orig	2007-04-13 13:35:30.000000000 -0400
++++ guile/examples/Makefile.am
+@@ -5,7 +5,7 @@ libmiscutils_la_SOURCES = miscutils.c mi
+ 
+ lib_LTLIBRARIES += libgw-guile-miscutils.la
+ libgw_guile_miscutils_la_SOURCES = miscutils-guile.c miscutils-guile.h gw-miscutils.c
+-libgw_guile_miscutils_la_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/guile
++libgw_guile_miscutils_la_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/guile -I$(top_srcdir)/libffi/include
+ libgw_guile_miscutils_la_LDFLAGS = -module
+ libgw_guile_miscutils_la_LIBADD = libmiscutils.la \
+ 				  $(top_builddir)/guile/g-wrap/libgwrap-guile-runtime.la \
diff --git a/devel/g-wrap/patches/patch-ae b/devel/g-wrap/patches/patch-ae
new file mode 100644
index 00000000000..ad2f698655d
--- /dev/null
+++ b/devel/g-wrap/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2007/05/17 23:59:35 gdt Exp $
+
+--- guile/examples/Makefile.in.orig	2007-05-15 13:44:46.000000000 -0400
++++ guile/examples/Makefile.in
+@@ -78,7 +78,7 @@ libgw_guile_miscutils_la_OBJECTS =  \
+ libmiscutils_la_LIBADD =
+ am_libmiscutils_la_OBJECTS = miscutils.lo
+ libmiscutils_la_OBJECTS = $(am_libmiscutils_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/g-wrap
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/g-wrap -I$(top_builddir)/libffi/include
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \