Move multimedia/adobe-flash-player24 to multimedia/adobe-flash-player.

8 files changed, 2 insertions, 135 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 27f3da2544d..e9230c055f8 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.254 2017/03/12 09:45:08 leot Exp $
+# $NetBSD: Makefile,v 1.255 2017/03/17 21:59:39 tsutsui Exp $
 #
 
 COMMENT=	Multimedia utilities
 
 SUBDIR+=	acidrip
-SUBDIR+=	adobe-flash-player24
+SUBDIR+=	adobe-flash-player
 SUBDIR+=	adobe-flash-plugin11
 SUBDIR+=	alevt
 SUBDIR+=	audiocd-kio
diff --git a/multimedia/adobe-flash-player24/DESCR b/multimedia/adobe-flash-player24/DESCR
deleted file mode 100644
index 2b35a9639dc..00000000000
--- a/multimedia/adobe-flash-player24/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-NPAPI Adobe Flash player plugin for the Firefox browser.
-This package contains a plugin that enables web browsers to render
-the Flash format.
-
-The nspluginwrapper option (enabled by default on non Linux platforms)
-permits the use of the the Linux x86 and x86_64 flash player in Firefox
-browsers on other x86 systems and x86_64 systems.
-
-For NetBSD this package requires NetBSD 6.2 or 7.1 (and later versions)
-which include procfs fixes for Linux binaries.
diff --git a/multimedia/adobe-flash-player24/INSTALL.nspluginwrapper b/multimedia/adobe-flash-player24/INSTALL.nspluginwrapper
deleted file mode 100644
index a11afee85be..00000000000
--- a/multimedia/adobe-flash-player24/INSTALL.nspluginwrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# $NetBSD: INSTALL.nspluginwrapper,v 1.1 2017/02/24 18:33:38 tsutsui Exp $
-
-PATH=@PREFIX@/bin:$PATH
-
-case $STAGE in
-    POST-INSTALL)
-	nspluginwrapper -i @PREFIX@/lib/netscape/plugins/libflashplayer.so
-	;;
-esac
-
-
-case $STAGE in
-    DEINSTALL)
-	for wrapped in `nspluginwrapper -l | grep ^/` ; do
-	    nspluginwrapper -r $wrapped
-	done
-	;;
-esac
diff --git a/multimedia/adobe-flash-player24/MESSAGE.pulseaudio b/multimedia/adobe-flash-player24/MESSAGE.pulseaudio
deleted file mode 100644
index 42c7acb2f34..00000000000
--- a/multimedia/adobe-flash-player24/MESSAGE.pulseaudio
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.pulseaudio,v 1.1 2017/02/24 18:33:38 tsutsui Exp $
-
-The flash plugin requires tmpfs to be mounted on /dev/shm for PulseAudio.
-
-This can be automated by adding the following to your /etc/fstab:
-
-tmpfs /emul/linux/dev/shm tmpfs rw,-m1777
-
-===========================================================================
diff --git a/multimedia/adobe-flash-player24/Makefile b/multimedia/adobe-flash-player24/Makefile
deleted file mode 100644
index 7fdfff42bb5..00000000000
--- a/multimedia/adobe-flash-player24/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2017/02/24 18:33:38 tsutsui Exp $
-
-FLASH_VERSION=		24.0.0.221
-DISTNAME=		flash_player_npapi_linux.${FLASH_ARCH}
-PKGNAME=		adobe-flash-player-${FLASH_VERSION}
-DIST_SUBDIR=		${PKGNAME_NOREV}
-CATEGORIES=		multimedia www
-MASTER_SITES=		http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASH_VERSION}/
-
-MAINTAINER=		tsutsui@NetBSD.org
-HOMEPAGE=		http://www.adobe.com/products/flashplayer.html
-COMMENT=		Adobe Flash Player Browser NPAPI plugin
-LICENSE=		flash-license
-
-RESTRICTED=		Redistribution not permitted
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-
-# On NetBSD, requires sufficiently new compat_linux and
-# procfs_map.c fixes pulled after 6.1 and 7.0.
-NOT_FOR_PLATFORM=	NetBSD-[0-5]*-* NetBSD-6.[0-1].*-* NetBSD-7.0.*-*
-
-WRKSRC=			${WRKDIR}
-BUILD_DIRS=		# empty
-
-CRYPTO=			yes
-
-EMUL_PLATFORMS=		linux-i386 linux-x86_64
-EMUL_MODULES.linux=	gtk2 x11 glx krb5 alsa curl nss nspr
-# flashplayer 24 still supports OpenSUSE 11.3, but NetBSD 6.x uses 12.1
-# by default so I won't bother to test with 11.3.
-EMUL_REQD=		suse>=12.1
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${EMUL_PLATFORM} == "linux-i386"
-FLASH_ARCH=		i386
-.elif ${EMUL_PLATFORM} == "linux-x86_64"
-FLASH_ARCH=		x86_64
-.endif
-
-CONFLICTS=		adobe-flash-plugin-[0-9]*
-
-NS_PLUGINS_DIR=		${PREFIX}/lib/netscape/plugins
-
-.include "options.mk"
-
-do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${NS_PLUGINS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/libflashplayer.so \
-		${DESTDIR}${NS_PLUGINS_DIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/adobe-flash-player24/PLIST b/multimedia/adobe-flash-player24/PLIST
deleted file mode 100644
index f0e83dc3e42..00000000000
--- a/multimedia/adobe-flash-player24/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2017/02/24 18:33:38 tsutsui Exp $
-lib/netscape/plugins/libflashplayer.so
diff --git a/multimedia/adobe-flash-player24/distinfo b/multimedia/adobe-flash-player24/distinfo
deleted file mode 100644
index 7211419a780..00000000000
--- a/multimedia/adobe-flash-player24/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.1 2017/02/24 18:33:38 tsutsui Exp $
-
-SHA1 (adobe-flash-player-24.0.0.221/flash_player_npapi_linux.i386.tar.gz) = f2fa63b6a18f3141a3b66e95e8cd003ca97aab15
-RMD160 (adobe-flash-player-24.0.0.221/flash_player_npapi_linux.i386.tar.gz) = 67e25b3d6dd85ca9df1733032acd9f5959e797c0
-SHA512 (adobe-flash-player-24.0.0.221/flash_player_npapi_linux.i386.tar.gz) = 54595f8baad3f9531e8f261ac89246f6a428b9c7be50019580618a8c14d650d7dea00b602f8b15881a2b8c9749df05fba38231cd7fffcd6eb66427d68539eea8
-Size (adobe-flash-player-24.0.0.221/flash_player_npapi_linux.i386.tar.gz) = 9161831 bytes
-SHA1 (adobe-flash-player-24.0.0.221/flash_player_npapi_linux.x86_64.tar.gz) = 70a56b541f0e980ed64f054799e23f92a91feceb
-RMD160 (adobe-flash-player-24.0.0.221/flash_player_npapi_linux.x86_64.tar.gz) = ef90cedbe7c93522e4712bd68a6e776bef9adb9a
-SHA512 (adobe-flash-player-24.0.0.221/flash_player_npapi_linux.x86_64.tar.gz) = c3f0702e247488d82543a364cda9d143e0f9f4262b36db1e4bc0d59f2d85f87afe8d741081965056c90de2460e166d93d6f9731043a3afe3ed6953f60225aa6b
-Size (adobe-flash-player-24.0.0.221/flash_player_npapi_linux.x86_64.tar.gz) = 9698349 bytes
diff --git a/multimedia/adobe-flash-player24/options.mk b/multimedia/adobe-flash-player24/options.mk
deleted file mode 100644
index 5ee9cfc6ac0..00000000000
--- a/multimedia/adobe-flash-player24/options.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2017/02/24 18:33:38 tsutsui Exp $
-#
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.adobe-flash-plugin
-PKG_SUPPORTED_OPTIONS=	nspluginwrapper pulseaudio
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} != "Linux"
-.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-PKG_SUGGESTED_OPTIONS=	nspluginwrapper
-.  endif
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mnspluginwrapper)
-DEPENDS+= nspluginwrapper>=1.4.4:../../www/nspluginwrapper
-.  if !empty(PKG_OPTIONS:Mpulseaudio)
-EMUL_MODULES.linux+=	pulseaudio
-MESSAGE_SRC+=		${PKGDIR}/MESSAGE.pulseaudio
-.  else
-DEPENDS+= libflashsupport>=4.2.2011:../../multimedia/libflashsupport
-.  endif
-INSTALL_TEMPLATES+=	${PKGDIR}/INSTALL.nspluginwrapper
-DEINSTALL_TEMPLATES+=	${PKGDIR}/INSTALL.nspluginwrapper
-.endif