Update flash plugin to 24.0.0.186 and remove flash plugin 11.x ports.

11 files changed, 9 insertions, 125 deletions

diff --git a/www/Makefile b/www/Makefile
index d2b4a503a759..0e96b1539c76 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -372,13 +372,10 @@
     SUBDIR += links
     SUBDIR += links-hacked
     SUBDIR += links1
-    SUBDIR += linux-c6-flashplugin11
     SUBDIR += linux-c6-flashplugin24
     SUBDIR += linux-c6-qt47-webkit
-    SUBDIR += linux-c7-flashplugin11
     SUBDIR += linux-c7-flashplugin24
     SUBDIR += linux-c7-qtwebkit
-    SUBDIR += linux-f10-flashplugin11
     SUBDIR += linux-firefox
     SUBDIR += linux-opera
     SUBDIR += linux-seamonkey
diff --git a/www/linux-c6-flashplugin11/Makefile b/www/linux-c6-flashplugin11/Makefile
deleted file mode 100644
index a6c99fab2444..000000000000
--- a/www/linux-c6-flashplugin11/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# Created by: Artyom Mirgorodskiy <artyom.mirgorodsky@gmail.com>
-# $FreeBSD$
-
-PORTNAME=	flashplugin
-PORTVERSION=	11.2r202.644
-CATEGORIES=	www multimedia linux
-MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \
-		LOCAL/nox:suplib
-PKGNAMEPREFIX?=	linux-c6-
-DISTFILES=	install_flash_player_11_linux.i386.tar.gz:plugin
-DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
-
-MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Adobe Flash Player NPAPI Plugin
-
-ONLY_FOR_ARCHS=	amd64 i386
-USES?=		linux:c6
-USE_LINUX=	curl cyrus-sasl2 gdkpixbuf2 gtk2 nspr nss
-
-RESTRICTED=	Redistribution not allowed
-RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
-
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-STRIP=
-USES+=		cpe webplugin:linux
-WEBPLUGIN_FILES=	libflashplayer.so
-
-OPTIONS_DEFINE=	ALSA
-OPTIONS_SUB=	yes
-
-ALSA_DESC=	ALSA audio output (broken, needs lemul)
-ALSA_USE=	LINUX=alsalib,alsa-plugins-oss
-ALSA_USE_OFF?=	LINUX=openssl-compat
-ALSA_DISTFILES_OFF=	linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
-ALSA_PLIST_SUB_OFF=	LINUXBASE="${LINUXBASE}"
-
-CPE_VENDOR=	adobe
-CPE_PRODUCT=	flash_player
-
-.include <bsd.port.options.mk>
-
-post-patch:
-	@${REINPLACE_CMD} '/^NotShowIn=KDE/d' \
-		${WRKSRC}/usr/share/applications/flash-player-properties.desktop
-
-do-install:
-	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
-	${INSTALL_LIB} ${WRKSRC}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
-.if ! ${PORT_OPTIONS:MALSA}
-	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib
-	${INSTALL_LIB} ${WRKSRC}/libflashsupport.so ${STAGEDIR}${LINUXBASE}/usr/lib
-.endif
-	${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/flash-player-properties ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/usr/share/applications/flash-player-properties.desktop ${STAGEDIR}${DESKTOPDIR}
-	(cd ${WRKSRC}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${STAGEDIR}${PREFIX}/share/icons)
-
-.include <bsd.port.mk>
diff --git a/www/linux-c6-flashplugin11/distinfo b/www/linux-c6-flashplugin11/distinfo
deleted file mode 100644
index 1dfcf418d1bf..000000000000
--- a/www/linux-c6-flashplugin11/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1478773365
-SHA256 (flashplugin/11.2r202.644/install_flash_player_11_linux.i386.tar.gz) = 63ca6e1ad1e1b39ae6e35265b628a818dfc4544b1aa857b8a8365d056779f297
-SIZE (flashplugin/11.2r202.644/install_flash_player_11_linux.i386.tar.gz) = 6992226
-SHA256 (flashplugin/11.2r202.644/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
-SIZE (flashplugin/11.2r202.644/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
diff --git a/www/linux-c6-flashplugin11/pkg-descr b/www/linux-c6-flashplugin11/pkg-descr
deleted file mode 100644
index 9c9dcd2de5d8..000000000000
--- a/www/linux-c6-flashplugin11/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-This is the official Flash Player from Adobe. This plugin enables
-you to see .swf and .spl files on the 'net from your Opera, Mozilla or
-Firefox sessions.
-
-Please see the Adobe home page for more information.
-
-FreeBSD Flash License Agreement:
-	http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/96374
-
-WWW: http://www.adobe.com/
diff --git a/www/linux-c6-flashplugin11/pkg-message b/www/linux-c6-flashplugin11/pkg-message
deleted file mode 100644
index 98294fcb3e9b..000000000000
--- a/www/linux-c6-flashplugin11/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-If this is your first time installing flash each user must run:
-
-	nspluginwrapper -v -a -i
-
-If you are updating flash each user must run:
-
-	nspluginwrapper -v -a -u
diff --git a/www/linux-c6-flashplugin11/pkg-plist b/www/linux-c6-flashplugin11/pkg-plist
deleted file mode 100644
index 4d7104c122ba..000000000000
--- a/www/linux-c6-flashplugin11/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/flash-player-properties
-%%WEBPLUGIN_DIR%%/libflashplayer.so
-share/applications/flash-player-properties.desktop
-share/icons/hicolor/16x16/apps/flash-player-properties.png
-share/icons/hicolor/22x22/apps/flash-player-properties.png
-share/icons/hicolor/24x24/apps/flash-player-properties.png
-share/icons/hicolor/32x32/apps/flash-player-properties.png
-share/icons/hicolor/48x48/apps/flash-player-properties.png
-%%NO_ALSA%%%%LINUXBASE%%/usr/lib/libflashsupport.so
-%%NO_ALSA%%@dir %%LINUXBASE%%/usr/lib
-%%NO_ALSA%%@dir %%LINUXBASE%%/usr
-%%NO_ALSA%%@dir %%LINUXBASE%%
diff --git a/www/linux-c6-flashplugin24/Makefile b/www/linux-c6-flashplugin24/Makefile
index 139f7e365987..6a132667c3f4 100644
--- a/www/linux-c6-flashplugin24/Makefile
+++ b/www/linux-c6-flashplugin24/Makefile
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	flashplugin
-PORTVERSION=	24.0.0.170
+PORTVERSION=	24.0.0.186
 CATEGORIES=	www multimedia linux
-MASTER_SITES=	https://fpdownload.macromedia.com/pub/labs/flashruntimes/flashplayer/linux32/ \
-		LOCAL/tijl/${DIST_SUBDIR}
+MASTER_SITES=	https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/
 PKGNAMEPREFIX?=	linux-c6-
-PKGNAMESUFFIX=	24
 DISTFILES=	flash_player_npapi_linux.i386.tar.gz
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
diff --git a/www/linux-c6-flashplugin24/distinfo b/www/linux-c6-flashplugin24/distinfo
index ace56652744b..43fdec735f21 100644
--- a/www/linux-c6-flashplugin24/distinfo
+++ b/www/linux-c6-flashplugin24/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481055000
-SHA256 (flashplugin/24.0.0.170/flash_player_npapi_linux.i386.tar.gz) = c705850fa33fc71d61f27e155d5dd1933dd49356492e6972383e2063ba3f310e
-SIZE (flashplugin/24.0.0.170/flash_player_npapi_linux.i386.tar.gz) = 9159686
+TIMESTAMP = 1481650383
+SHA256 (flashplugin/24.0.0.186/flash_player_npapi_linux.i386.tar.gz) = 3b5803388f31940484c1020db4c5533aa48cfccab3880eb55a6f25610eb691fd
+SIZE (flashplugin/24.0.0.186/flash_player_npapi_linux.i386.tar.gz) = 9159537
diff --git a/www/linux-c6-flashplugin24/pkg-descr b/www/linux-c6-flashplugin24/pkg-descr
index 9c9dcd2de5d8..8f9d1a986a37 100644
--- a/www/linux-c6-flashplugin24/pkg-descr
+++ b/www/linux-c6-flashplugin24/pkg-descr
@@ -1,10 +1,7 @@
-This is the official Flash Player from Adobe. This plugin enables
-you to see .swf and .spl files on the 'net from your Opera, Mozilla or
-Firefox sessions.
-
-Please see the Adobe home page for more information.
+This is the official Flash Player from Adobe.  Together with nspluginwrapper
+this plugin allows you to see .swf and .spl files in Firefox.
 
 FreeBSD Flash License Agreement:
-	http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/96374
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=96374
 
-WWW: http://www.adobe.com/
+WWW: https://www.adobe.com/
diff --git a/www/linux-c7-flashplugin11/Makefile b/www/linux-c7-flashplugin11/Makefile
deleted file mode 100644
index 9d6d887a6fa8..000000000000
--- a/www/linux-c7-flashplugin11/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PKGNAMEPREFIX=	linux-c7-
-USES=		linux:c7
-MASTERDIR=	${.CURDIR}/../linux-c6-flashplugin11
-
-.include "${MASTERDIR}/Makefile"
diff --git a/www/linux-f10-flashplugin11/Makefile b/www/linux-f10-flashplugin11/Makefile
deleted file mode 100644
index 5b5aa79d0992..000000000000
--- a/www/linux-f10-flashplugin11/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# Created by: Naoki Tsurutani
-# $FreeBSD$
-
-PKGNAMEPREFIX=	linux-f10-
-USES=		linux:f10
-MASTERDIR=	${.CURDIR}/../linux-c6-flashplugin11
-ALSA_USE_OFF=	LINUX=openssl
-
-.include "${MASTERDIR}/Makefile"