diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/guile/Makefile | 4 | ||||
| -rw-r--r-- | lang/guile14/Makefile | 6 | ||||
| -rw-r--r-- | lang/guile14/buildlink2.mk | 34 |
3 files changed, 25 insertions, 19 deletions
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 |