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