- Remove manual creation and removal of share/applications, as it's now in the mtree (remaining categories)

- Add note on mtree change to CHANGES

Approved by:	portmgr (bdrewery)

28 files changed, 0 insertions, 31 deletions

diff --git a/www/arora/pkg-plist b/www/arora/pkg-plist
index 4432c0a7fe67..cbb2bfa80363 100644
--- a/www/arora/pkg-plist
+++ b/www/arora/pkg-plist
@@ -51,4 +51,3 @@ share/pixmaps/arora.xpm
 @dirrmtry share/icons
 %%NLS%%@dirrm share/arora/locale
 %%NLS%%@dirrm share/arora
-@dirrmtry share/applications
diff --git a/www/bluefish/pkg-plist b/www/bluefish/pkg-plist
index ded88f56ae7a..b8da9e790ab5 100644
--- a/www/bluefish/pkg-plist
+++ b/www/bluefish/pkg-plist
@@ -422,5 +422,4 @@ share/xml/bluefish/catalog.xml
 @dirrm %%DATADIR%%/bflib
 @dirrm %%DATADIR%%/bflang
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
 @dirrm lib/bluefish
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index 7a0bff268024..15692c1fac03 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -217,4 +217,3 @@ share/applications/chromium-browser.desktop
 @dirrm %%DATADIR%%/resources/extension
 @dirrm %%DATADIR%%/resources
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index fb1938e5f910..a9edb4fc91b3 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -400,7 +400,6 @@ share/omf/epiphany/epiphany-uk.omf
 @dirrm %%DATADIR%%/art
 @dirrmtry %%DATADIR%%
 @dirrmtry %%DOCSDIR%%
-@dirrmtry share/applications
 @dirrm include/epiphany/%%EPHY_VERSION%%/epiphany
 @dirrm include/epiphany/%%EPHY_VERSION%%
 @dirrm include/epiphany
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index c56ce158f129..81ed1e1de26a 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -63,11 +63,9 @@ pre-configure:
 
 port-pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
-	${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLISTF}
 
 post-install:
-	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/
 	${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default
 	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index ddad26a7d289..6601a86c7e1f 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -74,11 +74,9 @@ pre-configure:
 
 port-pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
-	${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLISTF}
 
 post-install:
-	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/
 	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/gnome-user-share/pkg-plist b/www/gnome-user-share/pkg-plist
index 609b8dd2395c..b79fe9e45770 100644
--- a/www/gnome-user-share/pkg-plist
+++ b/www/gnome-user-share/pkg-plist
@@ -183,7 +183,6 @@ share/omf/gnome-user-share/gnome-user-share-zh_CN.omf
 @dirrm share/gnome/help/gnome-user-share/C
 @dirrm share/gnome/help/gnome-user-share
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/ug/LC_MESSAGES
diff --git a/www/gurlchecker/pkg-plist b/www/gurlchecker/pkg-plist
index 503a491d651a..068b695c10ed 100644
--- a/www/gurlchecker/pkg-plist
+++ b/www/gurlchecker/pkg-plist
@@ -48,4 +48,3 @@ share/pixmaps/gurlchecker.png
 @dirrm share/gurlchecker/ui
 @dirrm share/gurlchecker/stylesheets
 @dirrm share/gurlchecker
-@dirrmtry share/applications
diff --git a/www/httrack/pkg-plist b/www/httrack/pkg-plist
index 1ad8c3630c7e..4a14fd77e0db 100644
--- a/www/httrack/pkg-plist
+++ b/www/httrack/pkg-plist
@@ -254,6 +254,5 @@ lib/libhttrack.so.2
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/div
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrmtry share/applications
 %%PORTDATA%%@dirrm lib/httrack
 @dirrm include/httrack
diff --git a/www/linkchecker/pkg-plist b/www/linkchecker/pkg-plist
index ced16b236656..c69ba58e81b6 100644
--- a/www/linkchecker/pkg-plist
+++ b/www/linkchecker/pkg-plist
@@ -413,7 +413,6 @@ share/icons/hicolor/64x64/apps/linkchecker.png
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry share/applications
 @dirrmtry man/de/man1
 @dirrmtry man/de
 @dirrmtry man/de/man5
diff --git a/www/linux-f10-flashplugin11/Makefile b/www/linux-f10-flashplugin11/Makefile
index c3bcea773bf3..c06103fbb1be 100644
--- a/www/linux-f10-flashplugin11/Makefile
+++ b/www/linux-f10-flashplugin11/Makefile
@@ -47,7 +47,6 @@ post-patch:
 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)
 
diff --git a/www/linux-f10-flashplugin11/pkg-plist b/www/linux-f10-flashplugin11/pkg-plist
index 9a8a7b098350..8b91f0a10c07 100644
--- a/www/linux-f10-flashplugin11/pkg-plist
+++ b/www/linux-f10-flashplugin11/pkg-plist
@@ -18,7 +18,6 @@ share/icons/hicolor/48x48/apps/flash-player-properties.png
 @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-firefox/pkg-plist b/www/linux-firefox/pkg-plist
index 40c79c61c362..beb35a7aa970 100644
--- a/www/linux-firefox/pkg-plist
+++ b/www/linux-firefox/pkg-plist
@@ -91,4 +91,3 @@ lib/%%APP_NAME%%/webapprt/webapprt.ini
 @dirrm lib/%%APP_NAME%%/icons
 @dirrm lib/%%APP_NAME%%/webapprt
 @dirrm lib/%%APP_NAME%%
-@dirrmtry share/applications
diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist
index 1bea7954c0f8..5e165e3d3224 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -444,7 +444,6 @@ share/mime/packages/linux-opera-next-widget.xml
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrm %%DOCSDIR%%
-@dirrmtry share/applications
 @dirrm lib/linux-opera-next/plugins
 @dirrm lib/linux-opera-next/gstreamer/plugins
 @dirrm lib/linux-opera-next/gstreamer
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index 0562df5a62dc..2bddb04c3511 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -456,7 +456,6 @@ share/mime/packages/linux-opera-widget.xml
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrm %%DOCSDIR%%
-@dirrmtry share/applications
 @dirrm lib/linux-opera/plugins
 @dirrm lib/linux-opera/gstreamer/plugins
 @dirrm lib/linux-opera/gstreamer
diff --git a/www/linux-seamonkey/Makefile.common b/www/linux-seamonkey/Makefile.common
index 1ec9c9f93d15..878ec0c7653c 100644
--- a/www/linux-seamonkey/Makefile.common
+++ b/www/linux-seamonkey/Makefile.common
@@ -116,7 +116,6 @@ create-plist: build
 		-depth 1 -type l -delete ${_Q}' >> ${PLIST}
 	cd ${WRKSRC} && ${FIND} -sd . -type d | \
 		${SED} -e "s#^\.#@dirrm lib/%%APP_NAME%%#" >> ${PLIST}
-	${ECHO_CMD} @dirrmtry share/applications >> ${PLIST}
 
 snatch-desktop:
 	${SED} -E -e 's/${PORTNAME}/${APP_NAME}/' \
diff --git a/www/linux-seamonkey/pkg-plist b/www/linux-seamonkey/pkg-plist
index 9a3f443866f5..b1e1d8169138 100644
--- a/www/linux-seamonkey/pkg-plist
+++ b/www/linux-seamonkey/pkg-plist
@@ -140,4 +140,3 @@ lib/%%APP_NAME%%/updater.ini
 @dirrm lib/%%APP_NAME%%/plugins
 @dirrm lib/%%APP_NAME%%/searchplugins
 @dirrm lib/%%APP_NAME%%
-@dirrmtry share/applications
diff --git a/www/luakit/pkg-plist b/www/luakit/pkg-plist
index b8a638042d8c..21106d0f3046 100644
--- a/www/luakit/pkg-plist
+++ b/www/luakit/pkg-plist
@@ -58,6 +58,5 @@ share/pixmaps/luakit.png
 @dirrm share/luakit/lib
 @dirrm share/luakit
 @dirrm share/doc/luakit
-@dirrmtry share/applications
 @dirrmtry etc/xdg/luakit
 @dirrmtry etc/xdg
diff --git a/www/opera-devel/pkg-plist b/www/opera-devel/pkg-plist
index e5eb6371e9da..6f5eb78475e9 100644
--- a/www/opera-devel/pkg-plist
+++ b/www/opera-devel/pkg-plist
@@ -449,7 +449,6 @@ share/mime/packages/opera-next-widget.xml
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrm %%DOCSDIR%%
-@dirrmtry share/applications
 @dirrm lib/opera-next/plugins
 @dirrm lib/opera-next/gstreamer/plugins
 @dirrm lib/opera-next/gstreamer
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index 881446f885c1..d6cda7f1e542 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -470,7 +470,6 @@ share/mime/packages/opera-extension.xml
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrm %%DOCSDIR%%
-@dirrmtry share/applications
 @dirrm lib/opera/pluginwrapper
 @dirrm lib/opera/plugins
 @dirrm lib/opera/gstreamer/plugins
diff --git a/www/qupzilla/pkg-plist b/www/qupzilla/pkg-plist
index 60d62fc37a0c..ca083a293606 100644
--- a/www/qupzilla/pkg-plist
+++ b/www/qupzilla/pkg-plist
@@ -275,4 +275,3 @@ share/qupzilla/themes/windows/windows.css
 @dirrmtry share/icons
 @dirrmtry share/bash-completion/completions
 @dirrmtry share/bash-completion
-@dirrmtry share/applications
diff --git a/www/rssowl/Makefile b/www/rssowl/Makefile
index 36493621732e..612f1d48aa5a 100644
--- a/www/rssowl/Makefile
+++ b/www/rssowl/Makefile
@@ -57,7 +57,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/rssowl ${PREFIX}/bin
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/rssowl.jar ${DATADIR}
-	${MKDIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/img/32x32.png ${PREFIX}/share/pixmaps/rssowl.png
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist
index 8c3d349f4e8c..51b40f7fc847 100644
--- a/www/screem/pkg-plist
+++ b/www/screem/pkg-plist
@@ -249,4 +249,3 @@ share/mime/packages/screem.xml
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/applications
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 184592f2e4d5..44cbb18b28c4 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -164,11 +164,9 @@ post-build:
 
 port-pre-install:
 	${ECHO_CMD} share/applications/${MOZILLA}.desktop >> ${PLIST}
-	${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD}
 	${ECHO_CMD} 'share/pixmaps/${MOZILLA}.png' >> ${PLIST}
 
 post-install:
-	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/
 	${LN} -sf ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png \
 		${PREFIX}/share/pixmaps/${MOZILLA}.png
diff --git a/www/syndigator/pkg-plist b/www/syndigator/pkg-plist
index 862159f14578..2da9e3b9f5ce 100644
--- a/www/syndigator/pkg-plist
+++ b/www/syndigator/pkg-plist
@@ -88,4 +88,3 @@ share/pixmaps/syndigator/trayicon.gif
 @dirrmtry %%SITE_PERL%%
 @dirrmtry lib/perl5/site_perl
 @dirrmtry lib/perl5
-@dirrmtry share/applications
diff --git a/www/xombrero/Makefile b/www/xombrero/Makefile
index 3afc6f4e4b66..9e625559d376 100644
--- a/www/xombrero/Makefile
+++ b/www/xombrero/Makefile
@@ -65,7 +65,6 @@ do-install:
 .for i in hsts-preload style.css tld-rules
 	${INSTALL_DATA}  ${WRKSRC}/${i} ${DATADIR}
 .endfor
-	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA}  ${WRKSRC}/xombrero.desktop ${PREFIX}/share/applications
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
diff --git a/www/xombrero/pkg-plist b/www/xombrero/pkg-plist
index 0d392b507394..014c3e6ad152 100644
--- a/www/xombrero/pkg-plist
+++ b/www/xombrero/pkg-plist
@@ -22,4 +22,3 @@ share/icons/hicolor/64x64/apps/xombreroicon64.png
 @dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-@dirrmtry share/applications
diff --git a/www/xpi-conkeror/pkg-plist b/www/xpi-conkeror/pkg-plist
index c4e242bb0d12..9c17e61ffad7 100644
--- a/www/xpi-conkeror/pkg-plist
+++ b/www/xpi-conkeror/pkg-plist
@@ -191,6 +191,5 @@ share/applications/conkeror.desktop
 @dirrm %%DATADIR%%/branding
 @dirrm %%DATADIR%%
 @dirrm libexec/conkeror
-@dirrmtry share/applications
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true