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.

8 files changed, 16 insertions, 19 deletions

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"