Update to 7.0r61 to sync with firefox-bin-flash and ns-flash packages.

The old version is horribly outdated and vulnerable.
Use framework provided by firefox-bin-flash/Makefile.common

4 files changed, 15 insertions, 43 deletions

diff --git a/multimedia/moz-bin-flash/DESCR b/multimedia/moz-bin-flash/DESCR
index b8770609f95..6cb81650be0 100644
--- a/multimedia/moz-bin-flash/DESCR
+++ b/multimedia/moz-bin-flash/DESCR
@@ -1,3 +1,2 @@
-This is the official Flash Player 6 from Macromedia. This plugin
-enables you to see .swf and .spl files on the 'net using the
-mozilla-linux package.
+This package provides the Macromedia Flash player plugin for the
+mozilla-bin package.
diff --git a/multimedia/moz-bin-flash/Makefile b/multimedia/moz-bin-flash/Makefile
index fe5a5bcfe29..30eafc23df8 100644
--- a/multimedia/moz-bin-flash/Makefile
+++ b/multimedia/moz-bin-flash/Makefile
@@ -1,37 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:43 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.5 2005/12/19 11:46:30 salo Exp $
+.include "../../www/firefox-bin-flash/Makefile.common"
 
-DISTNAME=	install_flash_player_6_linux
-PKGNAME=	moz-bin-flash-${VERSION}
-CATEGORIES=	multimedia www
-MASTER_SITES=	http://download.macromedia.com/pub/shockwave/flash/english/linux/6.0r69/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.macromedia.com/
-COMMENT=	Flash player for the linux version of mozilla (binary pkg)
+COMMENT=	Flash Player plugin for mozilla-bin
+MOZ_NAME=	mozilla-linux
+MOZ_BIN=	moz-bin
 
 DEPENDS+=	mozilla-bin-[0-9]*:../../www/mozilla-bin
 
 CONFLICTS+=	mozilla-flash-bin-[0-9]*
 
-VERSION=	6.0.69
-
-NO_CONFIGURE=	YES
-NO_BUILD=	YES
-
-WRKSRC=		${WRKDIR}/install_flash_player_6_linux
-
-DOCDIR=		share/doc/moz-bin-flash
-PLIST_SUBST+=	DOCDIR=${DOCDIR:Q}
-
-INSTALLATION_DIRS=	lib/mozilla-linux/components lib/mozilla-linux/plugins
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/libflashplayer.so ${PREFIX}/lib/mozilla-linux/plugins
-	${INSTALL_DATA} ${WRKSRC}/flashplayer.xpt ${PREFIX}/lib/mozilla-linux/components
-
-	${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
-	${INSTALL_DATA}	${WRKSRC}/readme.txt ${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/ReadMe.htm ${PREFIX}/${DOCDIR}
-
+.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/moz-bin-flash/PLIST b/multimedia/moz-bin-flash/PLIST
index 1a150fa6cf2..1b9897a1122 100644
--- a/multimedia/moz-bin-flash/PLIST
+++ b/multimedia/moz-bin-flash/PLIST
@@ -1,6 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 14:46:49 jmmv Exp $
-lib/mozilla-linux/components/flashplayer.xpt
-lib/mozilla-linux/plugins/libflashplayer.so
-${DOCDIR}/readme.txt
-${DOCDIR}/ReadMe.htm
-@dirrm ${DOCDIR}
+@comment $NetBSD: PLIST,v 1.2 2005/12/19 11:46:30 salo Exp $
+lib/${MOZ_NAME}/plugins/flashplayer.xpt
+lib/${MOZ_NAME}/plugins/libflashplayer.so
diff --git a/multimedia/moz-bin-flash/distinfo b/multimedia/moz-bin-flash/distinfo
index 1b06b76d9ea..1083f09b28c 100644
--- a/multimedia/moz-bin-flash/distinfo
+++ b/multimedia/moz-bin-flash/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:03 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/12/19 11:46:30 salo Exp $
 
-SHA1 (install_flash_player_6_linux.tar.gz) = ecddda28954ce26882cea0f6578af326d7c6e76c
-RMD160 (install_flash_player_6_linux.tar.gz) = 3b0e0b86a78bb2687207b99d5c9c325dffe42a0f
-Size (install_flash_player_6_linux.tar.gz) = 706066 bytes
+SHA1 (flash/7.0r61/install_flash_player_7_linux.tar.gz) = c9d53efa89beb052cc989d481bf617bcb6ff30d2
+RMD160 (flash/7.0r61/install_flash_player_7_linux.tar.gz) = 7d00d08ad34381a2cc1944dc4cee49ff02523fca
+Size (flash/7.0r61/install_flash_player_7_linux.tar.gz) = 989217 bytes