MFH: r425225, r425380, r425941, r427989, r428522

Add flash plugin 24.0.0.186 and remove flash plugin 11.x ports because the
distfiles are no longer available.

Approved by:	ports-secteam (feld)

10 files changed, 19 insertions, 52 deletions

diff --git a/MOVED b/MOVED
index bba5504b27d3..b31f1bb1a02b 100644
--- a/MOVED
+++ b/MOVED
@@ -8664,3 +8664,5 @@ databases/postgresql91-docs||2016-10-02|Has expired: End-of-life is near
 www/mediawiki125||2016-10-02|Has expired: EOL upstream
 multimedia/kvazaar-devel|multimedia/kvazaar|2016-10-05|Out of date: use multimedia/kvazaar for now
 www/lighttpd-mod_geoip|www/lighttpd|2016-10-21|Integrated into www/lighttpd
+www/linux-f10-flashplugin11||2016-12-13|Deprecated
+www/linux-c6-flashplugin11|www/linux-c6-flashplugin24|2016-12-13|Deprecated
diff --git a/www/Makefile b/www/Makefile
index ce58e9a3ee8a..27b94f690087 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -367,9 +367,8 @@
     SUBDIR += links
     SUBDIR += links-hacked
     SUBDIR += links1
-    SUBDIR += linux-c6-flashplugin11
+    SUBDIR += linux-c6-flashplugin24
     SUBDIR += linux-c6-qt47-webkit
-    SUBDIR += linux-f10-flashplugin11
     SUBDIR += linux-firefox
     SUBDIR += linux-opera
     SUBDIR += linux-seamonkey
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/Makefile b/www/linux-c6-flashplugin24/Makefile
index a6c99fab2444..6a132667c3f4 100644
--- a/www/linux-c6-flashplugin11/Makefile
+++ b/www/linux-c6-flashplugin24/Makefile
@@ -2,41 +2,29 @@
 # $FreeBSD$
 
 PORTNAME=	flashplugin
-PORTVERSION=	11.2r202.644
+PORTVERSION=	24.0.0.186
 CATEGORIES=	www multimedia linux
-MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \
-		LOCAL/nox:suplib
+MASTER_SITES=	https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/
 PKGNAMEPREFIX?=	linux-c6-
-DISTFILES=	install_flash_player_11_linux.i386.tar.gz:plugin
+DISTFILES=	flash_player_npapi_linux.i386.tar.gz
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Adobe Flash Player NPAPI Plugin
+COMMENT=	Adobe Flash Player NPAPI Plugin (beta)
 
 ONLY_FOR_ARCHS=	amd64 i386
 USES?=		linux:c6
-USE_LINUX=	curl cyrus-sasl2 gdkpixbuf2 gtk2 nspr nss
+USE_LINUX=	alsalib alsa-plugins-oss curl dri 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
+WEBPLUGIN_FILES=libflashplayer.so
 
 .include <bsd.port.options.mk>
 
@@ -47,10 +35,6 @@ post-patch:
 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)
diff --git a/www/linux-c6-flashplugin24/distinfo b/www/linux-c6-flashplugin24/distinfo
new file mode 100644
index 000000000000..43fdec735f21
--- /dev/null
+++ b/www/linux-c6-flashplugin24/distinfo
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000000..8f9d1a986a37
--- /dev/null
+++ b/www/linux-c6-flashplugin24/pkg-descr
@@ -0,0 +1,7 @@
+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:
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=96374
+
+WWW: https://www.adobe.com/
diff --git a/www/linux-c6-flashplugin11/pkg-message b/www/linux-c6-flashplugin24/pkg-message
index 98294fcb3e9b..98294fcb3e9b 100644
--- a/www/linux-c6-flashplugin11/pkg-message
+++ b/www/linux-c6-flashplugin24/pkg-message
diff --git a/www/linux-c6-flashplugin11/pkg-plist b/www/linux-c6-flashplugin24/pkg-plist
index 4d7104c122ba..f771bf3455f4 100644
--- a/www/linux-c6-flashplugin11/pkg-plist
+++ b/www/linux-c6-flashplugin24/pkg-plist
@@ -6,7 +6,3 @@ 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-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"