Update "g-wrap" package to version 1.1.10. A very extensive list of

changes is available in the "ChangeLog" file.

7 files changed, 85 insertions, 41 deletions

diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index 74d60b03b87..59c257c4ce1 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2001/05/31 10:07:59 dent Exp $
-#
+# $NetBSD: Makefile,v 1.5 2001/07/01 15:12:44 tron Exp $
 
-DISTNAME=	g-wrap-0.9.5
+DISTNAME=	g-wrap-1.1.10
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gnucash.org/pub/g-wrap/source/
 
@@ -11,10 +10,11 @@ COMMENT=	tool for importing types, functions, and constants into guile
 
 DEPENDS+=	guile>=1.3.4:../../lang/guile
 
-GNU_CONFIGURE=	# defined
-CONFIGURE_ENV+=	ac_cv_path_RSCHEME="nope"
+GNU_CONFIGURE=	YES
+USE_GMAKE=	YeS
+USE_LIBTOOL=	YES
 
-USE_LIBTOOL=	# defined
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
+CONFIGURE_ENV+=		ac_cv_path_RSCHEME="nope"
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/g-wrap/distinfo b/devel/g-wrap/distinfo
index c155cfc7498..e42f5fb7ddf 100644
--- a/devel/g-wrap/distinfo
+++ b/devel/g-wrap/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:18 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/07/01 15:12:44 tron Exp $
 
-SHA1 (g-wrap-0.9.5.tar.gz) = d7c5a9343f7cbe877bb0e485ca6604f5aafaa1cd
-Size (g-wrap-0.9.5.tar.gz) = 218642 bytes
-SHA1 (patch-ab) = 97662e6c047a427138df99a5c8a2757dfb3616cd
-SHA1 (patch-ac) = 09a5cd11ba19c79fad54802e3e8c823445df2a3e
+SHA1 (g-wrap-1.1.10.tar.gz) = f9bbb8d9cd6b48b8f197a54fce7e5ed20f669489
+Size (g-wrap-1.1.10.tar.gz) = 247345 bytes
+SHA1 (patch-aa) = 34cd0d5497c1b21f7d19e8d7b165549c8a49aad5
+SHA1 (patch-ab) = 947f9da5712f9ae562e56242f5844ea6d18436a6
+SHA1 (patch-ac) = 098bb2e6c239b38afa40d28362cc553982ac3e38
+SHA1 (patch-ad) = bb60370857cfb5e9b6f13176b95a2b1c87d4b96f
diff --git a/devel/g-wrap/patches/patch-aa b/devel/g-wrap/patches/patch-aa
new file mode 100644
index 00000000000..68e7d5737e2
--- /dev/null
+++ b/devel/g-wrap/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.3 2001/07/01 15:12:45 tron Exp $
+
+--- g-wrapped/Makefile.in.orig	Thu Apr 12 05:14:17 2001
++++ g-wrapped/Makefile.in	Sun Jul  1 16:55:14 2001
+@@ -107,7 +107,7 @@
+ gwrappedmodule_LTLIBRARIES =  libgw-runtime.la
+ libgw_runtime_la_SOURCES = gw-runtime.c
+ libgw_runtime_la_LDFLAGS = -rpath $(libdir) -module -export-dynamic
+-libgw_runtime_la_LIBADD =    @GUILE_LIBS@   -L$(LOCALPWD)/../libruntime-guile/.libs -lg-wrap-runtime-guile
++libgw_runtime_la_LIBADD =    @GUILE_LIBS@   -L$(LOCALPWD)/../libruntime-guile -lg-wrap-runtime-guile
+ 
+ CLEANFILES =  gw-runtime.h gw-runtime.c gw-runtime.html
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -366,7 +366,7 @@
+ #END TEMP JUNK ===============================================================
+ 
+ # This must be built before we can build the examples...
+-$(LOCALPWD)/../libruntime-guile/.libs/libg-wrap-runtime-guile.so:
++$(LOCALPWD)/../libruntime-guile/libg-wrap-runtime-guile.so:
+ 	(cd ../libruntime-guile && ${MAKE})
+ 
+ # include a dependency on g-wrap so we're sure we built everything.
diff --git a/devel/g-wrap/patches/patch-ab b/devel/g-wrap/patches/patch-ab
index f1d80072268..8bda509e808 100644
--- a/devel/g-wrap/patches/patch-ab
+++ b/devel/g-wrap/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/06/26 16:57:09 rh Exp $
+$NetBSD: patch-ab,v 1.2 2001/07/01 15:12:45 tron Exp $
 
---- g-wrap-config.in.orig	Wed Apr 12 21:06:56 2000
-+++ g-wrap-config.in	Mon Jun 26 17:45:02 2000
+--- bin/g-wrap-config.in.orig	Wed Apr 12 21:06:56 2000
++++ bin/g-wrap-config.in	Mon Jun 26 17:45:02 2000
 @@ -52,7 +52,7 @@
          (begin
            (if static?
diff --git a/devel/g-wrap/patches/patch-ac b/devel/g-wrap/patches/patch-ac
index 926d2e0e236..dd1ba50b737 100644
--- a/devel/g-wrap/patches/patch-ac
+++ b/devel/g-wrap/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/06/26 16:57:09 rh Exp $
+$NetBSD: patch-ac,v 1.2 2001/07/01 15:12:45 tron Exp $
 
---- Makefile.in.orig	Wed Jun 21 23:59:21 2000
-+++ Makefile.in	Mon Jun 26 17:52:19 2000
-@@ -427,7 +427,7 @@
+--- bin/Makefile.in.orig	Thu Apr 12 05:14:14 2001
++++ bin/Makefile.in	Sun Jul  1 16:16:37 2001
+@@ -232,7 +232,7 @@
  	sed < $@.in > $@.tmp \
  	    -e 's:@-GUILE-@:${GUILE}:' \
  	    -e 's:@-VERSION-@:${VERSION}:' \
 -	    -e 's:@-libdir-@:${libdir}:' \
 +	    -e 's:@-libdir-@:${libdir}:g' \
- 	    -e 's:@-includedir-@:${includedir}:'
+ 	    -e 's:@-includedir-@:${includedir}:' \
+ 	    -e 's:@-GUILE_MODULE_DIR-@:${GUILEMODDIR}:'
  	chmod +x $@.tmp
- 	mv $@.tmp $@
diff --git a/devel/g-wrap/patches/patch-ad b/devel/g-wrap/patches/patch-ad
new file mode 100644
index 00000000000..c36b7d67904
--- /dev/null
+++ b/devel/g-wrap/patches/patch-ad
@@ -0,0 +1,19 @@
+$NetBSD: patch-ad,v 1.1 2001/07/01 15:12:45 tron Exp $
+
+--- test/Makefile.in.orig	Thu Apr 12 05:14:22 2001
++++ test/Makefile.in	Sun Jul  1 16:56:11 2001
+@@ -105,12 +105,12 @@
+ noinst_LTLIBRARIES =  libgw-test-parent.la libgw-test-child.la
+ libgw_test_parent_la_SOURCES = gw-test-parent.c gw-test-parent-code.c
+ libgw_test_parent_la_LDFLAGS = -rpath $(libdir) -module -export-dynamic
+-libgw_test_parent_la_LIBADD =    -L$(LOCALPWD)/../libruntime-guile/.libs -lg-wrap-runtime-guile
++libgw_test_parent_la_LIBADD =    -L$(LOCALPWD)/../libruntime-guile -lg-wrap-runtime-guile
+ 
+ CLEANFILES =  gw-test-parent.h gw-test-parent.c gw-test-parent.html gw-test-parent-autogen.h gw-test-child.h gw-test-child.c gw-test-child.html gw-test-child-autogen.h
+ libgw_test_child_la_SOURCES = gw-test-child.c gw-test-child-code.c
+ libgw_test_child_la_LDFLAGS = -rpath $(libdir) -module -export-dynamic
+-libgw_test_child_la_LIBADD =    -L$(LOCALPWD)/../libruntime-guile/.libs -lg-wrap-runtime-guile
++libgw_test_child_la_LIBADD =    -L$(LOCALPWD)/../libruntime-guile -lg-wrap-runtime-guile
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../conf.h
diff --git a/devel/g-wrap/pkg/PLIST b/devel/g-wrap/pkg/PLIST
index c1d01c72716..10cff89c065 100644
--- a/devel/g-wrap/pkg/PLIST
+++ b/devel/g-wrap/pkg/PLIST
@@ -1,22 +1,23 @@
-@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:27 agc Exp $
-bin/g-scan
-bin/g-wrap
+@comment $NetBSD: PLIST,v 1.3 2001/07/01 15:12:46 tron Exp $
 bin/g-wrap-config
-include/g-wrap.h
-@unexec install-info --delete %D/info/g-wrap.info %D/info/dir
+include/g-wrap-runtime-guile.h
 info/g-wrap.info
-@exec install-info %D/info/g-wrap.info %D/info/dir
-lib/libgwrapguile.a
-lib/libgwrapguile.la
-lib/libgwrapguile.so
-lib/libgwrapguile.so.0
-lib/libgwrapguile.so.0.0
-libexec/g-wrap-guile
-share/guile/site/g-wrap.scm
-share/guile/site/g-wrap/guile-types.scm
-share/guile/site/g-wrap/output-file.scm
-share/guile/site/g-wrap/g-translate.scm
-share/guile/site/g-wrap/sorting.scm
-share/guile/site/g-wrap/pointer.scm
-@dirrm share/guile/site/g-wrap
-@dirrm share/guile/site
+lib/libg-wrap-runtime-guile.a
+lib/libg-wrap-runtime-guile.la
+lib/libg-wrap-runtime-guile.so
+lib/libg-wrap-runtime-guile.so.2
+lib/libg-wrap-runtime-guile.so.2.0
+share/aclocal/g-wrap.m4
+share/guile/g-wrap.scm
+share/guile/g-wrap/g-translate.scm
+share/guile/g-wrap/guile-types.scm
+share/guile/g-wrap/output-file.scm
+share/guile/g-wrap/sorting.scm
+share/guile/g-wrapped/gw-runtime-spec.scm
+share/guile/g-wrapped/libgw-runtime.a
+share/guile/g-wrapped/libgw-runtime.la
+share/guile/g-wrapped/libgw-runtime.so
+share/guile/g-wrapped/libgw-runtime.so.0
+share/guile/g-wrapped/libgw-runtime.so.0.0
+@dirrm share/guile/g-wrapped
+@dirrm share/guile/g-wrap