Update to 1.9.3, from Greg Troxel via pkgsrc-wip.

Changes since 1.3.4:

Version 1.9.3

  - Comes with a compatibility layer that allows GnuCash to be built
    with it.

  - Reverts the enhanced generics support, which was introduced in
    1.9.2, since that currently breaks guile-gnome

  - Bugfixes
    + g-wrap-2.0-guile.pc is now generated correctly, even if the
      internal libffi is used.
    + Types used by constants are now considered when calculating the
      set of referenced types in a wrapset. This bug led to missing code
      and compile errors when a type defined in another wrapset was used
      by only by a constant.
    + On platforms which lack alloca(), the version shipped with
      G-Wrap should now build correctly.

Version 1.9.2

  - Now comes with libffi included, for systems which lack an libffi
    installation

  - SRFI module checks now work correctly, even if you do an in-tree build

Version 1.9.1

 - API change: destruct-value-cg is now named destroy-value-cg

 - Bugfixes
   + A bug in the latent generic code has been fixed
   + The error message for WCP type errors has been fixed

Version 1.9.0

 - Complete rewrite; too many changes to list, see the manual for the
   new GOOPS-based API and the guile-gnome project for an extended
   example.

  - New features:
    + Output arguments
    + Default arguments

  - G-Wrap should be target-language agnostic, like it was in its
    early days.

8 files changed, 91 insertions, 101 deletions

diff --git a/devel/g-wrap/DESCR b/devel/g-wrap/DESCR
index bb4768af305..8817c3b1fd1 100644
--- a/devel/g-wrap/DESCR
+++ b/devel/g-wrap/DESCR
@@ -1,3 +1,17 @@
-  G-Wrap is a tool for specifying types, functions, and constants to
-import into a Scheme interpreter, and for generating code (in C) to
-interface these to the Guile interpreter in particular.
+G-Wrap is a tool (and Guile library) for generating function wrappers
+for inter-language calls. It currently only supports generating Guile
+wrappers for C functions.
+
+This package provides G-Wrap TNG (to be 2.0), with the following
+goals:
+
+  * Use GOOPS, for enhanced flexibility
+
+  * Get rid of the cruft that has accumulated, simplify where possible
+    without sacrificing features
+
+  * Be target-language agnostic; i.e. clean separation of the core and
+    e.g. the Guile-specific code. New languages (perhaps even
+    non-Schemes) should be easy to add.
+
+  * Offer the current (1.3.4+) wrapping API as a compatibility layer.
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index 4b545ce74ff..cf9bdf1f22c 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,30 +1,24 @@
-# $NetBSD: Makefile,v 1.30 2004/12/03 15:55:36 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2004/12/03 17:06:58 wiz Exp $
 
-DISTNAME=	g-wrap-1.3.4
-PKGREVISION=	5
+DISTNAME=	g-wrap-1.9.3
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.gnucash.org/pub/g-wrap/source/
+MASTER_SITES=	http://savannah.nongnu.org/download/g-wrap/
 
-MAINTAINER=	rh@NetBSD.org
-HOMEPAGE=	http://www.gnucash.org/
-COMMENT=	Tool for importing types, functions, and constants into guile
+MAINTAINER=	gdt@ir.bbn.com
+HOMEPAGE=	http://www.nongnu.org/g-wrap/
+COMMENT=	Tool for generating guile wrappers for C code
 
-DEPENDS+=	guile-slib-2.4.2nb[0-5]:../../devel/guile14-slib
+DEPENDS+=	guile-lib>=0.1.2:../../devel/guile-lib
 
 USE_BUILDLINK3=		YES
 
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
-MAKE_ENV+=		GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
+TEST_TARGET=		check
 
 USE_MAKEINFO=		YES
 INFO_FILES=		g-wrap.info
 
-CONFIGURE_ARGS+=	--with-modules-dir=${PREFIX}/${GUILE14_SUBDIR}/share/guile
-CONFIGURE_ENV+=		ac_cv_path_RSCHEME="nope"
-
-.include "../../devel/glib/buildlink3.mk"
-.include "../../lang/guile14/buildlink3.mk"
-.include "../../devel/guile14-gtk/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 ce64d0f8257..039747b01ae 100644
--- a/devel/g-wrap/PLIST
+++ b/devel/g-wrap/PLIST
@@ -1,30 +1,37 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:24 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/12/03 17:06:58 wiz Exp $
 bin/g-wrap-config
-guile/1.4/share/guile/g-wrap.scm
-guile/1.4/share/guile/g-wrap/enumeration.scm
-guile/1.4/share/guile/g-wrap/g-translate.scm
-guile/1.4/share/guile/g-wrap/gtkobj.scm
-guile/1.4/share/guile/g-wrap/gw-glib-spec.scm
-guile/1.4/share/guile/g-wrap/gw-glib.scm
-guile/1.4/share/guile/g-wrap/gw-gtk-spec.scm
-guile/1.4/share/guile/g-wrap/gw-gtk.scm
-guile/1.4/share/guile/g-wrap/gw-standard-spec.scm
-guile/1.4/share/guile/g-wrap/gw-standard.scm
-guile/1.4/share/guile/g-wrap/gw-wct-spec.scm
-guile/1.4/share/guile/g-wrap/gw-wct.scm
-guile/1.4/share/guile/g-wrap/output-file.scm
-guile/1.4/share/guile/g-wrap/runtime.scm
-guile/1.4/share/guile/g-wrap/simple-type.scm
-guile/1.4/share/guile/g-wrap/sorting.scm
-include/g-wrap/g-wrap-compatibility.h
-include/g-wrap/g-wrap-glib.h
-include/g-wrap/g-wrap-wct.h
-lib/libgw-glib.la
-lib/libgw-gtk.la
-lib/libgw-standard.la
-lib/libgw-wct.la
-lib/libgwrap-glib.la
-lib/libgwrap-wct.la
-share/aclocal/g-wrap.m4
+include/ffi.h
+include/ffitarget.h
+include/g-wrap-wct.h
+include/g-wrap/core-runtime.h
+include/g-wrap/ffi-support.h
+include/g-wrap/guile-compatibility.h
+include/g-wrap/guile-runtime.h
+include/g-wrap/guile-wct.h
+lib/libffi.la
+lib/libgw-guile-gw-glib.la
+lib/libgw-guile-standard.la
+lib/libgwrap-core-runtime.la
+lib/libgwrap-guile-runtime.la
+lib/pkgconfig/g-wrap-2.0-guile.pc
+share/guile/site/g-wrap.scm
+share/guile/site/g-wrap/c-types.scm
+share/guile/site/g-wrap/compat.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-standard-spec.scm
+share/guile/site/g-wrap/gw-wct-spec.scm
+share/guile/site/g-wrap/gw/glib.scm
+share/guile/site/g-wrap/gw/standard.scm
+share/guile/site/g-wrap/rti.scm
+share/guile/site/g-wrap/simple-type.scm
+share/guile/site/g-wrap/util.scm
+share/guile/site/g-wrap/ws/standard.scm
+@dirrm share/guile/site/g-wrap/ws
+@dirrm share/guile/site/g-wrap/gw
+@dirrm share/guile/site/g-wrap/guile/ws
+@dirrm share/guile/site/g-wrap/guile
+@dirrm share/guile/site/g-wrap
 @dirrm include/g-wrap
-@dirrm guile/1.4/share/guile/g-wrap
diff --git a/devel/g-wrap/buildlink3.mk b/devel/g-wrap/buildlink3.mk
index bb4f64823a2..da4dd7cc056 100644
--- a/devel/g-wrap/buildlink3.mk
+++ b/devel/g-wrap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/12/03 14:31:29 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/12/03 17:06:58 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 G_WRAP_BUILDLINK3_MK:=	${G_WRAP_BUILDLINK3_MK}+
@@ -11,13 +11,10 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ng-wrap}
 BUILDLINK_PACKAGES+=	g-wrap
 
 .if !empty(G_WRAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.g-wrap+=	g-wrap>=1.3.4nb3
-BUILDLINK_RECOMMENDED.g-wrap+=	g-wrap>=1.3.4nb4
+BUILDLINK_DEPENDS.g-wrap+=	g-wrap>=1.9.3
 BUILDLINK_PKGSRCDIR.g-wrap?=	../../devel/g-wrap
 .endif	# G_WRAP_BUILDLINK3_MK
 
-.include "../../devel/glib/buildlink3.mk"
-.include "../../lang/guile14/buildlink3.mk"
-.include "../../devel/guile14-gtk/buildlink3.mk"
+.include "../../lang/guile/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/g-wrap/distinfo b/devel/g-wrap/distinfo
index 47dffd381d4..b8f607f2528 100644
--- a/devel/g-wrap/distinfo
+++ b/devel/g-wrap/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2004/05/03 15:58:55 wiz Exp $
+$NetBSD: distinfo,v 1.8 2004/12/03 17:06:58 wiz Exp $
 
-SHA1 (g-wrap-1.3.4.tar.gz) = 764f1c878e18341bf437f3e1ddc5f8618019bfc2
-Size (g-wrap-1.3.4.tar.gz) = 403570 bytes
-SHA1 (patch-aa) = 284e62e9a3456ab03a8337298fde587b2729c786
-SHA1 (patch-ab) = 92f8e1ed55a3ba563837b36e2f39888734aebefe
-SHA1 (patch-ac) = 7bd1543e1941668d71507d8ee6e1c5f1614f6472
+SHA1 (g-wrap-1.9.3.tar.gz) = d7b50b3d8d4c97df20141a831f9855119154aba0
+Size (g-wrap-1.9.3.tar.gz) = 813945 bytes
+SHA1 (patch-aa) = 620c1357a05eb39792c98b1819cbf3d18e542363
+SHA1 (patch-ab) = 68ff165ef35d10055dcfb0792c149f92f8638962
diff --git a/devel/g-wrap/patches/patch-aa b/devel/g-wrap/patches/patch-aa
index 5db02d08141..5251b82d8f9 100644
--- a/devel/g-wrap/patches/patch-aa
+++ b/devel/g-wrap/patches/patch-aa
@@ -1,16 +1,12 @@
-$NetBSD: patch-aa,v 1.5 2003/06/24 14:39:16 seb Exp $
+$NetBSD: patch-aa,v 1.6 2004/12/03 17:06:58 wiz Exp $
 
---- doc/g-wrap.texi.orig	2002-11-07 17:23:43.000000000 +0000
-+++ doc/g-wrap.texi
-@@ -14,6 +14,11 @@
- @parskip 4pt plus 1pt
- @end iftex
- 
-+@dircategory Programming
-+@direntry
-+* g-wrap: (g-wrap).            Create C bindings for Scheme/Guile.
-+@end direntry
-+
- @titlepage
- @title g-wrap
- @subtitle A tool to wrap C APIs for Guile use.
+--- g-wrap/Makefile.in.orig	2004-10-16 12:27:42.000000000 -0400
++++ g-wrap/Makefile.in
+@@ -342,6 +342,7 @@ uninstall-info-am:
+ install-nobase_gwrapmoduleDATA: $(nobase_gwrapmodule_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(gwrapmoduledir)" || $(mkdir_p) "$(DESTDIR)$(gwrapmoduledir)"
++	test -z "$(gwrapmoduledir)/ws" || $(mkdir_p) "$(DESTDIR)$(gwrapmoduledir)/ws"
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(nobase_gwrapmodule_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
diff --git a/devel/g-wrap/patches/patch-ab b/devel/g-wrap/patches/patch-ab
index 35d7bb667f0..e97344e128c 100644
--- a/devel/g-wrap/patches/patch-ab
+++ b/devel/g-wrap/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.3 2003/02/24 20:50:19 jschauma Exp $
+$NetBSD: patch-ab,v 1.4 2004/12/03 17:06:58 wiz Exp $
 
---- bin/g-wrap-config.in.orig	Thu Nov  7 17:23:43 2002
-+++ bin/g-wrap-config.in	Thu Feb  6 17:23:29 2003
-@@ -56,7 +56,7 @@
-                (lambda (lib) (stdout " @-libdir-@/lib" lib ".a"))
-                (cdr libs))
-               (begin
--                (stdout "-L@-libdir-@")
-+                (stdout "-Wl,-R@-libdir-@ -L@-libdir-@")
-                 (for-each
-                  (lambda (lib) (stdout " -l" lib))
-                  (cdr libs))))
+--- guile/g-wrap/Makefile.in.orig	2004-10-16 12:27:42.000000000 -0400
++++ guile/g-wrap/Makefile.in
+@@ -378,6 +378,7 @@ uninstall-info-am:
+ install-nobase_gwrapmoduleDATA: $(nobase_gwrapmodule_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(gwrapmoduledir)" || $(mkdir_p) "$(DESTDIR)$(gwrapmoduledir)"
++	test -z "$(gwrapmoduledir)/guile/ws" || $(mkdir_p) "$(DESTDIR)$(gwrapmoduledir)/guile/ws"
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(nobase_gwrapmodule_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
diff --git a/devel/g-wrap/patches/patch-ac b/devel/g-wrap/patches/patch-ac
deleted file mode 100644
index 6b7067c9277..00000000000
--- a/devel/g-wrap/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2004/05/03 15:58:55 wiz Exp $
-
---- bin/Makefile.in.orig	2002-11-08 05:40:46.000000000 +0100
-+++ bin/Makefile.in
-@@ -333,9 +333,9 @@ g-wrap: g-wrap.in Makefile
- g-wrap-config: g-wrap-config.in
- 	rm -f $@.tmp
- 	sed < $@.in > $@.tmp \
--	    -e 's:@-GUILE-@:${GUILE}:' \
-+	    -e 's:@-GUILE-@:${PREFIX}/${GUILE14_SUBDIR}/bin/guile:' \
- 	    -e 's:@-VERSION-@:${VERSION}:' \
--	    -e 's:@-libdir-@:${libdir}:' \
-+	    -e 's:@-libdir-@:${libdir}:g' \
- 	    -e 's:@-includedir-@:${includedir}:' \
- 	    -e 's:@-GUILE_MODULE_DIR-@:${GUILEMODDIR}:'
- 	chmod +x $@.tmp