summaryrefslogtreecommitdiff
path: root/multimedia/ns-flash
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2010-10-30 09:51:31 +0000
committerwiz <wiz@pkgsrc.org>2010-10-30 09:51:31 +0000
commitf7f32bbff7c5ee2e2382784adee64af22285fa22 (patch)
tree6e500b0db30c7fcd553fa72aa7cc1b53c0959575 /multimedia/ns-flash
parentaac284d29c347341988fff25ad2bffe1d6896f8e (diff)
downloadpkgsrc-f7f32bbff7c5ee2e2382784adee64af22285fa22.tar.gz
Add CONFLICTS with adobe-flash-plugin.
Diffstat (limited to 'multimedia/ns-flash')
-rw-r--r--multimedia/ns-flash/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/multimedia/ns-flash/Makefile b/multimedia/ns-flash/Makefile
index 1b8d049ba55..ac11e5acf35 100644
--- a/multimedia/ns-flash/Makefile
+++ b/multimedia/ns-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2010/02/25 15:54:18 mishka Exp $
+# $NetBSD: Makefile,v 1.35 2010/10/30 09:51:31 wiz Exp $
CATEGORIES= multimedia www
MASTER_SITES= http://download.macromedia.com/pub/flashplayer/installers/current/9/
@@ -18,6 +18,8 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
CONFLICTS+= communicator<=4.76nb1
CONFLICTS+= navigator<=4.76nb1
+CONFLICTS+= adobe-flash-plugin-[0-9]*
+
PKG_DESTDIR_SUPPORT= user-destdir
BUILD_DIRS= # empty