svn commit: r373426 - in head/www: linux-c6-flashplugin11 linux-f10-flashplugin11

[John Marino]

Author: marino
Date: Tue Nov 25 18:27:17 2014
New Revision: 373426
URL: https://svnweb.freebsd.org/changeset/ports/373426
QAT: https://qat.redports.org/buildarchive/r373426/

Log:
  www/linux-*-flashplugin11: Drop libflash support now that ALSA works
  
  PR:		192541
  Submitted by:	Jan Beich
  Approved by:	maintainer timeout (> 3 months)

Modified:
  head/www/linux-c6-flashplugin11/Makefile
  head/www/linux-c6-flashplugin11/distinfo
  head/www/linux-c6-flashplugin11/pkg-plist
  head/www/linux-f10-flashplugin11/Makefile
  head/www/linux-f10-flashplugin11/distinfo
  head/www/linux-f10-flashplugin11/pkg-plist

Modified: head/www/linux-c6-flashplugin11/Makefile
==============================================================================
--- head/www/linux-c6-flashplugin11/Makefile	Tue Nov 25 18:20:28 2014	(r373425)
+++ head/www/linux-c6-flashplugin11/Makefile	Tue Nov 25 18:27:17 2014	(r373426)
@@ -5,11 +5,9 @@ PORTNAME=	flashplugin
 PORTVERSION=	11.2r202.418
 PORTREVISION=	1
 CATEGORIES=	www multimedia linux
-MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:C/r/\./}/:plugin \
-		LOCAL/nox:suplib
+MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/
 PKGNAMEPREFIX=	linux-${USE_LINUX}-
-DISTFILES=	install_flash_player_11_linux.i386.tar.gz:plugin \
-		linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
+DISTFILES=	install_flash_player_11_linux.i386.tar.gz
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	emulation at FreeBSD.org
@@ -17,11 +15,11 @@ COMMENT=	Adobe Flash Player NPAPI Plugin
 
 ONLY_FOR_ARCHS=	amd64 i386
 USE_LINUX=	c6
-USE_LINUX_APPS=	curl cyrus-sasl2 gtk2 nspr nss openssl-compat #-alsalib libssh2 openldap
+USE_LINUX_APPS=	alsalib alsa-plugins-oss curl cyrus-sasl2 \
+		gtk2 nspr nss # libssh2 openldap
 WANT_GNOME=	yes
 
 RESTRICTED=	Redistribution not allowed
-RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -51,7 +49,6 @@ post-patch:
 do-install:
 	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} ${STAGEDIR}${LINUXBASE}/usr/lib
 	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
-	${INSTALL_LIB} ${WRKDIR}/libflashsupport.so ${STAGEDIR}${LINUXBASE}/usr/lib
 	${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/flash-player-properties ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/usr/share/applications/flash-player-properties.desktop ${STAGEDIR}${DESKTOPDIR}
 	(cd ${WRKDIR}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${STAGEDIR}${PREFIX}/share/icons)

Modified: head/www/linux-c6-flashplugin11/distinfo
==============================================================================
--- head/www/linux-c6-flashplugin11/distinfo	Tue Nov 25 18:20:28 2014	(r373425)
+++ head/www/linux-c6-flashplugin11/distinfo	Tue Nov 25 18:27:17 2014	(r373426)
@@ -1,4 +1,2 @@
 SHA256 (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = e374f4fec5f2881407728c261754bd596e4af0e1237dbe7de5fcacbde796b79e
 SIZE (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = 6925123
-SHA256 (flashplugin/11.2r202.418/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
-SIZE (flashplugin/11.2r202.418/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455

Modified: head/www/linux-c6-flashplugin11/pkg-plist
==============================================================================
--- head/www/linux-c6-flashplugin11/pkg-plist	Tue Nov 25 18:20:28 2014	(r373425)
+++ head/www/linux-c6-flashplugin11/pkg-plist	Tue Nov 25 18:27:17 2014	(r373426)
@@ -6,4 +6,3 @@ share/icons/hicolor/22x22/apps/flash-pla
 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
-%%LINUXBASE%%/usr/lib/libflashsupport.so

Modified: head/www/linux-f10-flashplugin11/Makefile
==============================================================================
--- head/www/linux-f10-flashplugin11/Makefile	Tue Nov 25 18:20:28 2014	(r373425)
+++ head/www/linux-f10-flashplugin11/Makefile	Tue Nov 25 18:27:17 2014	(r373426)
@@ -5,11 +5,9 @@ PORTNAME=	flashplugin
 PORTVERSION=	11.2r202.418
 PORTREVISION=	2
 CATEGORIES=	www multimedia linux
-MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:C/r/\./}/:plugin \
-		LOCAL/nox:suplib
+MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/
 PKGNAMEPREFIX=	linux-${USE_LINUX}-
-DISTFILES=	install_flash_player_11_linux.i386.tar.gz:plugin \
-		linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
+DISTFILES=	install_flash_player_11_linux.i386.tar.gz
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	emulation at FreeBSD.org
@@ -17,11 +15,11 @@ COMMENT=	Adobe Flash Player NPAPI Plugin
 
 ONLY_FOR_ARCHS=	amd64 i386
 USE_LINUX=	f10
-USE_LINUX_APPS=	curl cyrus-sasl2 gtk2 libssh2 nspr nss openldap openssl
+USE_LINUX_APPS=	alsalib alsa-plugins-oss curl cyrus-sasl2 \
+		gtk2 libssh2 nspr nss openldap openssl
 WANT_GNOME=	yes
 
 RESTRICTED=	Redistribution not allowed
-RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -51,7 +49,6 @@ post-patch:
 do-install:
 	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} ${STAGEDIR}${LINUXBASE}/usr/lib
 	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
-	${INSTALL_LIB} ${WRKDIR}/libflashsupport.so ${STAGEDIR}${LINUXBASE}/usr/lib
 	${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/flash-player-properties ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/usr/share/applications/flash-player-properties.desktop ${STAGEDIR}${DESKTOPDIR}
 	(cd ${WRKDIR}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${STAGEDIR}${PREFIX}/share/icons)

Modified: head/www/linux-f10-flashplugin11/distinfo
==============================================================================
--- head/www/linux-f10-flashplugin11/distinfo	Tue Nov 25 18:20:28 2014	(r373425)
+++ head/www/linux-f10-flashplugin11/distinfo	Tue Nov 25 18:27:17 2014	(r373426)
@@ -1,4 +1,2 @@
 SHA256 (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = e374f4fec5f2881407728c261754bd596e4af0e1237dbe7de5fcacbde796b79e
 SIZE (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = 6925123
-SHA256 (flashplugin/11.2r202.418/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
-SIZE (flashplugin/11.2r202.418/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455

Modified: head/www/linux-f10-flashplugin11/pkg-plist
==============================================================================
--- head/www/linux-f10-flashplugin11/pkg-plist	Tue Nov 25 18:20:28 2014	(r373425)
+++ head/www/linux-f10-flashplugin11/pkg-plist	Tue Nov 25 18:27:17 2014	(r373426)
@@ -6,4 +6,3 @@ share/icons/hicolor/22x22/apps/flash-pla
 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
-%%LINUXBASE%%/usr/lib/libflashsupport.so