[pkgsrc/trunk]: pkgsrc/databases add CONFLICT on sqsh-motif.

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b3ff7fa3b406
branches:  trunk
changeset: 471603:b3ff7fa3b406
user:      grant <grant%pkgsrc.org@localhost>
date:      Mon Mar 29 12:51:54 2004 +0000

description:
add CONFLICT on sqsh-motif.

diffstat:

 databases/sqsh-x11/Makefile |  3 ++-
 databases/sqsh/Makefile     |  3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 91caffe2e73c -r b3ff7fa3b406 databases/sqsh-x11/Makefile
--- a/databases/sqsh-x11/Makefile       Mon Mar 29 12:50:04 2004 +0000
+++ b/databases/sqsh-x11/Makefile       Mon Mar 29 12:51:54 2004 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/03/29 09:41:34 grant Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/29 12:51:54 grant Exp $
 
 PKGNAME=               sqsh-x11-2.1
 COMMENT=               SQL shell for Sybase and MS-SQL servers (X11 support)
 
 CONFLICTS+=            sqsh-[0-9]*
+CONFLICTS+=            sqsh-motif-[0-9]*
 
 USE_X11=               YES
 CONFIGURE_ARGS+=       --with-x
diff -r 91caffe2e73c -r b3ff7fa3b406 databases/sqsh/Makefile
--- a/databases/sqsh/Makefile   Mon Mar 29 12:50:04 2004 +0000
+++ b/databases/sqsh/Makefile   Mon Mar 29 12:51:54 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2004/03/29 03:11:03 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/03/29 12:51:54 grant Exp $
 
 PKGNAME=       sqsh-2.1
 
+CONFLICTS+=    sqsh-motif-[0-9]*
 CONFLICTS+=    sqsh-x11-[0-9]*
 
 .include "Makefile.common"