[Midnightbsd-cvs] mports [19680] trunk/www/linux-f10-flashplugin11: update flash plugin

Fri Aug 7 20:33:02 EDT 2015

Revision: 19680
          http://svnweb.midnightbsd.org/mports/?rev=19680
Author:   laffer1
Date:     2015-08-07 20:32:59 -0400 (Fri, 07 Aug 2015)
Log Message:
-----------
update flash plugin

Modified Paths:
--------------
    trunk/www/linux-f10-flashplugin11/Makefile
    trunk/www/linux-f10-flashplugin11/distinfo
    trunk/www/linux-f10-flashplugin11/pkg-plist

Modified: trunk/www/linux-f10-flashplugin11/Makefile
===================================================================

--- trunk/www/linux-f10-flashplugin11/Makefile	2015-08-08 00:14:00 UTC (rev 19679)
+++ trunk/www/linux-f10-flashplugin11/Makefile	2015-08-08 00:32:59 UTC (rev 19680)
@@ -1,13 +1,12 @@
 # $MidnightBSD$
 
 PORTNAME=	flashplugin
-PORTVERSION=	11.2r202.346
+PORTVERSION=	11.2r202.491
 CATEGORIES=	www multimedia linux
-MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:C/r/\./}/:plugin \
+MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \
 		FREEBSD_LOCAL/nox:suplib
-PKGNAMEPREFIX=	linux-f10-
-DISTFILES=	install_flash_player_11_linux.i386.tar.gz:plugin \
-		linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
+PKGNAMEPREFIX=	linux-${USE_LINUX}-
+DISTFILES=	install_flash_player_11_linux.i386.tar.gz:plugin
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -15,8 +14,8 @@
 
 LICENSE=	other
 
-USE_LINUX=	f10
-USE_LINUX_APPS=	openssl curl cyrus-sasl2 libssh2 nspr nss openldap gtk2
+USE_LINUX?=	f10
+USE_LINUX_APPS?=	curl cyrus-sasl2 gdkpixbuf2 gtk2 nspr nss libssh2 openldap
 WANT_GNOME=	yes
 
 RESTRICTED=	Redistribution not allowed
@@ -23,21 +22,33 @@
 RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
 
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}
+NO_WRKSUBDIR=	yes
 
-USE_NPAPI=	linux-*
-NPAPI_FILES=	libflashplayer.so
+USES=		webplugin:linux desktop-file-utils cpe
+WEBPLUGIN_FILES=	libflashplayer.so
 
-CONFLICTS=	linux-flashplugin-9* linux-f8-flashplugin10* linux-f10-flashplugin10*
+OPTIONS_DEFINE=	ALSA GNOME
+OPTIONS_SUB=	yes
 
-OPTIONS_DEFINE=	GNOME
+ALSA_DESC=	ALSA audio output (broken, needs lemul)
+ALSA_RUN_DEPENDS?=	linux-${USE_LINUX}-alsa-lib>=1.0.22_2:${PORTSDIR}/audio/linux-f10-alsa-lib
+ALSA_DISTFILES_OFF=	linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
+ALSA_PLIST_SUB_OFF=	LINUXBASE="${LINUXBASE}" COMPATDIR="${LINUXBASE:H}"
+
 GNOME_DESC=	include gnome support for .desktop file
-
-OPTIONS_SUB=	yes
 GNOME_USES=	desktop-file-utils
 
+CPE_VENDOR=	adobe
+CPE_PRODUCT=	flash_player
+
 .include <bsd.mport.options.mk>
 
+.if ${PORT_OPTIONS:MALSA}
+USE_LINUX_APPS+=alsalib alsa-plugins-oss
+.else
+USE_LINUX_APPS+=	openssl
+.endif
+
 .if ${PORT_OPTIONS:MGNOME}
 INSTALLS_ICONS=	yes
 .endif
@@ -45,14 +56,15 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e '/^NotShowIn=KDE/d' ${WRKDIR}/usr/share/applications/flash-player-properties.desktop
 
-post-install:
-	@${INSTALL_PROGRAM} ${WRKDIR}/libflashsupport.so ${LINUXBASE}/usr/lib
-	@${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/flash-player-properties ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/share/applications/
-	@${INSTALL_DATA} ${WRKDIR}/usr/share/applications/flash-player-properties.desktop ${DESKTOPDIR}
-	@(cd ${WRKDIR}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${PREFIX}/share/icons)
-	- at update-desktop-database
+do-install:
+	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
+	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
+.if ! ${PORT_OPTIONS:MALSA}
+	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib
+	${INSTALL_LIB} ${WRKDIR}/libflashsupport.so ${STAGEDIR}${LINUXBASE}/usr/lib
+.endif
+	${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)
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/linux-mplayer-plugin/Makefile.npapi"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/www/linux-f10-flashplugin11/distinfo
===================================================================
--- trunk/www/linux-f10-flashplugin11/distinfo	2015-08-08 00:14:00 UTC (rev 19679)
+++ trunk/www/linux-f10-flashplugin11/distinfo	2015-08-08 00:32:59 UTC (rev 19680)
@@ -1,4 +1,4 @@
-SHA256 (flashplugin/11.2r202.346/install_flash_player_11_linux.i386.tar.gz) = 2a27d40ae597965c73b40ed5eceaf5918fc0b62e48088c5d2e1664e09bfac405
-SIZE (flashplugin/11.2r202.346/install_flash_player_11_linux.i386.tar.gz) = 6924402
-SHA256 (flashplugin/11.2r202.346/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
-SIZE (flashplugin/11.2r202.346/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
+SHA256 (flashplugin/11.2r202.491/install_flash_player_11_linux.i386.tar.gz) = be3f277fe1a15e4b082938019b4e0f9fac4336b460b2eb08d8f22bf90c718e53
+SIZE (flashplugin/11.2r202.491/install_flash_player_11_linux.i386.tar.gz) = 6942060
+SHA256 (flashplugin/11.2r202.491/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
+SIZE (flashplugin/11.2r202.491/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455

Modified: trunk/www/linux-f10-flashplugin11/pkg-plist
===================================================================
--- trunk/www/linux-f10-flashplugin11/pkg-plist	2015-08-08 00:14:00 UTC (rev 19679)
+++ trunk/www/linux-f10-flashplugin11/pkg-plist	2015-08-08 00:32:59 UTC (rev 19680)
@@ -1,4 +1,9 @@
 bin/flash-player-properties
+lib/browser_plugins/linux-f10-flashplugin/libflashplayer.so
+%%NO_ALSA%%@dir %%LINUXBASE%%/usr/lib
+%%NO_ALSA%%@dir %%LINUXBASE%%/usr
+%%NO_ALSA%%@dir %%LINUXBASE%%
+%%NO_ALSA%%@dir %%COMPATDIR%%
 share/applications/flash-player-properties.desktop
 share/icons/hicolor/16x16/apps/flash-player-properties.png
 share/icons/hicolor/22x22/apps/flash-player-properties.png
@@ -5,21 +10,8 @@
 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
- at dirrmtry share/icons/hicolor/16x16/apps
- at dirrmtry share/icons/hicolor/22x22/apps
- at dirrmtry share/icons/hicolor/24x24/apps
- at dirrmtry share/icons/hicolor/32x32/apps
- at dirrmtry share/icons/hicolor/48x48/apps
- at dirrmtry share/icons/hicolor/16x16
- at dirrmtry share/icons/hicolor/22x22
- at dirrmtry share/icons/hicolor/24x24
- at dirrmtry share/icons/hicolor/32x32
- at dirrmtry share/icons/hicolor/48x48
- at dirrmtry share/icons/hicolor
- at dirrmtry share/icons
- at dirrmtry share/applications
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null 2>&1 || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null 2>&1 || /usr/bin/true
 @cwd /compat/linux
-usr/lib/libflashsupport.so
+%%NO_ALSA%%usr/lib/libflashsupport.so
 @cwd

