diff options
| author | tron <tron> | 2009-04-27 18:35:30 +0000 |
|---|---|---|
| committer | tron <tron> | 2009-04-27 18:35:30 +0000 |
| commit | 2e2a23b6ea7f6e96dd9fe8ed3ae04283c4c6194d (patch) | |
| tree | 348293de70f6d7ce7417691e19804c39af977f03 /net/tightvnc | |
| parent | 8e4af43058637c8bd274c69b06178cdae36e90f4 (diff) | |
| download | pkgsrc-2e2a23b6ea7f6e96dd9fe8ed3ae04283c4c6194d.tar.gz | |
Add conflicts between the "tightvnc" and "vncviewer" packages which
both install "man/man1/vncpasswd.1".
Diffstat (limited to 'net/tightvnc')
| -rw-r--r-- | net/tightvnc/Makefile | 7 |
1 files changed, 3 insertions, 4 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 |