6 files changed, 21 insertions, 31 deletions
diff --git a/multimedia/adobe-flash-plugin10.1/DESCR b/multimedia/adobe-flash-plugin10.1/DESCR
index f1ca535c228..bbc0cc2a911 100644
--- a/multimedia/adobe-flash-plugin10.1/DESCR
+++ b/multimedia/adobe-flash-plugin10.1/DESCR
@@ -1,10 +1,10 @@
 Netscape plugin for Adobe Flash player.  This package contains
-a plugin that enables web browsers to render the Flash format.
+a plugin that enables Netscape to render the Flash format.
 
 The nspluginwrapper option (enabled by default) permits the use of
 the the Linux x86 flash player in Firefox browsers on other x86
 systems.
 
-This package requires emul.linux.kern.osrelease = 2.6.18 or later.
-This means this package won't work on NetBSD 5.x or older systems!
-
+Systems tested with nspluginwrapper:
+    - NetBSD 5.0			- works
+    - firefox 3.0.x			- works
diff --git a/multimedia/adobe-flash-plugin10.1/INSTALL.nspluginwrapper b/multimedia/adobe-flash-plugin10.1/INSTALL.nspluginwrapper
index 1fac0784686..530c2a0938f 100644
--- a/multimedia/adobe-flash-plugin10.1/INSTALL.nspluginwrapper
+++ b/multimedia/adobe-flash-plugin10.1/INSTALL.nspluginwrapper
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: INSTALL.nspluginwrapper,v 1.1.1.1 2011/02/08 18:47:03 ahoka Exp $
+# $NetBSD: INSTALL.nspluginwrapper,v 1.2 2011/02/10 09:49:09 ahoka Exp $
 
 PATH=@PREFIX@/bin:$PATH
 
diff --git a/multimedia/adobe-flash-plugin10.1/Makefile b/multimedia/adobe-flash-plugin10.1/Makefile
index cc14a9315d8..160dd4d486b 100644
--- a/multimedia/adobe-flash-plugin10.1/Makefile
+++ b/multimedia/adobe-flash-plugin10.1/Makefile
@@ -1,11 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/02/08 18:47:03 ahoka Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/10 09:49:09 ahoka Exp $
 
 CATEGORIES=	multimedia www
-#MASTER_SITES=	http://download.macromedia.com/pub/labs/flashplayer10/
 MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/current/
-#http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz
-#flash-plugin-10.1.102.65-release.i386.rpm
-MASTER_SITES+=	ftp://www.dvo.ru/pub/Gentoo/distfiles/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.adobe.com/
@@ -22,27 +18,19 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}
 BUILD_DIRS=		# empty
-DIST_SUBDIR=		flash/${FLASH_VERS}
+EXTRACT_SUFX=		.rpm
 
 CRYPTO=			yes
 
 EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	compat gtk2 x11 krb5
-EMUL_REQD=		suse>=10.0
+EMUL_REQD=		suse>=11.3
 
-.include "../../mk/bsd.prefs.mk"
-
-# Defaults so lintpkgsrc is happy
-FLASH_VERS=		10.1.102.65
-#FLASH_VERS=		10.0.0.525
-.if ${EMUL_PLATFORM} == "linux-i386"
-DISTUNAME=		linux
-DISTNAME=		install_flash_player_10_${DISTUNAME}
-WRKNAME=		install_flash_player_10_${DISTUNAME}
-.endif
+FLASH_VERSION=		10.2.152.27
+DISTNAME=		flash-plugin-${FLASH_VERSION}-release.i386
 
 CONFLICTS=		ns-flash-[0-9]*
-PKGNAME=		adobe-flash-plugin-${FLASH_VERS:S/r/./}
+PKGNAME=		adobe-flash-plugin-${FLASH_VERSION:S/r/./}
 
 NS_PLUGINS_DIR=		${PREFIX}/lib/netscape/plugins
 
@@ -50,6 +38,7 @@ NS_PLUGINS_DIR=		${PREFIX}/lib/netscape/plugins
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${NS_PLUGINS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/libflashplayer.so ${DESTDIR}${NS_PLUGINS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/usr/lib/flash-plugin/libflashplayer.so \
+		${DESTDIR}${NS_PLUGINS_DIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/adobe-flash-plugin10.1/PLIST b/multimedia/adobe-flash-plugin10.1/PLIST
index 8ee0fb5b25a..0579409da05 100644
--- a/multimedia/adobe-flash-plugin10.1/PLIST
+++ b/multimedia/adobe-flash-plugin10.1/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/02/08 18:47:03 ahoka Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/02/10 09:49:09 ahoka Exp $
 lib/netscape/plugins/libflashplayer.so
diff --git a/multimedia/adobe-flash-plugin10.1/distinfo b/multimedia/adobe-flash-plugin10.1/distinfo
index 37bd8f2aab0..2fe1d968469 100644
--- a/multimedia/adobe-flash-plugin10.1/distinfo
+++ b/multimedia/adobe-flash-plugin10.1/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/02/08 18:47:03 ahoka Exp $
+$NetBSD: distinfo,v 1.2 2011/02/10 09:49:09 ahoka Exp $
 
-SHA1 (flash/10.1.102.65/install_flash_player_10_linux.tar.gz) = d7addfbb4a541817933d195fd20718aaa7c6ffcc
-RMD160 (flash/10.1.102.65/install_flash_player_10_linux.tar.gz) = b86be76ccfc25e0571f80a4c74e49c0196f2486a
-Size (flash/10.1.102.65/install_flash_player_10_linux.tar.gz) = 4911328 bytes
+SHA1 (flash-plugin-10.2.152.27-release.i386.rpm) = 3feeb3e941361b63ff9da0e08bfc202dfbc82da2
+RMD160 (flash-plugin-10.2.152.27-release.i386.rpm) = 4fd7007ce17b0eeb37fad487c59dc9f9f02854be
+Size (flash-plugin-10.2.152.27-release.i386.rpm) = 4961334 bytes
diff --git a/multimedia/adobe-flash-plugin10.1/options.mk b/multimedia/adobe-flash-plugin10.1/options.mk
index 92e3ffecbeb..55889ee3abb 100644
--- a/multimedia/adobe-flash-plugin10.1/options.mk
+++ b/multimedia/adobe-flash-plugin10.1/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2011/02/08 18:47:03 ahoka Exp $
+# $NetBSD: options.mk,v 1.2 2011/02/10 09:49:09 ahoka Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ns-flash
@@ -10,6 +10,8 @@ PKG_SUPPORTED_OPTIONS=	nspluginwrapper
 # it will install a plugin for the current user in ~/.mozilla/plugins/
 # or similar. This is inconsistant and potentially confusing.
 
+.include "../../mk/bsd.prefs.mk"
+
 .if ${MACHINE_ARCH} == "i386" && ${OPSYS} != "Linux"
 PKG_SUGGESTED_OPTIONS=  nspluginwrapper
 .endif
@@ -18,7 +20,6 @@ PKG_SUGGESTED_OPTIONS=  nspluginwrapper
 
 .if !empty(PKG_OPTIONS:Mnspluginwrapper)
 DEPENDS+= nspluginwrapper>0:../../www/nspluginwrapper
-DEPENDS+= libflashsupport{,-pulse}>0:../../multimedia/libflashsupport
 INSTALL_TEMPLATES+=	${PKGDIR}/INSTALL.nspluginwrapper
 DEINSTALL_TEMPLATES+=	${PKGDIR}/INSTALL.nspluginwrapper
 .endif