svn commit: r425225 - in head/www: . linux-c6-flashplugin24 linux-c7-flashplugin24

[Tijl Coosemans]

Author: tijl
Date: Thu Nov  3 14:54:39 2016
New Revision: 425225
URL: https://svnweb.freebsd.org/changeset/ports/425225

Log:
  Add port for Adobe flash plugin 24.0.0.138 (beta).

Added:
  head/www/linux-c6-flashplugin24/
     - copied from r425159, head/www/linux-c6-flashplugin11/
  head/www/linux-c7-flashplugin24/
     - copied from r425159, head/www/linux-c7-flashplugin11/
Modified:
  head/www/Makefile
  head/www/linux-c6-flashplugin24/Makefile
  head/www/linux-c6-flashplugin24/distinfo
  head/www/linux-c6-flashplugin24/pkg-plist
  head/www/linux-c7-flashplugin24/Makefile

Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile	Thu Nov  3 14:54:31 2016	(r425224)
+++ head/www/Makefile	Thu Nov  3 14:54:39 2016	(r425225)
@@ -368,8 +368,10 @@
     SUBDIR += links-hacked
     SUBDIR += links1
     SUBDIR += linux-c6-flashplugin11
+    SUBDIR += linux-c6-flashplugin24
     SUBDIR += linux-c6-qt47-webkit
     SUBDIR += linux-c7-flashplugin11
+    SUBDIR += linux-c7-flashplugin24
     SUBDIR += linux-c7-qtwebkit
     SUBDIR += linux-f10-flashplugin11
     SUBDIR += linux-firefox

Modified: head/www/linux-c6-flashplugin24/Makefile
==============================================================================
--- head/www/linux-c6-flashplugin11/Makefile	Wed Nov  2 14:54:56 2016	(r425159)
+++ head/www/linux-c6-flashplugin24/Makefile	Thu Nov  3 14:54:39 2016	(r425225)
@@ -2,41 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	flashplugin
-PORTVERSION=	11.2r202.643
+PORTVERSION=	24.0.0.138
 CATEGORIES=	www multimedia linux
-MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \
-		LOCAL/nox:suplib
+MASTER_SITES=	https://fpdownload.macromedia.com/pub/labs/flashruntimes/flashplayer/linux32/
 PKGNAMEPREFIX?=	linux-c6-
-DISTFILES=	install_flash_player_11_linux.i386.tar.gz:plugin
+PKGNAMESUFFIX=	24
+DISTFILES=	flash_player_npapi_linux.i386.tar.gz
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	emulation at FreeBSD.org
-COMMENT=	Adobe Flash Player NPAPI Plugin
+COMMENT=	Adobe Flash Player NPAPI Plugin (beta)
 
 ONLY_FOR_ARCHS=	amd64 i386
 USES?=		linux:c6
-USE_LINUX=	curl cyrus-sasl2 gdkpixbuf2 gtk2 nspr nss
+USE_LINUX=	alsalib alsa-plugins-oss curl dri gtk2 nspr nss
 
 RESTRICTED=	Redistribution not allowed
-RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 STRIP=
 USES+=		cpe webplugin:linux
-WEBPLUGIN_FILES=	libflashplayer.so
-
-OPTIONS_DEFINE=	ALSA
-OPTIONS_SUB=	yes
-
-ALSA_DESC=	ALSA audio output (broken, needs lemul)
-ALSA_USE=	LINUX=alsalib,alsa-plugins-oss
-ALSA_USE_OFF?=	LINUX=openssl-compat
-ALSA_DISTFILES_OFF=	linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
-ALSA_PLIST_SUB_OFF=	LINUXBASE="${LINUXBASE}"
-
 CPE_VENDOR=	adobe
 CPE_PRODUCT=	flash_player
+WEBPLUGIN_FILES=libflashplayer.so
 
 .include <bsd.port.options.mk>
 
@@ -47,10 +36,6 @@ post-patch:
 do-install:
 	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
 	${INSTALL_LIB} ${WRKSRC}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
-.if ! ${PORT_OPTIONS:MALSA}
-	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib
-	${INSTALL_LIB} ${WRKSRC}/libflashsupport.so ${STAGEDIR}${LINUXBASE}/usr/lib
-.endif
 	${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/flash-player-properties ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/usr/share/applications/flash-player-properties.desktop ${STAGEDIR}${DESKTOPDIR}
 	(cd ${WRKSRC}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${STAGEDIR}${PREFIX}/share/icons)

Modified: head/www/linux-c6-flashplugin24/distinfo
==============================================================================
--- head/www/linux-c6-flashplugin11/distinfo	Wed Nov  2 14:54:56 2016	(r425159)
+++ head/www/linux-c6-flashplugin24/distinfo	Thu Nov  3 14:54:39 2016	(r425225)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1477572180
-SHA256 (flashplugin/11.2r202.643/install_flash_player_11_linux.i386.tar.gz) = b3cb465620b18df1a4cb88427f2e3c7bd080ee23883b05f94245187a783fa25c
-SIZE (flashplugin/11.2r202.643/install_flash_player_11_linux.i386.tar.gz) = 6991072
-SHA256 (flashplugin/11.2r202.643/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
-SIZE (flashplugin/11.2r202.643/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
+TIMESTAMP = 1478178247
+SHA256 (flashplugin/24.0.0.138/flash_player_npapi_linux.i386.tar.gz) = b8ad51040695c6c6a6534353f0950b012353682dd1b1e37168897a1c7eaa0c07
+SIZE (flashplugin/24.0.0.138/flash_player_npapi_linux.i386.tar.gz) = 9159673

Modified: head/www/linux-c6-flashplugin24/pkg-plist
==============================================================================
--- head/www/linux-c6-flashplugin11/pkg-plist	Wed Nov  2 14:54:56 2016	(r425159)
+++ head/www/linux-c6-flashplugin24/pkg-plist	Thu Nov  3 14:54:39 2016	(r425225)
@@ -6,7 +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
-%%NO_ALSA%%%%LINUXBASE%%/usr/lib/libflashsupport.so
-%%NO_ALSA%%@dir %%LINUXBASE%%/usr/lib
-%%NO_ALSA%%@dir %%LINUXBASE%%/usr
-%%NO_ALSA%%@dir %%LINUXBASE%%

Modified: head/www/linux-c7-flashplugin24/Makefile
==============================================================================
--- head/www/linux-c7-flashplugin11/Makefile	Wed Nov  2 14:54:56 2016	(r425159)
+++ head/www/linux-c7-flashplugin24/Makefile	Thu Nov  3 14:54:39 2016	(r425225)
@@ -2,6 +2,6 @@
 
 PKGNAMEPREFIX=	linux-c7-
 USES=		linux:c7
-MASTERDIR=	${.CURDIR}/../linux-c6-flashplugin11
+MASTERDIR=	${.CURDIR}/../linux-c6-flashplugin24
 
 .include "${MASTERDIR}/Makefile"