From 3e8411e0f4170945d95d8046addd7a3bb439ace9 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 14 Feb 2003 18:59:19 +0000 Subject: Note conflict with static version. Closes PR 20010 by Ryo HAYASAKA. --- shells/bash2/Makefile | 4 +++- shells/tcsh/Makefile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 71d0a381a46..680ccfd809c 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2003/01/28 22:04:10 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2003/02/14 18:59:19 wiz Exp $ # DISTNAME= bash-2.05b @@ -11,6 +11,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/bash/bash.html COMMENT= The GNU Bourne Again Shell +CONFLICTS= static-bash-[0-9]* + USE_BUILDLINK2= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile index a62f786ea13..7a2aadd2022 100644 --- a/shells/tcsh/Makefile +++ b/shells/tcsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2003/01/28 22:04:13 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2003/02/14 18:59:19 wiz Exp $ # DISTNAME= tcsh-6.12.00 @@ -12,6 +12,8 @@ MAINTAINER= kim@tac.nyc.ny.us HOMEPAGE= http://www.tcsh.org/ COMMENT= Extended C-shell with many useful features +CONFLICTS= static-tcsh-[0-9]* + USE_BUILDLINK2= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes -- cgit v1.2.3