[pkgsrc/trunk]: pkgsrc/net/vncviewer This conflicts with tightvncviewer. And ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a9548138870
branches:  trunk
changeset: 538642:0a9548138870
user:      reed <reed%pkgsrc.org@localhost>
date:      Thu Feb 14 21:56:55 2008 +0000

description:
This conflicts with tightvncviewer. And bump revision.
(The other conflict in tightvncviewer was already there.)

(Also while here fixes some indenting.)

diffstat:

 net/vncviewer/Makefile |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r 0e9d66572f0a -r 0a9548138870 net/vncviewer/Makefile
--- a/net/vncviewer/Makefile    Thu Feb 14 21:42:20 2008 +0000
+++ b/net/vncviewer/Makefile    Thu Feb 14 21:56:55 2008 +0000
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile,v 1.20 2007/02/22 19:27:00 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2008/02/14 21:56:55 reed Exp $
 
-DISTNAME=      vnc-4_1_2-unixsrc
+DISTNAME=              vnc-4_1_2-unixsrc
 PKGNAME=               vncviewer-4.1.2
+PKGREVISION=           1
 CATEGORIES=            net x11
-MASTER_SITES=  http://www.realvnc.com/dist/
+MASTER_SITES=          http://www.realvnc.com/dist/
 
 MAINTAINER=            riz%NetBSD.org@localhost
 HOMEPAGE=              http://www.realvnc.com/
 COMMENT=               Viewer for remote X and Win32 VNC servers
 
+CONFLICTS=             tightvncviewer-[0-9]*
+
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/unix
 CRYPTO=                        yes
 NO_INSTALL_MANPAGES=   yes