Date: Fri, 14 Jun 2013 19:10:11 +0000 (UTC) From: Eitan Adler <eadler@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320959 - head/www/linux-f10-flashplugin11 Message-ID: <201306141910.r5EJABhq037968@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eadler Date: Fri Jun 14 19:10:11 2013 New Revision: 320959 URL: http://svnweb.freebsd.org/changeset/ports/320959 Log: Modernize linux-f10-flashplugin11 Reviewed by: ak Modified: head/www/linux-f10-flashplugin11/Makefile head/www/linux-f10-flashplugin11/pkg-plist Modified: head/www/linux-f10-flashplugin11/Makefile ============================================================================== --- head/www/linux-f10-flashplugin11/Makefile Fri Jun 14 18:11:55 2013 (r320958) +++ head/www/linux-f10-flashplugin11/Makefile Fri Jun 14 19:10:11 2013 (r320959) @@ -35,14 +35,13 @@ CONFLICTS= linux-flashplugin-9* linux-f8 OPTIONS_DEFINE= GNOME GNOME_DESC= include gnome support for .desktop file -.include <bsd.port.pre.mk> +OPTIONS_SUB= yes +GNOME_USES= desktop-file-utils + +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGNOME} INSTALLS_ICONS= yes -USE_GNOME= desktopfileutils -PLIST_SUB+= GNOME="" -.else -PLIST_SUB+= GNOME="@comment " .endif post-patch: @@ -54,9 +53,7 @@ post-install: @${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) -.if ${PORT_OPTIONS:MGNOME} - @update-desktop-database -.endif +.include <bsd.port.pre.mk> .include "${PORTSDIR}/www/linux-mplayer-plugin/Makefile.npapi" .include <bsd.port.post.mk> Modified: head/www/linux-f10-flashplugin11/pkg-plist ============================================================================== --- head/www/linux-f10-flashplugin11/pkg-plist Fri Jun 14 18:11:55 2013 (r320958) +++ head/www/linux-f10-flashplugin11/pkg-plist Fri Jun 14 19:10:11 2013 (r320959) @@ -19,8 +19,6 @@ share/icons/hicolor/48x48/apps/flash-pla @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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306141910.r5EJABhq037968>