Use "Flash Player archives" binary since official rpm is no longer available.

Also put the following changes:
- add CONFLICTS with adobe-flash-player24
- mention about security risks and newer adobe-flash-player24 in DESCR

Bump PKGREVISION.

No particular comment on pkgsrc-users@.

3 files changed, 33 insertions, 18 deletions

diff --git a/multimedia/adobe-flash-plugin11/DESCR b/multimedia/adobe-flash-plugin11/DESCR
index 322bc74f3c0..95cff102375 100644
--- a/multimedia/adobe-flash-plugin11/DESCR
+++ b/multimedia/adobe-flash-plugin11/DESCR
@@ -9,3 +9,12 @@ on other x86 systems and x86_64 systems.
 For NetBSD this package requires emul.linux.kern.osrelease = 2.6.18
 or later, which means it will not work on NetBSD 5.x or older
 systems.
+
+Note Adobe Flash Player 11 has already been EOLed in November 2016.
+11.2.202.644 is the last version of Flash Player version 11, and
+Adobe will no longer provide security fixes for this version.
+Please consider security risks to use this old package.
+
+If you are running NetBSD 7.1 and later, you should rather use
+the newer adobe-flash-player24, which Adobe still provides
+security updates.
diff --git a/multimedia/adobe-flash-plugin11/Makefile b/multimedia/adobe-flash-plugin11/Makefile
index 259e4a099ec..59698a7ca08 100644
--- a/multimedia/adobe-flash-plugin11/Makefile
+++ b/multimedia/adobe-flash-plugin11/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.65 2016/11/13 06:05:07 tsutsui Exp $
+# $NetBSD: Makefile,v 1.66 2017/02/24 19:08:30 tsutsui Exp $
 
-DISTNAME=		flash-plugin-${FLASH_VERSION}-release.${FLASH_ARCH}
-PKGNAME=		adobe-${DISTNAME:C/-release.*//}
+DISTNAME=		fp_${FLASH_VERSION}_archive
+PKGNAME=		adobe-flash-plugin-${FLASH_VERSION}
+PKGREVISION=		1
 CATEGORIES=		multimedia www
-MASTER_SITES=		http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASH_VERSION}/
+MASTER_SITES=		http://fpdownload.macromedia.com/pub/flashplayer/installers/archive/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.adobe.com/products/flashplayer.html
@@ -21,7 +22,8 @@ NOT_FOR_PLATFORM=	NetBSD-[0-4]*-* NetBSD-5.[0-9].*-*
 
 WRKSRC=			${WRKDIR}
 BUILD_DIRS=		# empty
-EXTRACT_SUFX=		.rpm
+EXTRACT_SUFX=		.zip
+USE_TOOLS+=		tar
 
 CRYPTO=			yes
 
@@ -30,26 +32,34 @@ EMUL_MODULES.linux=	gtk2 x11 krb5 alsa curl nss nspr
 EMUL_REQD=		suse>=11.3
 
 FLASH_VERSION=		11.2.202.644
+FP_ARCHIVE_VERSION=	11_2r202_644
+FP_ARCHIVE_DIR_PREFIX=	11_2_r202_644
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${EMUL_PLATFORM} == "linux-i386"
 FLASH_ARCH=		i386
-FLASH_LIBDIR=		lib
+FP_ARCHIVE_DIR_SUFFIX=	32bit
 .elif ${EMUL_PLATFORM} == "linux-x86_64"
 FLASH_ARCH=		x86_64
-FLASH_LIBDIR=		lib64
+FP_ARCHIVE_DIR_SUFFIX=	64bit
 .endif
 
-CONFLICTS=		ns-flash-[0-9]*
+FP_ARCHIVE_DIR=		${FP_ARCHIVE_DIR_PREFIX}_${FP_ARCHIVE_DIR_SUFFIX}
+FP_ARCHIVE=		flashplayer${FP_ARCHIVE_VERSION}_linux.${FLASH_ARCH}.tar.gz
+
+CONFLICTS=		ns-flash-[0-9]* adobe-flash-player-[0-9]*
 
 NS_PLUGINS_DIR=		${PREFIX}/lib/netscape/plugins
 
 .include "options.mk"
 
+post-extract:
+	cd ${WRKDIR} && tar -zxf ${FP_ARCHIVE_DIR}/${FP_ARCHIVE}
+
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${NS_PLUGINS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/usr/${FLASH_LIBDIR}/flash-plugin/libflashplayer.so \
+	${INSTALL_DATA} ${WRKSRC}/libflashplayer.so \
 		${DESTDIR}${NS_PLUGINS_DIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/adobe-flash-plugin11/distinfo b/multimedia/adobe-flash-plugin11/distinfo
index 56768aa4900..e477fc51c66 100644
--- a/multimedia/adobe-flash-plugin11/distinfo
+++ b/multimedia/adobe-flash-plugin11/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.62 2016/11/13 06:05:07 tsutsui Exp $
+$NetBSD: distinfo,v 1.63 2017/02/24 19:08:30 tsutsui Exp $
 
-SHA1 (flash-plugin-11.2.202.644-release.i386.rpm) = 9005dfffcc8a8273fb2397c31720334ead6ade5a
-RMD160 (flash-plugin-11.2.202.644-release.i386.rpm) = 04cec738ffeb66f1d2ccee87b94e3a08aac9d529
-SHA512 (flash-plugin-11.2.202.644-release.i386.rpm) = 53cf53747b5024fd424d4524d2d5e9d59b969ecdb4fb0b0608e8de1b06bce242da871614eab54062fbbe85c34fec086e0e5b800dde21b31ecbc9e6f1a84756fa
-Size (flash-plugin-11.2.202.644-release.i386.rpm) = 6972708 bytes
-SHA1 (flash-plugin-11.2.202.644-release.x86_64.rpm) = a414091c25ebf95624fbd47ab1d33f9386aa7608
-RMD160 (flash-plugin-11.2.202.644-release.x86_64.rpm) = b8bf23baf320bd555756ea274c1b0151b92223c3
-SHA512 (flash-plugin-11.2.202.644-release.x86_64.rpm) = 445c8a9e43a04e9b32fd432bb1ad9fb48f63efb8d28db3a9eca91af913239b134a3f9f955cca9cfe608332b1c86475d63162c6063ec6c2c7b1d4b80ec4843acd
-Size (flash-plugin-11.2.202.644-release.x86_64.rpm) = 7281012 bytes
+SHA1 (fp_11.2.202.644_archive.zip) = 40044dbc97ef97e285a1d0f34c0088f779ce3c63
+RMD160 (fp_11.2.202.644_archive.zip) = 937021e34d262d00fc11d1623d20fe82f7ba9879
+SHA512 (fp_11.2.202.644_archive.zip) = af8063a41b8238959f7d7ce618405148a064ec5a954ed62951273a53bb1d959050ff23ba006ee624b23054c4f61bd844e7eda01cc68fe527b8bbfcf003448e7b
+Size (fp_11.2.202.644_archive.zip) = 33913740 bytes