From 2e2a23b6ea7f6e96dd9fe8ed3ae04283c4c6194d Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Mon, 27 Apr 2009 18:35:30 +0000
Subject: Add conflicts between the "tightvnc" and "vncviewer" packages which
 both install "man/man1/vncpasswd.1".

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

diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 4376103d633..c2147302b8d 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -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 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 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 --git a/net/vncviewer/Makefile b/net/vncviewer/Makefile
index e59a6b8b147..95223565e45 100644
--- a/net/vncviewer/Makefile
+++ b/net/vncviewer/Makefile
@@ -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 @@ COMMENT=		Viewer for remote X and Win32 VNC servers
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CONFLICTS=		tightvncviewer-[0-9]*
+CONFLICTS=		tightvnc-[0-9]* tightvncviewer-[0-9]*
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/unix
 CRYPTO=			yes
-- 
cgit v1.2.3