aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2013-06-15 03:10:11 +0800
committereadler <eadler@FreeBSD.org>2013-06-15 03:10:11 +0800
commit20ba126348e7d42058f77fbabf581dbed9daadc7 (patch)
tree38356f73f995c8ec2808c77344d9a7d2d6a81667 /www
parentc4b5123c3a5c1e2e351ef53bf98e0d231f811c8e (diff)
downloadfreebsd-ports-gnome-20ba126348e7d42058f77fbabf581dbed9daadc7.tar.gz
freebsd-ports-gnome-20ba126348e7d42058f77fbabf581dbed9daadc7.tar.zst
freebsd-ports-gnome-20ba126348e7d42058f77fbabf581dbed9daadc7.zip
Modernize linux-f10-flashplugin11
Reviewed by: ak
Diffstat (limited to 'www')
-rw-r--r--www/linux-f10-flashplugin11/Makefile13
-rw-r--r--www/linux-f10-flashplugin11/pkg-plist2
2 files changed, 5 insertions, 10 deletions
diff --git a/www/linux-f10-flashplugin11/Makefile b/www/linux-f10-flashplugin11/Makefile
index 212719553949..1085cc32bb44 100644
--- a/www/linux-f10-flashplugin11/Makefile
+++ b/www/linux-f10-flashplugin11/Makefile
@@ -35,14 +35,13 @@ CONFLICTS= linux-flashplugin-9* linux-f8-flashplugin10* linux-f10-flashplugin10*
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>
diff --git a/www/linux-f10-flashplugin11/pkg-plist b/www/linux-f10-flashplugin11/pkg-plist
index 1c7db63c088d..9a8a7b098350 100644
--- a/www/linux-f10-flashplugin11/pkg-plist
+++ b/www/linux-f10-flashplugin11/pkg-plist
@@ -19,8 +19,6 @@ 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