- 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)

12 files changed, 0 insertions, 15 deletions

diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index ad66a5d9a8ce..fb31107ea03a 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -294,9 +294,6 @@ pre-install:
 	@${ECHO_CMD} "@dirrm %%DATADIR%%/sdk" >> ${PLIST}
 	@${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST}
 
-	@${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
-	@${ECHO_CMD} "@dirrmtry share/applications" >> ${PLIST}
-
 do-install:
 	@${MKDIR} ${DATADIR}/plugins
 	@${MKDIR} ${DATADIR}/plugins/wcx
@@ -380,7 +377,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DATADIR}
 .endfor
 
-	@${MKDIR} ${PREFIX}/share/pixmaps
 .for FILE in doublecmd.png install/linux/doublecmd.xpm
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/share/pixmaps/
 .endfor
diff --git a/x11-fm/emelfm2/pkg-plist b/x11-fm/emelfm2/pkg-plist
index 9e968ee7584d..cd60efb1691b 100644
--- a/x11-fm/emelfm2/pkg-plist
+++ b/x11-fm/emelfm2/pkg-plist
@@ -103,6 +103,5 @@ share/pixmaps/emelfm2/user_commands_48.png
 share/pixmaps/emelfm2/view_48.png
 @dirrm share/pixmaps/emelfm2
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
 @dirrm lib/emelfm2/plugins
 @dirrm lib/emelfm2
diff --git a/x11-fm/gnome-commander2/pkg-plist b/x11-fm/gnome-commander2/pkg-plist
index 4abdf08a0cbb..086dc9ca23b5 100644
--- a/x11-fm/gnome-commander2/pkg-plist
+++ b/x11-fm/gnome-commander2/pkg-plist
@@ -242,7 +242,6 @@ share/pixmaps/gnome-commander/toggle_horizontal.xpm
 share/pixmaps/gnome-commander/toggle_vertical.xpm
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
-@dirrmtry share/applications
 @dirrm share/pixmaps/gnome-commander/mime-icons
 @dirrm share/pixmaps/gnome-commander/file-type-icons
 @dirrm share/pixmaps/gnome-commander/device-icons
diff --git a/x11-fm/gprename/pkg-plist b/x11-fm/gprename/pkg-plist
index fd72ca0a0d28..8d7cf3543ee5 100644
--- a/x11-fm/gprename/pkg-plist
+++ b/x11-fm/gprename/pkg-plist
@@ -21,4 +21,3 @@ share/pixmaps/gprename/gprename_debian_menu_icon.xpm
 share/pixmaps/gprename/gprename_nautilus-action.png
 @dirrm share/pixmaps/gprename
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 266e5ff302de..51348151c4b3 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -232,7 +232,6 @@ share/pixmaps/nautilus/thumbnail_frame.png
 @dirrmtry %%DATADIR%%/icons/hicolor
 @dirrmtry %%DATADIR%%/icons
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
 @exec /bin/mkdir -p %D/lib/nautilus/extensions-2.0
 @dirrmtry lib/nautilus/extensions-2.0
 @dirrmtry lib/nautilus
diff --git a/x11-fm/pcmanfm/pkg-plist b/x11-fm/pcmanfm/pkg-plist
index ba02f145115d..f3aa2d4ed5b6 100644
--- a/x11-fm/pcmanfm/pkg-plist
+++ b/x11-fm/pcmanfm/pkg-plist
@@ -64,7 +64,6 @@ share/applications/pcmanfm.desktop
 %%DATADIR%%/ui/pref.ui
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
 @dirrmtry etc/xdg/pcmanfm/default
 @dirrmtry etc/xdg/pcmanfm
 @dirrmtry etc/xdg
diff --git a/x11-fm/qtfm/pkg-plist b/x11-fm/qtfm/pkg-plist
index 1a2b15250fb8..18b9e509ad63 100644
--- a/x11-fm/qtfm/pkg-plist
+++ b/x11-fm/qtfm/pkg-plist
@@ -13,4 +13,3 @@ share/pixmaps/qtfm.png
 %%DATADIR%%/qtfm_zh.qm
 %%DATADIR%%/qtfm_zh_TW.qm
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/x11-fm/rodent/pkg-plist b/x11-fm/rodent/pkg-plist
index bf9fb85e2867..6e317fd194c6 100644
--- a/x11-fm/rodent/pkg-plist
+++ b/x11-fm/rodent/pkg-plist
@@ -933,7 +933,6 @@ share/rfm/modules/mime-module.xml
 @dirrm share/icons/Rodent/48x48/apps
 @dirrm share/icons/Rodent/48x48
 @dirrm share/icons/Rodent
-@dirrmtry share/applications
 @dirrmtry share/icons
 @dirrmtry share/pixmaps
 @dirrm lib/rfm/plugins
diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index 8ac82d9ac700..f686b0dfdeb9 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -59,7 +59,6 @@ do-install:
 		ROX-Session.xml RunROX SetupPanel Styles browser images \
 		*.py *.pyc *.pyo ${DATADIR}
 .if ${PORT_OPTIONS:MGDM}
-	@${MKDIR} ${PREFIX}/share/applications
 	@${INSTALL_DATA} ${WRKDIR}/rox.desktop ${PREFIX}/share/applications
 .endif
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/x11-fm/worker/pkg-plist b/x11-fm/worker/pkg-plist
index 997f9d2613d5..19f8471e4d23 100644
--- a/x11-fm/worker/pkg-plist
+++ b/x11-fm/worker/pkg-plist
@@ -88,7 +88,6 @@ share/applications/worker.desktop
 %%DATADIR%%/scripts/displaywrapper_worker
 %%DATADIR%%/scripts/xeditor
 %%DATADIR%%/scripts/xliwrapper_worker
-@dirrmtry share/applications
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/catalogs
 @dirrm %%DATADIR%%
diff --git a/x11-fm/xfe/pkg-plist b/x11-fm/xfe/pkg-plist
index 328630fb207d..bed9c5237611 100644
--- a/x11-fm/xfe/pkg-plist
+++ b/x11-fm/xfe/pkg-plist
@@ -2838,4 +2838,3 @@ share/applications/xfp.desktop
 @dirrmtry share/locale/es_CO
 @dirrmtry share/locale/es_AR/LC_MESSAGES
 @dirrmtry share/locale/es_AR
-@dirrmtry share/applications
diff --git a/x11-fm/xnc/pkg-plist b/x11-fm/xnc/pkg-plist
index 671734947a6a..8345b052d433 100644
--- a/x11-fm/xnc/pkg-plist
+++ b/x11-fm/xnc/pkg-plist
@@ -50,6 +50,5 @@ share/doc/xnc/index.html
 @dirrmtry share/gnome
 @dirrmtry share/applnk/System
 @dirrmtry share/applnk
-@dirrmtry share/applications
 @dirrm share/doc/xnc
 @dirrm lib/xnc