diff options
| author | grant <grant@pkgsrc.org> | 2004-03-29 12:51:54 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2004-03-29 12:51:54 +0000 |
| commit | 1f18e78f774eadabcb6911898586740f3fc17607 (patch) | |
| tree | 893f43af53ad55cec1336797ce9ee004a327b463 | |
| parent | bcb9109cbe5b45a259fdff73d49e756d29364c05 (diff) | |
| download | pkgsrc-1f18e78f774eadabcb6911898586740f3fc17607.tar.gz | |
add CONFLICT on sqsh-motif.
| -rw-r--r-- | databases/sqsh-x11/Makefile | 3 | ||||
| -rw-r--r-- | databases/sqsh/Makefile | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/databases/sqsh-x11/Makefile b/databases/sqsh-x11/Makefile index 05b088d75a7..3f8deb738cf 100644 --- a/databases/sqsh-x11/Makefile +++ b/databases/sqsh-x11/Makefile @@ -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 --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile index bdda868a854..e5423b21b62 100644 --- a/databases/sqsh/Makefile +++ b/databases/sqsh/Makefile @@ -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" |