pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang lang/gambc and lang/scheme48 are conflict with bi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/055b7dd37075
branches:  trunk
changeset: 546411:055b7dd37075
user:      obache <obache%pkgsrc.org@localhost>
date:      Sun Aug 31 09:17:56 2008 +0000

description:
lang/gambc and lang/scheme48 are conflict with bin/scheme-r5rs.
Noticed by Aleksej Saushev in PR 39403.

diffstat:

 lang/gambc/Makefile    |  5 ++++-
 lang/scheme48/Makefile |  5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r c52cc498706e -r 055b7dd37075 lang/gambc/Makefile
--- a/lang/gambc/Makefile       Sun Aug 31 07:55:15 2008 +0000
+++ b/lang/gambc/Makefile       Sun Aug 31 09:17:56 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/07/16 07:14:36 bjs Exp $
+# $NetBSD: Makefile,v 1.7 2008/08/31 09:17:56 obache Exp $
 #
 
 DISTNAME=      gambc-${GAMBC_DIST_VERSION}
@@ -14,6 +14,9 @@
 PKG_DESTDIR_SUPPORT=   user-destdir
 NOT_FOR_BULK_PLATFORM+=        SunOS-*-*
 
+# bin/scheme-r5rs
+CONFLICTS+=    scheme48>=1.2
+
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake
diff -r c52cc498706e -r 055b7dd37075 lang/scheme48/Makefile
--- a/lang/scheme48/Makefile    Sun Aug 31 07:55:15 2008 +0000
+++ b/lang/scheme48/Makefile    Sun Aug 31 09:17:56 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/05/02 09:22:21 degroote Exp $
+# $NetBSD: Makefile,v 1.32 2008/08/31 09:17:56 obache Exp $
 
 DISTNAME=              scheme48-1.8
 CATEGORIES=            lang
@@ -14,6 +14,9 @@
 PKG_DESTDIR_SUPPORT=   user-destdir
 MAKE_JOBS_SAFE=                no
 
+# bin/scheme-r5rs
+CONFLICTS+=            gambc-[0-9]*
+
 GNU_CONFIGURE=         yes
 USE_TOOLS=             gmake
 BUILD_TARGET=          enough



Home | Main Index | Thread Index | Old Index