Update to 1.9.4:

  - Enhanced generics support: now all arguments of methods are
    specialized, not only the first one.

  - Bugfixes
    + Now ships with (g-wrap gw-wct) compatibilty module needed by
      GnuCash at runtime.
    + Fixes for handling output arguments:
      - Wrapped functions with void return value and output arguments
	now return expected results
      - Optional argument count is now correctly computed in the
        presence of output arguments
    + The libffi alignment requirements are now honored. This fixes bus
      errors on many non-x86 architectures.
    + On big-endian architectures libffi-wrapped functions that return
      char now work correctly.
    + Some "uninitialized variable" warnings were fixed in generated code
      which caused compiles with GCC 4.0 to fail (Debian Bug#290305).

5 files changed, 13 insertions, 28 deletions

diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index cad55cb5481..9e3415cf0f2 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2004/12/07 14:25:47 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2005/02/27 13:19:20 wiz Exp $
 
-DISTNAME=	g-wrap-1.9.3
+DISTNAME=	g-wrap-1.9.4
 CATEGORIES=	devel
 MASTER_SITES=	http://savannah.nongnu.org/download/g-wrap/
 
diff --git a/devel/g-wrap/PLIST b/devel/g-wrap/PLIST
index 039747b01ae..f5405f2b2cf 100644
--- a/devel/g-wrap/PLIST
+++ b/devel/g-wrap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/12/03 17:06:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/02/27 13:19:20 wiz Exp $
 bin/g-wrap-config
 include/ffi.h
 include/ffitarget.h
@@ -19,10 +19,10 @@ 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-wct.scm
 share/guile/site/g-wrap/gw/glib.scm
 share/guile/site/g-wrap/gw/standard.scm
 share/guile/site/g-wrap/rti.scm
@@ -31,7 +31,5 @@ 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
diff --git a/devel/g-wrap/distinfo b/devel/g-wrap/distinfo
index afe1aadf6b2..7e94d7ce90a 100644
--- a/devel/g-wrap/distinfo
+++ b/devel/g-wrap/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 22:24:14 agc Exp $
+$NetBSD: distinfo,v 1.10 2005/02/27 13:19:20 wiz Exp $
 
-SHA1 (g-wrap-1.9.3.tar.gz) = d7b50b3d8d4c97df20141a831f9855119154aba0
-RMD160 (g-wrap-1.9.3.tar.gz) = e9c98d8ed3fc3ee6a901bff009f1ddfc27d4f527
-Size (g-wrap-1.9.3.tar.gz) = 813945 bytes
-SHA1 (patch-aa) = 620c1357a05eb39792c98b1819cbf3d18e542363
-SHA1 (patch-ab) = 68ff165ef35d10055dcfb0792c149f92f8638962
+SHA1 (g-wrap-1.9.4.tar.gz) = 9fb715745cd0eec2b89876b8a1df8ea0e4e3ae0f
+RMD160 (g-wrap-1.9.4.tar.gz) = 1e85a361830344eb50f0495fe37ca8176706397e
+Size (g-wrap-1.9.4.tar.gz) = 816742 bytes
+SHA1 (patch-aa) = 57ee87da372c0d43f384767d7b585a7d09b87b8b
diff --git a/devel/g-wrap/patches/patch-aa b/devel/g-wrap/patches/patch-aa
index 5251b82d8f9..49ecec1a0f3 100644
--- a/devel/g-wrap/patches/patch-aa
+++ b/devel/g-wrap/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.6 2004/12/03 17:06:58 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2005/02/27 13:19:20 wiz Exp $
 
---- g-wrap/Makefile.in.orig	2004-10-16 12:27:42.000000000 -0400
+--- g-wrap/Makefile.in.orig	2005-01-25 13:35:45.000000000 +0100
 +++ g-wrap/Makefile.in
-@@ -342,6 +342,7 @@ uninstall-info-am:
+@@ -352,6 +352,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'`; \
+ 	@$(am__vpath_adj_setup) \
  	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
deleted file mode 100644
index e97344e128c..00000000000
--- a/devel/g-wrap/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2004/12/03 17:06:58 wiz Exp $
-
---- 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; \