Convert to use guile-1.6. Based on PR 28525 by Andreas Hallmann.

5 files changed, 32 insertions, 35 deletions

diff --git a/devel/g-wrap1/Makefile b/devel/g-wrap1/Makefile
index afc30481816..0ee1e9e1edd 100644
--- a/devel/g-wrap1/Makefile
+++ b/devel/g-wrap1/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/12/03 16:06:06 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/12/04 16:23:42 wiz Exp $
 
 DISTNAME=	g-wrap-1.3.4
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gnucash.org/pub/g-wrap/source/
 
@@ -9,22 +9,21 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gnucash.org/
 COMMENT=	Tool for importing types, functions, and constants into guile 1.4
 
-DEPENDS+=	guile-slib-2.4.2nb[0-5]:../../devel/guile14-slib
+DEPENDS+=	guile-slib>=2.4.2nb6:../../devel/guile14-slib
 
 USE_BUILDLINK3=		YES
 
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
-MAKE_ENV+=		GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
 
 USE_MAKEINFO=		YES
 INFO_FILES=		g-wrap.info
 
-CONFIGURE_ARGS+=	--with-modules-dir=${PREFIX}/${GUILE14_SUBDIR}/share/guile
+CONFIGURE_ARGS+=	--with-modules-dir=${PREFIX}/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 "../../devel/guile-gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/g-wrap1/PLIST b/devel/g-wrap1/PLIST
index ef871d6a0ab..428a8c73c70 100644
--- a/devel/g-wrap1/PLIST
+++ b/devel/g-wrap1/PLIST
@@ -1,21 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/03 16:02:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/12/04 16:23:42 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
@@ -26,5 +10,21 @@ lib/libgw-wct.la
 lib/libgwrap-glib.la
 lib/libgwrap-wct.la
 share/aclocal/g-wrap.m4
+share/guile/g-wrap.scm
+share/guile/g-wrap/enumeration.scm
+share/guile/g-wrap/g-translate.scm
+share/guile/g-wrap/gtkobj.scm
+share/guile/g-wrap/gw-glib-spec.scm
+share/guile/g-wrap/gw-glib.scm
+share/guile/g-wrap/gw-gtk-spec.scm
+share/guile/g-wrap/gw-gtk.scm
+share/guile/g-wrap/gw-standard-spec.scm
+share/guile/g-wrap/gw-standard.scm
+share/guile/g-wrap/gw-wct-spec.scm
+share/guile/g-wrap/gw-wct.scm
+share/guile/g-wrap/output-file.scm
+share/guile/g-wrap/runtime.scm
+share/guile/g-wrap/simple-type.scm
+share/guile/g-wrap/sorting.scm
 @dirrm include/g-wrap
-@dirrm guile/1.4/share/guile/g-wrap
+@dirrm share/guile/g-wrap
diff --git a/devel/g-wrap1/buildlink3.mk b/devel/g-wrap1/buildlink3.mk
index be4dbb34762..ea26c305c7e 100644
--- a/devel/g-wrap1/buildlink3.mk
+++ b/devel/g-wrap1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/12/03 16:02:25 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/12/04 16:23:42 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 G_WRAP_BUILDLINK3_MK:=	${G_WRAP_BUILDLINK3_MK}+
@@ -11,14 +11,13 @@ 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_DEPENDS.g-wrap+=	g-wrap>=1.3.4nb6
 BUILDLINK_DEPENDS.g-wrap+=	g-wrap<1.4
-BUILDLINK_RECOMMENDED.g-wrap+=	g-wrap>=1.3.4nb4
 BUILDLINK_PKGSRCDIR.g-wrap?=	../../devel/g-wrap1
 .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"
+.include "../../devel/guile-gtk/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/g-wrap1/distinfo b/devel/g-wrap1/distinfo
index f2122c21161..9c29f7f970c 100644
--- a/devel/g-wrap1/distinfo
+++ b/devel/g-wrap1/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/12/03 16:02:25 wiz Exp $
+$NetBSD: distinfo,v 1.2 2004/12/04 16:23:42 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 (patch-ac) = bc59b2fe1aee409f16ad5d8a95bc9ce061499518
diff --git a/devel/g-wrap1/patches/patch-ac b/devel/g-wrap1/patches/patch-ac
index a8c1d1821aa..3bfa542d5ab 100644
--- a/devel/g-wrap1/patches/patch-ac
+++ b/devel/g-wrap1/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/12/03 16:02:25 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2004/12/04 16:23:42 wiz Exp $
 
 --- bin/Makefile.in.orig	2002-11-08 05:40:46.000000000 +0100
 +++ bin/Makefile.in
@@ -6,8 +6,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/12/03 16:02:25 wiz Exp $
  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:@-GUILE-@:${GUILE}:' \
  	    -e 's:@-VERSION-@:${VERSION}:' \
 -	    -e 's:@-libdir-@:${libdir}:' \
 +	    -e 's:@-libdir-@:${libdir}:g' \