20 files changed, 12 insertions, 277 deletions
diff --git a/LEGAL b/LEGAL
index ad027d436d6e..6b1b26c3c1ad 100644
--- a/LEGAL
+++ b/LEGAL
@@ -218,9 +218,6 @@ festival/voice_mwm_di-*	audio/festvox-mwm	No commercial use
 festival/voice_ogirab_di-* audio/festvox-ogirab No commercial use
 festival/voice_tll_di-*	audio/festvox-tll	No commercial use
 ffj30_ce_ml.class	java/forte		Restrictive license
-flashplugin/5.*/*	www/linux-flashplugin	License forbids redistribution
-flashplugin/6.*/*	www/linux-flashplugin6	License forbids redistribution
-flashplugin/7.*/*	www/linux-flashplugin7	License forbids redistribution
 fMSX*			emulators/fmsx		Unclear legal status of
 						distributed ROMs
 foiltex*		textproc/foiltex	Redistribution on a not-for-profit
diff --git a/MOVED b/MOVED
index e3f4b1aee00f..0874cadf2627 100644
--- a/MOVED
+++ b/MOVED
@@ -2242,3 +2242,6 @@ mail/rmoldmail||2006-04-07|Has expired: mastersite disappeared, no longer mainta
 mail/ruby-mime-types||2006-04-07|Has expired: mastersite disappeared, no longer maintained by author
 devel/wftk||2006-04-07|master site disappeared
 textproc/p5-JSON-Syck|textproc/p5-YAML-Syck|2006-04-07|The textproc/p5-YAML-Syck port now includes JSON functionality
+www/linux-flashplugin||2006-04-08|Removed due to license problem
+www/linux-flashplugin6||2006-04-08|Removed due to license problem
+www/linux-flashplugin7||2006-04-08|Removed due to license problem
diff --git a/UPDATING b/UPDATING
index fb5efd625f45..0a8211f65e57 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,15 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20060408:
+  AFFECTS: users of www/linux-flashplugin*
+  AUTHOR: hrs@FreeBSD.org
+
+  These ports have been removed because the End User License Agreement
+  explicitly forbids to run the Flash Player on FreeBSD.
+  For more details, see
+    http://www.macromedia.com/shockwave/download/license/desktop/.
+
 20060407:
   AFFECTS: users of sysutils/bacula*
   AUTHOR: dan@langille.org
diff --git a/www/Makefile b/www/Makefile
index 0d55b63b3482..404688b3c6ae 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -225,9 +225,6 @@
     SUBDIR += links1
     SUBDIR += linux-beonex
     SUBDIR += linux-firefox
-    SUBDIR += linux-flashplugin
-    SUBDIR += linux-flashplugin6
-    SUBDIR += linux-flashplugin7
     SUBDIR += linux-mozilla
     SUBDIR += linux-mozilla-devel
     SUBDIR += linux-nvu
diff --git a/www/linux-flashplugin/Makefile b/www/linux-flashplugin/Makefile
deleted file mode 100644
index dc085ce64e7b..000000000000
--- a/www/linux-flashplugin/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# New ports collection makefile for:	linux-flashplugin
-# Date created:		13 Feburary 2000
-# Whom:			Matt Heckaman <matt@LUCIDA.QC.CA>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	flashplugin
-PORTVERSION=	5.0r51
-PORTREVISION=	3
-CATEGORIES=	www multimedia linux
-MASTER_SITES=	http://download.macromedia.com/pub/shockwave/flash/english/linux/${PORTVERSION}/
-PKGNAMEPREFIX=	linux-
-DISTNAME=	flash_linux
-DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
-
-MAINTAINER=	ports@brandon.dvalentine.com
-COMMENT=	The official Macromedia Flash Player for Linux Netscape and Opera
-
-FORBIDDEN=	http://vuxml.FreeBSD.org/83421018-b3ef-11da-a32d-000c6ec775d9.html
-
-ONLY_FOR_ARCHS=	i386
-
-RESTRICTED=	"Redistribution not allowed"
-
-NO_BUILD=	yes
-USE_LINUX=	yes
-USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/flash_linux
-LATEST_LINK=	flash5
-
-PLUGINSDIR=	lib/netscape-linux/plugins
-LIBFILES=	libflashplayer.so ShockwaveFlash.class
-
-DOCSDIR?=	${PREFIX}/share/doc/${UNIQUENAME}
-
-PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/flash
-.for f in ${LIBFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/flash
-.if exists(${PLUGINSDIR})
-	@${LN} -sf ${PREFIX}/lib/flash/${f} ${PREFIX}/${PLUGINSDIR}
-.endif
-.endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/ReadMe.htm ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/www/linux-flashplugin/distinfo b/www/linux-flashplugin/distinfo
deleted file mode 100644
index 88609c429222..000000000000
--- a/www/linux-flashplugin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (flashplugin/5.0r51/flash_linux.tar.gz) = 0585bd78ef9fbe6ae7d63f42a450f127
-SHA256 (flashplugin/5.0r51/flash_linux.tar.gz) = 3a10f49c6ec2ceb8954cae36368a8cbb56a5da1ad486ab3889435ee4f7d2273c
-SIZE (flashplugin/5.0r51/flash_linux.tar.gz) = 568380
diff --git a/www/linux-flashplugin/pkg-descr b/www/linux-flashplugin/pkg-descr
deleted file mode 100644
index c0ce24fbd222..000000000000
--- a/www/linux-flashplugin/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This is the official Flash Player from Macromedia. This plugin
-enables you to see .swf and .spl files on the 'net from your Netscape
-and Opera session. Please see the Macromedia home page for more
-information.
-
-WWW: http://www.macromedia.com/
diff --git a/www/linux-flashplugin/pkg-plist b/www/linux-flashplugin/pkg-plist
deleted file mode 100644
index dbf102e90823..000000000000
--- a/www/linux-flashplugin/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-lib/flash/ShockwaveFlash.class
-lib/flash/libflashplayer.so
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/ReadMe.htm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rm -f %D/%%PLUGINSDIR%%/ShockwaveFlash.class %D/%%PLUGINSDIR%%/libflashplayer.so
-@dirrm lib/flash
diff --git a/www/linux-flashplugin6/Makefile b/www/linux-flashplugin6/Makefile
deleted file mode 100644
index 7920cf8ac895..000000000000
--- a/www/linux-flashplugin6/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# New ports collection makefile for:	linux-flashplugin6
-# Date created:				23 February 2003
-# Whom:				Brandon D. Valentine <ports@brandon.dvalentine.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	flashplugin
-PORTVERSION=	6.0r79
-PORTREVISION=	3
-CATEGORIES=	www multimedia linux
-MASTER_SITES=	http://download.macromedia.com/pub/shockwave/flash/english/linux/${PORTVERSION}/
-PKGNAMEPREFIX=	linux-
-DISTNAME=	install_flash_player_6_linux
-DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
-
-MAINTAINER=	ports@brandon.dvalentine.com
-COMMENT=	The official Macromedia Flash Player for Linux Mozilla and Netscape 6+
-
-FORBIDDEN=	http://vuxml.FreeBSD.org/83421018-b3ef-11da-a32d-000c6ec775d9.html
-
-ONLY_FOR_ARCHS=	amd64 i386
-USE_LINUX=	yes
-USE_X_PREFIX=	yes
-
-RESTRICTED=	"Redistribution not allowed"
-
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/install_flash_player_6_linux
-LATEST_LINK=	flash6
-
-PLUGINSDIR=	lib/linux-mozilla/plugins
-LIBFILES=	libflashplayer.so flashplayer.xpt
-
-DOCSDIR?=	${PREFIX}/share/doc/${UNIQUENAME}
-
-PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/linux-flashplugin6
-.for f in ${LIBFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/linux-flashplugin6
-.if exists(${PLUGINSDIR})
-	@${LN} -sf ${PREFIX}/lib/linux-flashplugin6/${f} ${PREFIX}/${PLUGINSDIR}
-.endif
-.endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/readme.htm ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/www/linux-flashplugin6/distinfo b/www/linux-flashplugin6/distinfo
deleted file mode 100644
index ccb8596f5be9..000000000000
--- a/www/linux-flashplugin6/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (flashplugin/6.0r79/install_flash_player_6_linux.tar.gz) = a6f73da96f89d3dba4fadd4020dd7f38
-SHA256 (flashplugin/6.0r79/install_flash_player_6_linux.tar.gz) = e055f8207b93934845365bde0a7356cfc4deee207081f23b9bdf17da0d5d9738
-SIZE (flashplugin/6.0r79/install_flash_player_6_linux.tar.gz) = 707027
diff --git a/www/linux-flashplugin6/pkg-descr b/www/linux-flashplugin6/pkg-descr
deleted file mode 100644
index d9d2a463a3f4..000000000000
--- a/www/linux-flashplugin6/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-This is the official Flash Player from Macromedia. This plugin enables
-you to see .swf and .spl files on the 'net from your Mozilla and
-Netscape 6+ session.
-
-Version 6 of the Macromedia Flash Player no longer works with Netscape
-4.x or earlier.  For Flash support in those browsers install the
-linux-flashplugin port.
-
-Please see the Macromedia home page for more information.
-
-WWW: http://www.macromedia.com/
diff --git a/www/linux-flashplugin6/pkg-plist b/www/linux-flashplugin6/pkg-plist
deleted file mode 100644
index 84b7faabe534..000000000000
--- a/www/linux-flashplugin6/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-lib/linux-flashplugin6/flashplayer.xpt
-lib/linux-flashplugin6/libflashplayer.so
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/readme.htm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rm -f %D/%%PLUGINSDIR%%/flashplayer.xpt %D/%%PLUGINSDIR%%/libflashplayer.so
-@dirrm lib/linux-flashplugin6
diff --git a/www/linux-flashplugin7/Makefile b/www/linux-flashplugin7/Makefile
deleted file mode 100644
index bd4e6a33140e..000000000000
--- a/www/linux-flashplugin7/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# New ports collection makefile for:	linux-flashplugin7
-# Date created:				28 May 2004
-# Whom:					Jamie Jones <jamie@bishopston.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	flashplugin
-PORTVERSION=	7.0r63
-CATEGORIES=	www multimedia linux
-MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/current/
-PKGNAMEPREFIX=	linux-
-DISTNAME=	install_flash_player_7_linux
-DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
-
-MAINTAINER=	jamie@bishopston.net
-COMMENT=	The official Macromedia Flash Player for Linux Mozilla and Netscape 6+
-
-ONLY_FOR_ARCHS=	amd64 i386
-USE_LINUX=	yes
-USE_X_PREFIX=	yes
-
-RESTRICTED=	Redistribution not allowed
-
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/install_flash_player_7_linux
-LATEST_LINK=	flash7
-
-LIBFILES=	libflashplayer.so flashplayer.xpt
-
-DOCSDIR?=	${PREFIX}/share/doc/${UNIQUENAME}
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/linux-flashplugin7
-.for f in ${LIBFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/linux-flashplugin7
-.endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Readme.htm ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/www/linux-flashplugin7/distinfo b/www/linux-flashplugin7/distinfo
deleted file mode 100644
index d76331038627..000000000000
--- a/www/linux-flashplugin7/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (flashplugin/7.0r63/install_flash_player_7_linux.tar.gz) = a835bc6613c76f62c74a50406bd5801d
-SHA256 (flashplugin/7.0r63/install_flash_player_7_linux.tar.gz) = d57d96fcff2aa876db203a3524cde83a6b0fc799dd6b537ade65bcfd5c6520d1
-SIZE (flashplugin/7.0r63/install_flash_player_7_linux.tar.gz) = 1021258
diff --git a/www/linux-flashplugin7/pkg-descr b/www/linux-flashplugin7/pkg-descr
deleted file mode 100644
index 6dc514651bf2..000000000000
--- a/www/linux-flashplugin7/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-This is the official Flash Player from Macromedia. This plugin enables
-you to see .swf and .spl files on the 'net from your Opera, Mozilla or
-Netscape 6+ sessions.
-
-Version 7 of the Macromedia Flash Player no longer works with Netscape
-4.x or earlier.  For Flash support in those browsers install the
-linux-flashplugin port.
-
-Please see the Macromedia home page for more information.
-
-WWW: http://www.macromedia.com/
diff --git a/www/linux-flashplugin7/pkg-plist b/www/linux-flashplugin7/pkg-plist
deleted file mode 100644
index e424084d238d..000000000000
--- a/www/linux-flashplugin7/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/linux-flashplugin7/flashplayer.xpt
-lib/linux-flashplugin7/libflashplayer.so
-%%PORTDOCS%%%%DOCSDIR%%/Readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/Readme.htm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/linux-flashplugin7
diff --git a/www/linux-flashplugin9/Makefile b/www/linux-flashplugin9/Makefile
deleted file mode 100644
index bd4e6a33140e..000000000000
--- a/www/linux-flashplugin9/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# New ports collection makefile for:	linux-flashplugin7
-# Date created:				28 May 2004
-# Whom:					Jamie Jones <jamie@bishopston.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	flashplugin
-PORTVERSION=	7.0r63
-CATEGORIES=	www multimedia linux
-MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/current/
-PKGNAMEPREFIX=	linux-
-DISTNAME=	install_flash_player_7_linux
-DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
-
-MAINTAINER=	jamie@bishopston.net
-COMMENT=	The official Macromedia Flash Player for Linux Mozilla and Netscape 6+
-
-ONLY_FOR_ARCHS=	amd64 i386
-USE_LINUX=	yes
-USE_X_PREFIX=	yes
-
-RESTRICTED=	Redistribution not allowed
-
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/install_flash_player_7_linux
-LATEST_LINK=	flash7
-
-LIBFILES=	libflashplayer.so flashplayer.xpt
-
-DOCSDIR?=	${PREFIX}/share/doc/${UNIQUENAME}
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/linux-flashplugin7
-.for f in ${LIBFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/linux-flashplugin7
-.endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Readme.htm ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/www/linux-flashplugin9/distinfo b/www/linux-flashplugin9/distinfo
deleted file mode 100644
index d76331038627..000000000000
--- a/www/linux-flashplugin9/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (flashplugin/7.0r63/install_flash_player_7_linux.tar.gz) = a835bc6613c76f62c74a50406bd5801d
-SHA256 (flashplugin/7.0r63/install_flash_player_7_linux.tar.gz) = d57d96fcff2aa876db203a3524cde83a6b0fc799dd6b537ade65bcfd5c6520d1
-SIZE (flashplugin/7.0r63/install_flash_player_7_linux.tar.gz) = 1021258
diff --git a/www/linux-flashplugin9/pkg-descr b/www/linux-flashplugin9/pkg-descr
deleted file mode 100644
index 6dc514651bf2..000000000000
--- a/www/linux-flashplugin9/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-This is the official Flash Player from Macromedia. This plugin enables
-you to see .swf and .spl files on the 'net from your Opera, Mozilla or
-Netscape 6+ sessions.
-
-Version 7 of the Macromedia Flash Player no longer works with Netscape
-4.x or earlier.  For Flash support in those browsers install the
-linux-flashplugin port.
-
-Please see the Macromedia home page for more information.
-
-WWW: http://www.macromedia.com/
diff --git a/www/linux-flashplugin9/pkg-plist b/www/linux-flashplugin9/pkg-plist
deleted file mode 100644
index e424084d238d..000000000000
--- a/www/linux-flashplugin9/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/linux-flashplugin7/flashplayer.xpt
-lib/linux-flashplugin7/libflashplayer.so
-%%PORTDOCS%%%%DOCSDIR%%/Readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/Readme.htm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/linux-flashplugin7