12 files changed, 1 insertions, 165 deletions
diff --git a/graphics/Makefile b/graphics/Makefile
index f6126ba4eb5..a6f310b1b49 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.282 2004/01/26 13:38:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.283 2004/01/26 14:54:05 jmmv Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -146,8 +146,6 @@ SUBDIR+=	ljpeg
 SUBDIR+=	magicpoint
 SUBDIR+=	mgl
 SUBDIR+=	mng
-SUBDIR+=	moz-bin-flash
-SUBDIR+=	moz-flash
 SUBDIR+=	mpeg-lib
 SUBDIR+=	mpeg2codec
 SUBDIR+=	mpeg_encode
@@ -157,7 +155,6 @@ SUBDIR+=	mtv
 SUBDIR+=	ncview
 SUBDIR+=	netpbm
 SUBDIR+=	ns-cult3d
-SUBDIR+=	ns-flash
 SUBDIR+=	nvtv
 SUBDIR+=	nvtv-gtk2
 SUBDIR+=	ogle
diff --git a/graphics/moz-bin-flash/DESCR b/graphics/moz-bin-flash/DESCR
deleted file mode 100644
index b8770609f95..00000000000
--- a/graphics/moz-bin-flash/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is the official Flash Player 6 from Macromedia. This plugin
-enables you to see .swf and .spl files on the 'net using the
-mozilla-linux package.
diff --git a/graphics/moz-bin-flash/Makefile b/graphics/moz-bin-flash/Makefile
deleted file mode 100644
index bb759627f4a..00000000000
--- a/graphics/moz-bin-flash/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/08/28 20:05:19 xtraeme Exp $
-#
-
-DISTNAME=	install_flash_player_6_linux
-PKGNAME=	moz-bin-flash-${VERSION}
-CATEGORIES=	graphics www
-MASTER_SITES=	http://download.macromedia.com/pub/shockwave/flash/english/linux/6.0r69/
-
-MAINTAINER=	xtraeme@NetBSD.org
-HOMEPAGE=	http://www.macromedia.com/
-COMMENT=	Flash player for the linux version of mozilla (binary pkg)
-
-DEPENDS+=	mozilla-bin-[0-9]*:../../www/mozilla-bin
-
-CONFLICTS+=	mozilla-flash-bin-[0-9]*
-
-VERSION=	6.0.69
-
-NO_CONFIGURE=	YES
-NO_BUILD=	YES
-
-WRKSRC=		${WRKDIR}/install_flash_player_6_linux
-
-DOCDIR=		share/doc/moz-bin-flash
-PLIST_SUBST+=	DOCDIR="${DOCDIR}"
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/libflashplayer.so ${PREFIX}/lib/mozilla-linux/plugins
-	${INSTALL_DATA} ${WRKSRC}/flashplayer.xpt ${PREFIX}/lib/mozilla-linux/components
-
-	${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
-	${INSTALL_DATA}	${WRKSRC}/readme.txt ${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/ReadMe.htm ${PREFIX}/${DOCDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/moz-bin-flash/PLIST b/graphics/moz-bin-flash/PLIST
deleted file mode 100644
index 0dcffe8940d..00000000000
--- a/graphics/moz-bin-flash/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.2 2004/01/26 13:47:55 jmmv Exp $
-lib/mozilla-linux/components/flashplayer.xpt
-lib/mozilla-linux/plugins/libflashplayer.so
-${DOCDIR}/readme.txt
-${DOCDIR}/ReadMe.htm
-@dirrm ${DOCDIR}
diff --git a/graphics/moz-bin-flash/distinfo b/graphics/moz-bin-flash/distinfo
deleted file mode 100644
index 7375abb7324..00000000000
--- a/graphics/moz-bin-flash/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.2 2004/01/26 13:47:55 jmmv Exp $
-
-SHA1 (install_flash_player_6_linux.tar.gz) = ecddda28954ce26882cea0f6578af326d7c6e76c
-Size (install_flash_player_6_linux.tar.gz) = 706066 bytes
diff --git a/graphics/moz-flash/DESCR b/graphics/moz-flash/DESCR
deleted file mode 100644
index c627423043c..00000000000
--- a/graphics/moz-flash/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-A flash plugin for Gecko based browers, including Netscape 6.x,
-Mozilla, and Gaelon.  Shockwave is NOT supported.  Audio support
-is currently broken.
diff --git a/graphics/moz-flash/Makefile b/graphics/moz-flash/Makefile
deleted file mode 100644
index cc8ecbd9591..00000000000
--- a/graphics/moz-flash/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2004/01/26 13:40:49 jmmv Exp $
-#
-
-.include "../../multimedia/libflash/Makefile.common"
-
-PKGNAME=	moz-flash-1.0
-PKGREVISION=	4
-
-MAINTAINER=	joda@NetBSD.org
-COMMENT=	Mozilla open source Flash(tm) plugin
-
-DEPENDS+=	mozilla>=0.9.9:../../www/mozilla
-
-USE_BUILDLINK2=	YES
-USE_X11=	YES
-USE_LIBTOOL=	YES
-
-BUILD_DIRS=	${WRKSRC}/Plugin
-CPPFLAGS+=	-DDEV_DSP=\\\"${DEVOSSSOUND}\\\"
-MAKE_ENV+=	SHLIBTOOL="${PKGSHLIBTOOL}"
-MAKE_ENV+=	MOZ_PLUGDIR="${MOZ_PLUGDIR}"
-
-MOZ_PLUGDIR=	${PREFIX}/lib/mozilla/plugins
-
-do-install:
-	${INSTALL_DATA_DIR} ${MOZ_PLUGDIR}
-	cd ${WRKSRC}/Plugin && \
-		${INSTALL_PROGRAM} .libs/npflash.so ${MOZ_PLUGDIR}
-
-.include "../../multimedia/libflash/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/moz-flash/PLIST b/graphics/moz-flash/PLIST
deleted file mode 100644
index 1eec7ded3f9..00000000000
--- a/graphics/moz-flash/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/12/01 00:30:34 hubertf Exp $
-lib/mozilla/plugins/npflash.so
diff --git a/graphics/ns-flash/DESCR b/graphics/ns-flash/DESCR
deleted file mode 100644
index b8731dc730c..00000000000
--- a/graphics/ns-flash/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Experience animation and entertainment on the web with Flash, the web
-standard for vector graphics and animation. View the best web content,
-including cartoons, games, and news from many leading-edge companies.
diff --git a/graphics/ns-flash/Makefile b/graphics/ns-flash/Makefile
deleted file mode 100644
index 434c04f4f59..00000000000
--- a/graphics/ns-flash/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2004/01/20 12:18:16 agc Exp $
-
-DISTNAME=		flash_${DISTUNAME}
-CATEGORIES=		graphics www
-MASTER_SITES=		http://download.macromedia.com/pub/shockwave/flash/${SUB}/
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.flash.com/
-COMMENT=		MacroMedia Flash Player Netscape plugin
-
-ONLY_FOR_PLATFORM=      *-*-i386 SunOS-*-sparc
-NOT_FOR_PLATFORM=	SunOS-*-i386
-
-WRKSRC=			${WRKDIR}/${WRKNAME}
-DIST_SUBDIR=		flash/${FLASH_VERS}
-
-.include "../../mk/bsd.prefs.mk"
-
-SUB=			english/${DISTUNAME}/${FLASH_VERS}
-
-.if (${MACHINE_ARCH} == "i386")
-FLASH_VERS=		5.0r51
-DEPENDS+=		suse_compat>=6.3:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=		suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
-DISTUNAME=		linux
-WRKNAME=		flash_linux
-.elif ${MACHINE_ARCH} == "sparc" && ${OPSYS} == "SunOS"
-FLASH_VERS=		5.0r52
-DISTUNAME=		solaris
-WRKNAME=		flash_solaris
-.else
-# Defaults so lintpkgsrc is happy
-FLASH_VERS=		5.0
-.endif
-PKGNAME=		ns-flash-${FLASH_VERS:S/r/./}
-
-# Must update communicator/navigator to at least 4.76nb1
-CONFLICTS+=		communicator<=4.76nb1
-CONFLICTS+=		navigator<=4.76nb1
-
-RESTRICTED=             "Redistribution not permitted"
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-USE_BUILDLINK2=		yes
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
-CHECK_SHLIBS=		no
-CRYPTO=			yes
-
-NS_PLUGINS_DIR=		${PREFIX}/lib/netscape/plugins
-
-do-install:
-	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/ShockwaveFlash.class ${NS_PLUGINS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/libflashplayer.so ${NS_PLUGINS_DIR}
-
-.if ${OPSYS} != "SunOS"
-.include "../../emulators/suse_linux/Makefile.application"
-.endif
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ns-flash/PLIST b/graphics/ns-flash/PLIST
deleted file mode 100644
index b05379fc486..00000000000
--- a/graphics/ns-flash/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:29 tron Exp $
-lib/netscape/plugins/ShockwaveFlash.class
-lib/netscape/plugins/libflashplayer.so
-@unexec ${RMDIR} %D/lib/netscape/plugins 2>/dev/null || ${TRUE}
diff --git a/graphics/ns-flash/distinfo b/graphics/ns-flash/distinfo
deleted file mode 100644
index 72dd1484248..00000000000
--- a/graphics/ns-flash/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.6 2002/09/23 10:50:21 wiz Exp $
-
-SHA1 (flash/5.0r51/flash_linux.tar.gz) = 757b616634b3d9398d76437c5c41927fb91f0b9d
-Size (flash/5.0r51/flash_linux.tar.gz) = 568380 bytes
-SHA1 (flash/5.0r52/flash_solaris.tar.gz) = c6e71f85ad9dfb00814f3aa574c88d73ac987586
-Size (flash/5.0r52/flash_solaris.tar.gz) = 627444 bytes