Rename older (<1.6) Guile as guile14.

Packages using Guile now all depend on guile14.  These packages are
expected to be made depend on newer Guile (1.6.x) when updated in the
future.

23 files changed, 67 insertions, 64 deletions

diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index e3e8aa050c3..fa0cba1b1da 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/11/22 00:41:14 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/07 03:56:17 uebayasi Exp $
 #
 
 DISTNAME=	gerbv-0.11
@@ -17,6 +17,6 @@ USE_GMAKE=	YES
 
 .include "../../graphics/gdk-pixbuf/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
-.include "../../lang/guile/buildlink2.mk"
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index e8041ab6ffa..8eb950a1ff2 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/01/04 23:00:56 cjep Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/07 03:56:18 uebayasi Exp $
 #
 
 DISTNAME=		libgeda-${PKGVERSION}
@@ -26,7 +26,7 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .include "../../devel/libstroke/buildlink2.mk"
 .include "../../graphics/libgdgeda/buildlink2.mk"
-.include "../../lang/guile/buildlink2.mk"
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/libgeda/buildlink2.mk b/cad/libgeda/buildlink2.mk
index 61bd0467442..d6f602ee351 100644
--- a/cad/libgeda/buildlink2.mk
+++ b/cad/libgeda/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/12/13 05:19:52 dmcmahill Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/01/07 03:56:18 uebayasi Exp $
 #
 # This Makefile fragment is included by packages that use libgeda.
 #
@@ -26,7 +26,7 @@ BUILDLINK_FILES.libgeda+=	lib/libgeda.*
 
 .include "../../devel/libstroke/buildlink2.mk"
 .include "../../graphics/libgdgeda/buildlink2.mk"
-.include "../../lang/guile/buildlink2.mk"
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	libgeda-buildlink
diff --git a/databases/guile-pg/Makefile b/databases/guile-pg/Makefile
index f8ec3c77e77..8177362f004 100644
--- a/databases/guile-pg/Makefile
+++ b/databases/guile-pg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/01/05 20:14:22 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/07 03:56:19 uebayasi Exp $
 #
 
 DISTNAME=	guile-pg-0.07
@@ -11,7 +11,6 @@ HOMEPAGE=	http://guile-pg.sourceforge.net/
 COMMENT=	PostgreSQL interface for Guile
 
 DEPENDS+=	postgresql-lib>=7.3.1:../../databases/postgresql-lib
-DEPENDS+=	guile>=1.3:../../lang/guile
 
 USE_LIBTOOL=	YES
 USE_GMAKE=	YES
@@ -21,5 +20,6 @@ CONFIGURE_ARGS+=	--with-libpq-includes=${PREFIX}/include/postgresql
 
 #INFO_FILES=	guile-pg.info
 
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index b9210b3b17a..6861401d882 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/09/24 09:53:18 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/07 03:56:20 uebayasi Exp $
 
 DISTNAME=	g-wrap-1.2.1
 CATEGORIES=	devel
@@ -19,5 +19,5 @@ CONFIGURE_ENV+=		ac_cv_path_RSCHEME="nope"
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-.include "../../lang/guile/buildlink2.mk"
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/g-wrap/buildlink2.mk b/devel/g-wrap/buildlink2.mk
index 08fa7e15b6b..3dc3a3fef0e 100644
--- a/devel/g-wrap/buildlink2.mk
+++ b/devel/g-wrap/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/09/24 10:32:42 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/01/07 03:56:20 uebayasi Exp $
 
 .if !defined(G_WRAP_BUILDLINK2_MK)
 G_WRAP_BUILDLINK2_MK=	# defined
@@ -12,7 +12,7 @@ BUILDLINK_PREFIX.g-wrap_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.g-wrap+=	include/g-wrap-runtime-guile.h
 BUILDLINK_FILES.g-wrap+=	lib/libg-wrap-runtime-guile.*
 
-.include "../../lang/guile/buildlink2.mk"
+.include "../../lang/guile14/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	g-wrap-buildlink
 
diff --git a/devel/guile-fcgi/Makefile b/devel/guile-fcgi/Makefile
index 8714f4c53ea..25586892407 100644
--- a/devel/guile-fcgi/Makefile
+++ b/devel/guile-fcgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/23 17:39:20 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/07 03:56:20 uebayasi Exp $
 
 DISTNAME=	guile-fcgi-0.1
 CATEGORIES=	devel www
@@ -9,7 +9,6 @@ HOMEPAGE=	http://www.bgu.ru/%7Edsa/guilefcgi.html
 COMMENT=	Guile interface to FastCGI
 
 BUILD_DEPENDS=	fcgi>=2.2.0:../../www/fcgi
-DEPENDS=	guile>=1.4:../../lang/guile
 
 GNU_CONFIGURE=	YES
 
@@ -19,4 +18,5 @@ do-build:
 	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} guile-fcgi.x
 	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET}
 
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-gtk/Makefile b/devel/guile-gtk/Makefile
index 6fdafe0b85b..487cf97ad71 100644
--- a/devel/guile-gtk/Makefile
+++ b/devel/guile-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/16 14:38:30 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/07 03:56:21 uebayasi Exp $
 #
 
 DISTNAME=		guile-gtk-0.19
@@ -13,7 +13,6 @@ HOMEPAGE=		http://www.ping.de/sites/zagadka/guile-gtk/
 COMMENT=		Library to make GTK accesible from guile
 
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
-DEPENDS+=		guile>=1.4:../../lang/guile
 
 USE_X11=		# defined
 USE_LIBTOOL=		# defined
@@ -21,4 +20,5 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		# defined
 
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-oops/Makefile b/devel/guile-oops/Makefile
index 9596104a422..4e177faec96 100644
--- a/devel/guile-oops/Makefile
+++ b/devel/guile-oops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/02/18 15:14:12 seb Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/07 03:56:21 uebayasi Exp $
 #
 
 DISTNAME=	guile-oops-0.9.0
@@ -9,11 +9,10 @@ MAINTAINER=	dillo@giga.or.at
 HOMEPAGE=	http://www.gnu.org/software/guile/
 COMMENT=	CLOS-like object system for Guile
 
-DEPENDS+=	guile>=1.3.2:../../lang/guile
-
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=            YES
 LTCONFIG_OVERRIDE=      ${WRKSRC}/ltconfig
 
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-slib/Makefile b/devel/guile-slib/Makefile
index c154cb79f4e..efdee60c069 100644
--- a/devel/guile-slib/Makefile
+++ b/devel/guile-slib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/10/22 15:32:37 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/07 03:56:22 uebayasi Exp $
 
 DISTNAME=	guile-slib-2.4.2
 CATEGORIES=	devel
@@ -9,7 +9,6 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://swissnet.ai.mit.edu/~jaffer/SLIB.html
 COMMENT=	SLIB installation for guile Scheme interpreter
 
-DEPENDS+=	guile>=1.3.2:../../lang/guile
 DEPENDS+=	slib>=2.4.2:../../devel/slib
 
 USE_BUILDLINK2=	yes
@@ -22,4 +21,5 @@ do-install:
 	cd ${PREFIX}/share/guile/slib; \
 		${LOCALBASE}/bin/guile -q -s ${FILESDIR}/gencat.scm
 
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-www/Makefile b/devel/guile-www/Makefile
index a9d0b90da1f..ad22ce8e204 100644
--- a/devel/guile-www/Makefile
+++ b/devel/guile-www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/23 18:28:58 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/07 03:56:22 uebayasi Exp $
 
 DISTNAME=	guile-www-1.0.1
 CATEGORIES=	devel www
@@ -8,9 +8,8 @@ MAINTAINER=	epg@pretzelnet.org
 HOMEPAGE=	http://www.gnu.org/software/guile/
 COMMENT=	Guile WWW module
 
-DEPENDS=	guile>=1.4:../../lang/guile
-
 GNU_CONFIGURE=	YES
 
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libctl/Makefile b/devel/libctl/Makefile
index c0bfb805182..7846835a7a8 100644
--- a/devel/libctl/Makefile
+++ b/devel/libctl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/17 14:35:32 taca Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/07 03:56:23 uebayasi Exp $
 
 DISTNAME=	libctl-1.4.1
 CATEGORIES=	devel
@@ -8,8 +8,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://ab-initio.mit.edu/libctl/
 COMMENT=	Guile-based flexible control file library for scientific simulations
 
-DEPENDS+=	guile>=1.4:../../lang/guile
-
 GNU_CONFIGURE=	yes
 
 post-install:
@@ -18,4 +16,5 @@ post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} COPYING COPYRIGHT ChangeLog 	\
 		NEWS README ${PREFIX}/share/doc/libctl/
 
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index 70ae2570d8e..10d5aa4c572 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/12/21 17:05:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/07 03:56:23 uebayasi Exp $
 
 DISTNAME=	TeXmacs-1.0.1-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -31,6 +31,6 @@ pre-configure:
 post-install:
 	${LN} -s ${PREFIX}/share/doc/TeXmacs ${PREFIX}/share/${PKGNAME}/doc
 
-.include "../../lang/guile/buildlink2.mk"
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 75b07675791..3189e0dd6dc 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2002/12/24 06:10:01 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2003/01/07 03:56:24 uebayasi Exp $
 #
 
 DISTNAME=		gnucash-1.6.8
@@ -13,8 +13,8 @@ COMMENT=		Personal double-entry accounting program
 
 BUILDLINK_DEPENDS.g-wrap=	g-wrap>=1.2.1:../../devel/g-wrap
 BUILDLINK_DEPENDS.g-wrap+=	g-wrap<1.3.0:../../devel/g-wrap
-BUILDLINK_DEPENDS.guile=	guile>=1.4:../../lang/guile
-BUILDLINK_DEPENDS.guile+=	guile<1.5.0:../../lang/guile
+BUILDLINK_DEPENDS.guile14=	guile14>=1.4:../../lang/guile14
+BUILDLINK_DEPENDS.guile14+=	guile14<1.5.0:../../lang/guile14
 BUILD_DEPENDS+=			bison>=1.28:../../devel/bison
 
 USE_GMAKE=		YES
@@ -51,7 +51,7 @@ post-extract:
 .include "../../devel/popt/buildlink2.mk"
 .include "../../devel/swig/buildlink2.mk"
 .include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../lang/guile/buildlink2.mk"
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../math/guppi/buildlink2.mk"
 .include "../../net/ORBit/buildlink2.mk"
 .include "../../textproc/libxml/buildlink2.mk"
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 9cefae556e4..8f797e41997 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2002/12/24 06:10:02 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2003/01/07 03:56:24 uebayasi Exp $
 
 DISTNAME=		gnome-games-1.4.0.4
 PKGREVISION=		3
@@ -66,7 +66,7 @@ post-install:
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/ncurses/buildlink2.mk"
 # Required for ports which don't build "libgtop".
-.include "../../lang/guile/buildlink2.mk"
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 .include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 0303a5d73b3..3133207ef46 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2003/01/06 10:38:06 uebayasi Exp $
+# $NetBSD: Makefile,v 1.34 2003/01/07 03:56:25 uebayasi Exp $
 
 DISTNAME=		guile-1.6.1
 CATEGORIES=		lang
@@ -8,6 +8,8 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/guile/guile.html
 COMMENT=		GNU's Ubiquitous Intelligent Language for Extension
 
+CONFLICTS=		guile14-[0-9]*
+
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
diff --git a/lang/guile14/Makefile b/lang/guile14/Makefile
index c2524ae8d44..f4fa92bb2b5 100644
--- a/lang/guile14/Makefile
+++ b/lang/guile14/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/07 00:58:28 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/07 03:56:25 uebayasi Exp $
 
 DISTNAME=		guile-1.4.1
+PKGNAME=		guile14-1.4.1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=guile/}
 
@@ -8,6 +9,9 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/guile/guile.html
 COMMENT=		GNU's Ubiquitous Intelligent Language for Extension
 
+# XXX Conflicts even with older (<1.6) packages because of PKGNAME change.
+CONFLICTS=		guile-[0-9]*
+
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
diff --git a/lang/guile14/buildlink2.mk b/lang/guile14/buildlink2.mk
index dfd0d3c5c7f..1874a626a4b 100644
--- a/lang/guile14/buildlink2.mk
+++ b/lang/guile14/buildlink2.mk
@@ -1,28 +1,28 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/01/07 02:21:23 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/01/07 03:56:26 uebayasi Exp $
 
-.if !defined(GUILE_BUILDLINK2_MK)
-GUILE_BUILDLINK2_MK=	# defined
+.if !defined(GUILE14_BUILDLINK2_MK)
+GUILE14_BUILDLINK2_MK=	# defined
 
-BUILDLINK_PACKAGES+=		guile
-BUILDLINK_DEPENDS.guile?=	guile>=1.4
-BUILDLINK_PKGSRCDIR.guile?=	../../lang/guile14
+BUILDLINK_PACKAGES+=		guile14
+BUILDLINK_DEPENDS.guile14?=	guile14>=1.4
+BUILDLINK_PKGSRCDIR.guile14?=	../../lang/guile14
 
-EVAL_PREFIX+=		BUILDLINK_PREFIX.guile=guile
-BUILDLINK_PREFIX.guile_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.guile+=	include/guile/*
-BUILDLINK_FILES.guile+=	include/guile-readline/*
-BUILDLINK_FILES.guile+=	include/libguile.h
-BUILDLINK_FILES.guile+=	include/libguile/*
-BUILDLINK_FILES.guile+=	lib/libguile.*
-BUILDLINK_FILES.guile+=	lib/libguilereadline.*
+EVAL_PREFIX+=				BUILDLINK_PREFIX.guile14=guile14
+BUILDLINK_PREFIX.guile14_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.guile14+=		include/guile/*
+BUILDLINK_FILES.guile14+=		include/guile-readline/*
+BUILDLINK_FILES.guile14+=		include/libguile.h
+BUILDLINK_FILES.guile14+=		include/libguile/*
+BUILDLINK_FILES.guile14+=		lib/libguile.*
+BUILDLINK_FILES.guile14+=		lib/libguilereadline.*
 
 USE_GNU_READLINE=	# defined
 
 .include "../../devel/libtool/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 
-BUILDLINK_TARGETS+=	guile-buildlink
+BUILDLINK_TARGETS+=	guile14-buildlink
 
-guile-buildlink: _BUILDLINK_USE
+guile14-buildlink: _BUILDLINK_USE
 
-.endif	# GUILE_BUILDLINK2_MK
+.endif	# GUILE14_BUILDLINK2_MK
diff --git a/math/cassowary/Makefile b/math/cassowary/Makefile
index 1831c1e6fc3..e51e6e8e736 100644
--- a/math/cassowary/Makefile
+++ b/math/cassowary/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/08/09 11:54:01 agc Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/07 03:56:26 uebayasi Exp $
 #
 
 DISTNAME=		cassowary-0.60
@@ -10,7 +10,6 @@ HOMEPAGE=		http://www.cs.washington.edu/research/constraints/cassowary/
 COMMENT=		Constraint-solving toolkit for linear equalities and inequalities
 
 BUILD_DEPENDS+=		bison>=1.34:../../devel/bison
-DEPENDS+=		guile>=1.3.2:../../lang/guile
 DEPENDS+=		gtl>=0.3.2:../../devel/gtl
 
 USE_GMAKE=		# defined
@@ -36,4 +35,5 @@ MAKE_ENV+=		CXX=${LOCALBASE}/egcs/bin/g++
 post-install:
 	cd ${PREFIX}/lib/cassowary && ${RMDIR} -p bench
 
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 132ba8e405d..38185116a25 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/12/24 06:10:12 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2003/01/07 03:56:27 uebayasi Exp $
 
 DISTNAME=	Guppi-0.40.3
 PKGNAME=	${DISTNAME:S/G/g/}
@@ -24,7 +24,6 @@ PLIST_SUBST+=		GNUMERIC=
 CONFIGURE_ARGS=		--disable-gnumeric
 PLIST_SUBST+=		GNUMERIC="@comment "
 .endif
-DEPENDS+=		guile>=1.4:../../lang/guile
 
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
@@ -43,6 +42,7 @@ post-install:
 
 .include "../../devel/libglade/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index e5080f3feeb..e840eeb800f 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2002/12/24 06:10:13 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2003/01/07 03:56:27 uebayasi Exp $
 
 DISTNAME=		gnome-utils-1.4.1
 PKGREVISION=		4
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 .include "../../devel/libglade/buildlink2.mk"
 .include "../../devel/libgtop/buildlink2.mk"
 .include "../../devel/ncurses/buildlink2.mk"
-.include "../../lang/guile/buildlink2.mk"
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../www/gtkhtml/buildlink2.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index a3069d3d8e6..bf07ac0ebde 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/09/03 22:40:37 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2003/01/07 03:56:28 uebayasi Exp $
 #
 
 DISTNAME=       siag-3.1.20
@@ -25,7 +25,7 @@ _STRIPFLAG_INSTALL=
 XAW_TYPE?=	3d
 
 .include "../../devel/ncurses/buildlink2.mk"
-.include "../../lang/guile/buildlink2.mk"
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/xaw.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 51588246db2..0ef37b25012 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/01/04 20:18:20 cjep Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/07 03:56:29 uebayasi Exp $
 #
 
 DISTNAME=	lilypond-1.4.13
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=--disable-optimising
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 PYTHON_VERSIONS_ACCEPTED= 20 21 # 22 has some regular expression problem
 
-.include "../../lang/guile/buildlink2.mk"
+.include "../../lang/guile14/buildlink2.mk"
 .include "../../lang/python/application.mk"
 .include "../../print/teTeX-bin/kpathsea.buildlink2.mk"
 .include "../../mk/texinfo.mk"