Update to 10.3r181.14 .

PR:		ports/156996
Submitted by:	Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
Security:	http://www.freebsd.org/ports/portaudit/d226626c-857f-11e0-95cc-001b2134ef46.html

6 files changed, 68 insertions, 10 deletions

diff --git a/www/linux-f10-flashplugin10/Makefile b/www/linux-f10-flashplugin10/Makefile
index 9c8d8a553cfc..22f4789a8a60 100644
--- a/www/linux-f10-flashplugin10/Makefile
+++ b/www/linux-f10-flashplugin10/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	flashplugin
-PORTVERSION=	10.2r159.1
+PORTVERSION=	10.3r181.14
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/current/:plugin \
 		ftp://ftp.ipt.ru/pub/download/:suplib
@@ -22,6 +22,8 @@ COMMENT=	Adobe Flash Player NPAPI Plugin
 ONLY_FOR_ARCHS=	amd64 i386
 USE_LINUX=	yes
 USE_LINUX_APPS=	openssl curl cyrus-sasl2 libssh2 nspr nss openldap gtk2
+USE_GNOME=	desktopfileutils
+INSTALLS_ICONS=	yes
 
 RESTRICTED=	Redistribution not allowed
 RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
@@ -34,8 +36,15 @@ NPAPI_FILES=	libflashplayer.so
 
 CONFLICTS=	linux-flashplugin-7* linux-flashplugin-9* linux-f8-flashplugin10-*
 
+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
+	@${INSTALL_DATA} ${WRKDIR}/usr/share/applications/flash-player-properties.desktop ${DESKTOPDIR}
+	@(cd ${WRKDIR}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${PREFIX}/share/icons)
+	-@update-desktop-database
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/linux-mplayer-plugin/Makefile.npapi"
diff --git a/www/linux-f10-flashplugin10/distinfo b/www/linux-f10-flashplugin10/distinfo
index a93000320ab5..f96e689f5586 100644
--- a/www/linux-f10-flashplugin10/distinfo
+++ b/www/linux-f10-flashplugin10/distinfo
@@ -1,4 +1,4 @@
-SHA256 (flashplugin/10.2r159.1/install_flash_player_10_linux.tar.gz) = e6844572fad1cef47dfa8afea6a6cf1e1191fde30041947d5beab1445e0ed742
-SIZE (flashplugin/10.2r159.1/install_flash_player_10_linux.tar.gz) = 4967668
-SHA256 (flashplugin/10.2r159.1/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
-SIZE (flashplugin/10.2r159.1/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
+SHA256 (flashplugin/10.3r181.14/install_flash_player_10_linux.tar.gz) = 2eaab07a2d066a436a9f8ff9b84e3cc89a969f032d6d9cf94cd81f285e115003
+SIZE (flashplugin/10.3r181.14/install_flash_player_10_linux.tar.gz) = 5456725
+SHA256 (flashplugin/10.3r181.14/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
+SIZE (flashplugin/10.3r181.14/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
diff --git a/www/linux-f10-flashplugin10/pkg-plist b/www/linux-f10-flashplugin10/pkg-plist
index 44fc357a02f7..b5c2f8061c21 100644
--- a/www/linux-f10-flashplugin10/pkg-plist
+++ b/www/linux-f10-flashplugin10/pkg-plist
@@ -1,3 +1,23 @@
+bin/flash-player-properties
+share/applications/flash-player-properties.desktop
+share/icons/hicolor/16x16/apps/flash-player-properties.png
+share/icons/hicolor/22x22/apps/flash-player-properties.png
+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
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/applications
 @cwd /compat/linux
 usr/lib/libflashsupport.so
 @cwd
diff --git a/www/linux-f10-flashplugin11/Makefile b/www/linux-f10-flashplugin11/Makefile
index 9c8d8a553cfc..22f4789a8a60 100644
--- a/www/linux-f10-flashplugin11/Makefile
+++ b/www/linux-f10-flashplugin11/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	flashplugin
-PORTVERSION=	10.2r159.1
+PORTVERSION=	10.3r181.14
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/current/:plugin \
 		ftp://ftp.ipt.ru/pub/download/:suplib
@@ -22,6 +22,8 @@ COMMENT=	Adobe Flash Player NPAPI Plugin
 ONLY_FOR_ARCHS=	amd64 i386
 USE_LINUX=	yes
 USE_LINUX_APPS=	openssl curl cyrus-sasl2 libssh2 nspr nss openldap gtk2
+USE_GNOME=	desktopfileutils
+INSTALLS_ICONS=	yes
 
 RESTRICTED=	Redistribution not allowed
 RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
@@ -34,8 +36,15 @@ NPAPI_FILES=	libflashplayer.so
 
 CONFLICTS=	linux-flashplugin-7* linux-flashplugin-9* linux-f8-flashplugin10-*
 
+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
+	@${INSTALL_DATA} ${WRKDIR}/usr/share/applications/flash-player-properties.desktop ${DESKTOPDIR}
+	@(cd ${WRKDIR}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${PREFIX}/share/icons)
+	-@update-desktop-database
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/linux-mplayer-plugin/Makefile.npapi"
diff --git a/www/linux-f10-flashplugin11/distinfo b/www/linux-f10-flashplugin11/distinfo
index a93000320ab5..f96e689f5586 100644
--- a/www/linux-f10-flashplugin11/distinfo
+++ b/www/linux-f10-flashplugin11/distinfo
@@ -1,4 +1,4 @@
-SHA256 (flashplugin/10.2r159.1/install_flash_player_10_linux.tar.gz) = e6844572fad1cef47dfa8afea6a6cf1e1191fde30041947d5beab1445e0ed742
-SIZE (flashplugin/10.2r159.1/install_flash_player_10_linux.tar.gz) = 4967668
-SHA256 (flashplugin/10.2r159.1/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
-SIZE (flashplugin/10.2r159.1/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
+SHA256 (flashplugin/10.3r181.14/install_flash_player_10_linux.tar.gz) = 2eaab07a2d066a436a9f8ff9b84e3cc89a969f032d6d9cf94cd81f285e115003
+SIZE (flashplugin/10.3r181.14/install_flash_player_10_linux.tar.gz) = 5456725
+SHA256 (flashplugin/10.3r181.14/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
+SIZE (flashplugin/10.3r181.14/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
diff --git a/www/linux-f10-flashplugin11/pkg-plist b/www/linux-f10-flashplugin11/pkg-plist
index 44fc357a02f7..b5c2f8061c21 100644
--- a/www/linux-f10-flashplugin11/pkg-plist
+++ b/www/linux-f10-flashplugin11/pkg-plist
@@ -1,3 +1,23 @@
+bin/flash-player-properties
+share/applications/flash-player-properties.desktop
+share/icons/hicolor/16x16/apps/flash-player-properties.png
+share/icons/hicolor/22x22/apps/flash-player-properties.png
+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
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/applications
 @cwd /compat/linux
 usr/lib/libflashsupport.so
 @cwd