Index: branches/2015Q4/www/linux-c6-flashplugin11/Makefile
===================================================================
--- branches/2015Q4/www/linux-c6-flashplugin11/Makefile	(revision 401617)
+++ branches/2015Q4/www/linux-c6-flashplugin11/Makefile	(revision 401618)
@@ -1,77 +1,77 @@
 # Created by: Artyom Mirgorodskiy <artyom.mirgorodsky@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	flashplugin
-PORTVERSION=	11.2r202.540
+PORTVERSION=	11.2r202.548
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \
 		LOCAL/nox:suplib
 PKGNAMEPREFIX=	linux-${USE_LINUX}-
 DISTFILES=	install_flash_player_11_linux.i386.tar.gz:plugin
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Adobe Flash Player NPAPI Plugin
 
 ONLY_FOR_ARCHS=	amd64 i386
 USE_LINUX?=	c6
 USE_LINUX_APPS?=	curl cyrus-sasl2 gdkpixbuf2 gtk2 nspr nss # libssh2 openldap
 WANT_GNOME=	yes
 
 DISTINFO_FILE?=	${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
 PLIST?=		${MASTERDIR}/pkg-plist.${LINUX_RPM_ARCH}
 
 RESTRICTED=	Redistribution not allowed
 RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 USES=		webplugin:linux desktop-file-utils cpe
 WEBPLUGIN_FILES=	libflashplayer.so
 
 OPTIONS_DEFINE=	ALSA GNOME
 OPTIONS_SUB=	yes
 
 ALSA_DESC=	ALSA audio output (broken, needs lemul)
 ALSA_RUN_DEPENDS?=	linux-${USE_LINUX}-alsa-lib>=1.0.22_2:${PORTSDIR}/audio/linux-c6-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
 GNOME_USES=	desktop-file-utils
 
 CPE_VENDOR=	adobe
 CPE_PRODUCT=	flash_player
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MALSA}
 USE_LINUX_APPS+=alsalib alsa-plugins-oss
 .else
 .if ${USE_LINUX} == "f10"
 USE_LINUX_APPS+=	openssl
 .else
 USE_LINUX_APPS+=	openssl-compat
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MGNOME}
 INSTALLS_ICONS=	yes
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e '/^NotShowIn=KDE/d' ${WRKDIR}/usr/share/applications/flash-player-properties.desktop
 
 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.mk>
Index: branches/2015Q4/www/linux-c6-flashplugin11/distinfo.i686
===================================================================
--- branches/2015Q4/www/linux-c6-flashplugin11/distinfo.i686	(revision 401617)
+++ branches/2015Q4/www/linux-c6-flashplugin11/distinfo.i686	(revision 401618)
@@ -1,4 +1,4 @@
-SHA256 (flashplugin/11.2r202.540/install_flash_player_11_linux.i386.tar.gz) = 7e057c77d6da64d4c5d67fc0fe277980461c037475be433142439f225c9911d9
-SIZE (flashplugin/11.2r202.540/install_flash_player_11_linux.i386.tar.gz) = 6954096
-SHA256 (flashplugin/11.2r202.540/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
-SIZE (flashplugin/11.2r202.540/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
+SHA256 (flashplugin/11.2r202.548/install_flash_player_11_linux.i386.tar.gz) = 88efdfbed760994383a815c78c8c2d5eaad2abc56557f54bd15f167c0b291294
+SIZE (flashplugin/11.2r202.548/install_flash_player_11_linux.i386.tar.gz) = 6955598
+SHA256 (flashplugin/11.2r202.548/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
+SIZE (flashplugin/11.2r202.548/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
Index: branches/2015Q4/www/linux-c6-flashplugin11/distinfo.x86_64
===================================================================
--- branches/2015Q4/www/linux-c6-flashplugin11/distinfo.x86_64	(revision 401617)
+++ branches/2015Q4/www/linux-c6-flashplugin11/distinfo.x86_64	(revision 401618)
@@ -1,4 +1,4 @@
-SHA256 (flashplugin/11.2r202.540/install_flash_player_11_linux.i386.tar.gz) = 7e057c77d6da64d4c5d67fc0fe277980461c037475be433142439f225c9911d9
-SIZE (flashplugin/11.2r202.540/install_flash_player_11_linux.i386.tar.gz) = 6954096
-SHA256 (flashplugin/11.2r202.540/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
-SIZE (flashplugin/11.2r202.540/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
+SHA256 (flashplugin/11.2r202.548/install_flash_player_11_linux.i386.tar.gz) = 88efdfbed760994383a815c78c8c2d5eaad2abc56557f54bd15f167c0b291294
+SIZE (flashplugin/11.2r202.548/install_flash_player_11_linux.i386.tar.gz) = 6955598
+SHA256 (flashplugin/11.2r202.548/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
+SIZE (flashplugin/11.2r202.548/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
Index: branches/2015Q4
===================================================================
--- branches/2015Q4	(revision 401617)
+++ branches/2015Q4	(revision 401618)

Property changes on: branches/2015Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r401614