Index: branches/2017Q2/www/linux-flashplayer/Makefile
===================================================================
--- branches/2017Q2/www/linux-flashplayer/Makefile	(revision 443878)
+++ branches/2017Q2/www/linux-flashplayer/Makefile	(revision 443879)
@@ -1,39 +1,39 @@
 # Created by: Artyom Mirgorodskiy <artyom.mirgorodsky@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	flashplayer
-PORTVERSION=	25.0.0.171
+PORTVERSION=	26.0.0.126
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/
 PKGNAMEPREFIX=	linux-
 DISTFILES=	flash_player_npapi_linux.i386.tar.gz
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Adobe Flash Player NPAPI Plugin
 
 ONLY_FOR_ARCHS=	amd64 i386
 USES=		cpe linux webplugin:linux
 CPE_VENDOR=	adobe
 CPE_PRODUCT=	flash_player
 USE_LINUX=	alsalib alsa-plugins-oss curl dri gtk2 nspr nss
 WEBPLUGIN_FILES=libflashplayer.so
 
 RESTRICTED=	Redistribution not allowed
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 STRIP=
 
 post-patch:
 	@${REINPLACE_CMD} '/^NotShowIn=KDE/d' \
 		${WRKSRC}/usr/share/applications/flash-player-properties.desktop
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
 	${INSTALL_LIB} ${WRKSRC}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
 	${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)
 
 .include <bsd.port.mk>
Index: branches/2017Q2/www/linux-flashplayer/distinfo
===================================================================
--- branches/2017Q2/www/linux-flashplayer/distinfo	(revision 443878)
+++ branches/2017Q2/www/linux-flashplayer/distinfo	(revision 443879)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494740685
-SHA256 (flashplayer/25.0.0.171/flash_player_npapi_linux.i386.tar.gz) = 83395b43da1689104e569006c2a75d159d6b12f4c07d0d8e4e05e70b233662f4
-SIZE (flashplayer/25.0.0.171/flash_player_npapi_linux.i386.tar.gz) = 8488318
+TIMESTAMP = 1497548309
+SHA256 (flashplayer/26.0.0.126/flash_player_npapi_linux.i386.tar.gz) = da0ebfb4cfedb0c684a312be758e142801d32ca2ba610a55656aa9462d2fc1de
+SIZE (flashplayer/26.0.0.126/flash_player_npapi_linux.i386.tar.gz) = 8490374
Index: branches/2017Q2
===================================================================
--- branches/2017Q2	(revision 443878)
+++ branches/2017Q2	(revision 443879)

Property changes on: branches/2017Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r443622