3 files changed, 21 insertions, 8 deletions

diff --git a/www/linux-f10-flashplugin10/Makefile b/www/linux-f10-flashplugin10/Makefile
index 298ca4111303..eb9c22fed797 100644
--- a/www/linux-f10-flashplugin10/Makefile
+++ b/www/linux-f10-flashplugin10/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	flashplugin
-PORTVERSION=	10.3r183.7
+PORTVERSION=	10.3r183.10
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/current/:plugin \
 		ftp://ftp.ipt.ru/pub/download/:suplib
@@ -22,8 +22,7 @@ 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
+WANT_GNOME=	yes
 
 RESTRICTED=	Redistribution not allowed
 RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
@@ -36,16 +35,28 @@ NPAPI_FILES=	libflashplayer.so
 
 CONFLICTS=	linux-flashplugin-7* linux-flashplugin-9* linux-f8-flashplugin10-*
 
+OPTIONS=	GNOME "include gnome support for .desktop file" Off
+
+.include <bsd.port.pre.mk>
+
+.ifndef(WITHOUT_GNOME)
+INSTALLS_ICONS=	yes
+USE_GNOME=	desktopfileutils
+PLIST_SUB+=	GNOME=""
+.else
+PLIST_SUB+=	GNOME="@comment "
+.endif
+
 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)
 	-@update-desktop-database
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/linux-mplayer-plugin/Makefile.npapi"
 .include <bsd.port.post.mk>
diff --git a/www/linux-f10-flashplugin10/distinfo b/www/linux-f10-flashplugin10/distinfo
index 5968a72d159f..d49d51b01100 100644
--- a/www/linux-f10-flashplugin10/distinfo
+++ b/www/linux-f10-flashplugin10/distinfo
@@ -1,4 +1,4 @@
-SHA256 (flashplugin/10.3r183.7/install_flash_player_10_linux.tar.gz) = 465e018b9d6b85e74fa2625fe7acdc21954b5aab39f68e8cd77780561bbdd198
-SIZE (flashplugin/10.3r183.7/install_flash_player_10_linux.tar.gz) = 5459767
-SHA256 (flashplugin/10.3r183.7/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
-SIZE (flashplugin/10.3r183.7/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
+SHA256 (flashplugin/10.3r183.10/install_flash_player_10_linux.tar.gz) = dfd5bbf4689465cc56b0a883b8368a1c13be6bdd0d594fc81a0129055e0b453a
+SIZE (flashplugin/10.3r183.10/install_flash_player_10_linux.tar.gz) = 5459935
+SHA256 (flashplugin/10.3r183.10/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
+SIZE (flashplugin/10.3r183.10/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 b5c2f8061c21..c936fc9b9125 100644
--- a/www/linux-f10-flashplugin10/pkg-plist
+++ b/www/linux-f10-flashplugin10/pkg-plist
@@ -18,6 +18,8 @@ share/icons/hicolor/48x48/apps/flash-player-properties.png
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @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
 @cwd