[pkgsrc/trunk]: pkgsrc/net Add conflicts between the "tightvnc" and "vncviewe...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b821d76f5f34
branches:  trunk
changeset: 392164:b821d76f5f34
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Apr 27 18:35:30 2009 +0000

description:
Add conflicts between the "tightvnc" and "vncviewer" packages which
both install "man/man1/vncpasswd.1".

diffstat:

 net/tightvnc/Makefile  |  7 +++----
 net/vncviewer/Makefile |  6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (46 lines):

diff -r ff7d6e8c1dcc -r b821d76f5f34 net/tightvnc/Makefile
--- a/net/tightvnc/Makefile     Mon Apr 27 18:06:27 2009 +0000
+++ b/net/tightvnc/Makefile     Mon Apr 27 18:35:30 2009 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2009/03/02 22:39:11 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.30 2009/04/27 18:35:30 tron Exp $
 
 DISTNAME=              tightvnc-1.3.9
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            net x11
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=vnc-tight/}
 DISTFILES=             ${DISTNAME}_unixsrc.tar.bz2
@@ -11,7 +10,7 @@
 HOMEPAGE=              http://www.tightvnc.com/
 COMMENT=               Display X and Win32 desktops on remote X/Win32/Java displays
 
-CONFLICTS=             vnc-[0-9]*
+CONFLICTS=             vnc-[0-9]* vncviewer-[0-9]*
 
 WRKSRC=                        ${WRKDIR}/vnc_unixsrc
 CRYPTO=                        yes
diff -r ff7d6e8c1dcc -r b821d76f5f34 net/vncviewer/Makefile
--- a/net/vncviewer/Makefile    Mon Apr 27 18:06:27 2009 +0000
+++ b/net/vncviewer/Makefile    Mon Apr 27 18:35:30 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2009/02/27 13:05:20 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2009/04/27 18:35:30 tron Exp $
 
 DISTNAME=              vnc-4_1_2-unixsrc
 PKGNAME=               vncviewer-4.1.2
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            net x11
 MASTER_SITES=          ${MASTER_SITE_LOCAL}
 
@@ -12,7 +12,7 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-CONFLICTS=             tightvncviewer-[0-9]*
+CONFLICTS=             tightvnc-[0-9]* tightvncviewer-[0-9]*
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/unix
 CRYPTO=                        yes