5 files changed, 69 insertions, 19 deletions

diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index e4db8d62a8fe..2361df0b9c60 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -7,15 +7,18 @@
 #
 
 PORTNAME=	g-wrap
-PORTVERSION=	0.9.12
+PORTVERSION=	1.1.9
 CATEGORIES=	devel
 MASTER_SITES=	http://www.gnucash.org/pub/g-wrap/source/
 
 MAINTAINER=	gnome@FreeBSD.org
 
+BUILD_DEPENDS=	${LOCALBASE}/share/slib/require.scm:${PORTSDIR}/lang/slib
 LIB_DEPENDS=	guile.9:${PORTSDIR}/lang/guile
+RUN_DEPENDS=	${LOCALBASE}/share/slib/require.scm:${PORTSDIR}/lang/slib
 
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+MAKE_ENV=	GUILE_LOAD_PATH=${WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/devel/g-wrap/distinfo b/devel/g-wrap/distinfo
index a98d87f7dbbb..5bd566a86cd7 100644
--- a/devel/g-wrap/distinfo
+++ b/devel/g-wrap/distinfo
@@ -1 +1 @@
-MD5 (g-wrap-0.9.12.tar.gz) = 667af789f4090a2fd499e1cf0770cbbf
+MD5 (g-wrap-1.1.9.tar.gz) = b06927729dbc6c1322bf9d61e2662036
diff --git a/devel/g-wrap/files/patch-g-wrapped::Makefile.in b/devel/g-wrap/files/patch-g-wrapped::Makefile.in
new file mode 100644
index 000000000000..829d2a784829
--- /dev/null
+++ b/devel/g-wrap/files/patch-g-wrapped::Makefile.in
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- g-wrapped/Makefile.in.orig	Thu Jan 25 19:24:47 2001
++++ g-wrapped/Makefile.in	Tue Jul 31 12:24:38 2001
+@@ -99,7 +99,7 @@
+ 
+ #BEGIN TEMP JUNK ============================================================
+ 
+-CFLAGS =  -O2 -Wall -g -I../libruntime-guile @CFLAGS@
++CFLAGS =  -Wall -I../libruntime-guile @CFLAGS@
+ 
+ #I believe libtool won't allow this yet.
+ #EXTRA_LTLIBRARIES=libruntime.la
+@@ -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@   ../libruntime-guile/libg-wrap-runtime-guile.la
+ 
+ CLEANFILES =  gw-runtime.h gw-runtime.c gw-runtime.html
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/devel/g-wrap/files/patch-test::Makefile.in b/devel/g-wrap/files/patch-test::Makefile.in
new file mode 100644
index 000000000000..75fbd94fb884
--- /dev/null
+++ b/devel/g-wrap/files/patch-test::Makefile.in
@@ -0,0 +1,26 @@
+
+$FreeBSD$
+
+--- test/Makefile.in.orig	Thu Jan 25 19:24:52 2001
++++ test/Makefile.in	Tue Jul 31 12:29:40 2001
+@@ -100,17 +100,17 @@
+ 
+ #BEGIN TEMP JUNK ============================================================
+ 
+-CFLAGS = -O2 -Werror -Wall -g -I../libruntime-guile @CFLAGS@
++CFLAGS = -Werror -Wall -I../libruntime-guile @CFLAGS@
+ 
+ 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 =    ../libruntime-guile/libg-wrap-runtime-guile.la
+ 
+ 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 =    ../libruntime-guile/libg-wrap-runtime-guile.la
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../conf.h
diff --git a/devel/g-wrap/pkg-plist b/devel/g-wrap/pkg-plist
index a3d4087d6591..964a68a5104e 100644
--- a/devel/g-wrap/pkg-plist
+++ b/devel/g-wrap/pkg-plist
@@ -1,20 +1,18 @@
-bin/g-scan
-bin/g-wrap
 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.so
-lib/libgwrapguile.so.0
-libexec/g-wrap-guile
+lib/libg-wrap-runtime-guile.a
+lib/libg-wrap-runtime-guile.so
+lib/libg-wrap-runtime-guile.so.2
 share/aclocal/g-wrap.m4
-share/guile/site/g-wrap.scm
-share/guile/site/g-wrap/g-translate.scm
-share/guile/site/g-wrap/guile-types.scm
-share/guile/site/g-wrap/output-file.scm
-share/guile/site/g-wrap/pointer.scm
-share/guile/site/g-wrap/sorting.scm
-@dirrm share/guile/site/g-wrap
-@dirrm share/guile/site
+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.so
+share/guile/g-wrapped/libgw-runtime.so.0
+@dirrm share/guile/g-wrapped
+@dirrm share/guile/g-wrap