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

37 files changed, 0 insertions, 38 deletions

diff --git a/x11/alltray/pkg-plist b/x11/alltray/pkg-plist
index c17fd0f3e0f..e602ee8de86 100644
--- a/x11/alltray/pkg-plist
+++ b/x11/alltray/pkg-plist
@@ -4,4 +4,3 @@ lib/liballtray.so
 lib/liballtray.so.0
 share/applications/alltray.desktop
 share/pixmaps/alltray.png
-@dirrmtry share/applications
diff --git a/x11/avant-window-navigator/pkg-plist b/x11/avant-window-navigator/pkg-plist
index dcf2d1287b7..12f21623c22 100644
--- a/x11/avant-window-navigator/pkg-plist
+++ b/x11/avant-window-navigator/pkg-plist
@@ -188,6 +188,5 @@ share/locale/zh_TW/LC_MESSAGES/avant-window-navigator.mo
 @dirrm %%DATADIR%%/applets
 @dirrm %%DATADIR%%/active
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/awn
 @dirrm include/libawn
diff --git a/x11/deforaos-keyboard/pkg-plist b/x11/deforaos-keyboard/pkg-plist
index 093f92d10b3..1d466e2bc65 100644
--- a/x11/deforaos-keyboard/pkg-plist
+++ b/x11/deforaos-keyboard/pkg-plist
@@ -3,4 +3,3 @@ bin/keyboard
 include/Desktop/Keyboard.h
 share/applications/keyboard.desktop
 share/locale/fr/LC_MESSAGES/Keyboard.mo
-@dirrmtry share/applications
diff --git a/x11/evilvte/pkg-plist b/x11/evilvte/pkg-plist
index a57d5253d64..7d352a2f57b 100644
--- a/x11/evilvte/pkg-plist
+++ b/x11/evilvte/pkg-plist
@@ -15,7 +15,6 @@ share/icons/hicolor/72x72/apps/evilvte.png
 share/icons/hicolor/96x96/apps/evilvte.png
 share/icons/hicolor/scalable/apps/evilvte.svg
 share/gnome-control-center/default-apps/evilvte.xml
-@dirrmtry share/applications
 @dirrmtry share/pixmaps
 @dirrmtry share/icons/hicolor/20x20/apps
 @dirrmtry share/icons/hicolor/20x20
diff --git a/x11/florence/pkg-plist b/x11/florence/pkg-plist
index 03f0d761152..a9914463a16 100644
--- a/x11/florence/pkg-plist
+++ b/x11/florence/pkg-plist
@@ -181,4 +181,3 @@ share/pixmaps/florence.svg
 @dirrm %%DATADIR%%/relaxng
 @dirrm %%DATADIR%%/layouts
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/x11/gcb/Makefile b/x11/gcb/Makefile
index 263f5700fcc..8c9b036ffeb 100644
--- a/x11/gcb/Makefile
+++ b/x11/gcb/Makefile
@@ -27,10 +27,8 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/icons
-	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop \
 		${PREFIX}/share/applications
-	${MKDIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/x11/gcb/pkg-plist b/x11/gcb/pkg-plist
index ac3ea91ade9..954eac12a98 100644
--- a/x11/gcb/pkg-plist
+++ b/x11/gcb/pkg-plist
@@ -3,4 +3,3 @@ share/applications/gcb.desktop
 share/icons/gcb.png
 share/pixmaps/gcb.png
 @dirrmtry share/icons
-@dirrmtry share/applications
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 5e9dc85e77d..5bbd4786678 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -357,7 +357,6 @@ share/pixmaps/vnterm.xpm
 @dirrm share/gnome/help/fdl/ca
 @dirrm share/gnome/help/fdl/ar
 @dirrm share/gnome-about/headers
-@dirrmtry share/applications
 @dirrm include/gnome-desktop-2.0/libgnomeui
 @dirrm include/gnome-desktop-2.0/libgnome
 @dirrm include/gnome-desktop-2.0
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 2bffc2fccff..54e27514795 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -549,7 +549,6 @@ share/omf/fish/fish-zh_CN.omf
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/applets
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
 @dirrmtry lib/gnome-panel/modules
 @dirrmtry lib/gnome-panel
 @dirrm include/gnome-panel-3.0/libpanel-applet
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index 4333ecdb345..37a47c3b6d1 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -115,7 +115,6 @@ share/pixmaps/gnome-logo-white.svg
 @dirrm share/backgrounds/cosmos
 @dirrmtry share/backgrounds
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
 @dirrm libexec/gnome-screensaver
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index bacb06aac33..a751163aac2 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -116,7 +116,6 @@ share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
 share/xsessions/gnome.desktop
 @dirrmtry share/xsessions
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index ec21cc0a595..b4c27d22593 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -233,7 +233,6 @@ share/omf/gnome-terminal/gnome-terminal-zh_TW.omf
 @dirrm share/gnome/help/gnome-terminal/C
 @dirrm share/gnome/help/gnome-terminal
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
diff --git a/x11/gsynaptics/pkg-plist b/x11/gsynaptics/pkg-plist
index 6042d508ab7..362e9a00ce5 100644
--- a/x11/gsynaptics/pkg-plist
+++ b/x11/gsynaptics/pkg-plist
@@ -20,4 +20,3 @@ share/pixmaps/touchpad.png
 @dirrm %%DATADIR%%
 @dirrm share/gnome/help/gsynaptics/C
 @dirrm share/gnome/help/gsynaptics
-@dirrmtry share/applications
diff --git a/x11/gtstarter/pkg-plist b/x11/gtstarter/pkg-plist
index 2d60f028675..cb8c1c8f11e 100644
--- a/x11/gtstarter/pkg-plist
+++ b/x11/gtstarter/pkg-plist
@@ -7,4 +7,3 @@ libexec/gtstarter/gtstarter
 libdata/bonobo/servers/GTStarterApplet.server
 share/applications/gtstarter.desktop
 @dirrm libexec/gtstarter
-@dirrmtry share/applications
diff --git a/x11/hotwire-shell/pkg-plist b/x11/hotwire-shell/pkg-plist
index 44111b2b3e2..b4d586b399e 100644
--- a/x11/hotwire-shell/pkg-plist
+++ b/x11/hotwire-shell/pkg-plist
@@ -426,7 +426,6 @@ share/icons/hicolor/24x24/apps/hotwire.png
 @dirrmtry share/icons/hicolor/24x24
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-@dirrmtry share/applications
 @dirrm share/hotwire/images
 @dirrm share/hotwire
 @dirrm %%PYTHON_SITELIBDIR%%/hotwire_ui/renderers
diff --git a/x11/keyboardcast/pkg-plist b/x11/keyboardcast/pkg-plist
index 1b8f98a2db8..b4bd4cfe9de 100644
--- a/x11/keyboardcast/pkg-plist
+++ b/x11/keyboardcast/pkg-plist
@@ -1,5 +1,4 @@
 bin/keyboardcast
 share/applications/keyboardcast.desktop
 %%DATADIR%%/keyboardcast.glade
-@dirrmtry share/applications
 @dirrm %%DATADIR%%
diff --git a/x11/libfm/pkg-plist b/x11/libfm/pkg-plist
index b10e9688275..9c4dff47410 100644
--- a/x11/libfm/pkg-plist
+++ b/x11/libfm/pkg-plist
@@ -154,7 +154,6 @@ share/mime/packages/libfm.xml
 %%NLS%%@dirrmtry share/locale/lg
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
 @dirrm include/libfm-1.0
 @dirrmtry etc/xdg/libfm
 @dirrmtry etc/xdg
diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist
index 35a4af6da56..094f291da78 100644
--- a/x11/libgnomekbd/pkg-plist
+++ b/x11/libgnomekbd/pkg-plist
@@ -91,7 +91,6 @@ share/locale/zh_HK/LC_MESSAGES/libgnomekbd.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
 @dirrm include/libgnomekbd
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
diff --git a/x11/libxfce4menu/pkg-plist b/x11/libxfce4menu/pkg-plist
index 18c9f40af33..d250c19ecb5 100644
--- a/x11/libxfce4menu/pkg-plist
+++ b/x11/libxfce4menu/pkg-plist
@@ -116,7 +116,6 @@ share/icons/hicolor/48x48/apps/xfce4-logo.png
 %%APIDOCS%%@dirrm share/gtk-doc/html/libxfce4ui
 %%APIDOCS%%@dirrmtry share/gtk-doc/html
 %%APIDOCS%%@dirrmtry share/gtk-doc
-@dirrmtry share/applications
 @dirrm include/xfce4/libxfce4ui-1/libxfce4ui
 @dirrm include/xfce4/libxfce4ui-1
 @dirrm include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private
diff --git a/x11/lxrandr/pkg-plist b/x11/lxrandr/pkg-plist
index bd312a2fa17..95aece7c4e5 100644
--- a/x11/lxrandr/pkg-plist
+++ b/x11/lxrandr/pkg-plist
@@ -68,4 +68,3 @@ share/applications/lxrandr.desktop
 %%NLS%%@dirrmtry share/locale/frp
 %%NLS%%@dirrmtry share/locale/es_VE/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/es_VE
-@dirrmtry share/applications
diff --git a/x11/metisse/pkg-plist b/x11/metisse/pkg-plist
index e51c80721ee..c3493d9708e 100644
--- a/x11/metisse/pkg-plist
+++ b/x11/metisse/pkg-plist
@@ -78,7 +78,6 @@ libexec/fvwm-insitu/2.5.20/FvwmWindowMenu
 share/applications/fvwmi.desktop
 share/applications/mini-fvwmi.desktop
 share/applications/opale.desktop
-@dirrmtry share/applications
 %%DOCSDIR%%/docs/building.html
 %%DOCSDIR%%/docs/metisse-architecture.png
 %%DOCSDIR%%/docs/running.html
diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index 9360596e0d6..47435e4af1a 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -123,7 +123,6 @@ CONFIGURE_ARGS+=	--with-tab-radius=${TAB_RADIUS:M[0-9]*}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mrxvt ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/pixmaps
 	@for pixmap in ${WRKSRC}/share/pixmaps/* ; \
 	do ${INSTALL_DATA} $$pixmap ${PREFIX}/share/pixmaps/ ; \
 	done
diff --git a/x11/qxkb/pkg-plist b/x11/qxkb/pkg-plist
index 27894739e1e..34375bcb44c 100644
--- a/x11/qxkb/pkg-plist
+++ b/x11/qxkb/pkg-plist
@@ -229,4 +229,3 @@ share/qxkb/theme/default/up.png
 @dirrm share/qxkb/theme
 @dirrm share/qxkb/i18n
 @dirrm share/qxkb
-@dirrmtry share/applications
diff --git a/x11/roxterm/pkg-plist b/x11/roxterm/pkg-plist
index 4218a58ba62..d50cfd7c056 100644
--- a/x11/roxterm/pkg-plist
+++ b/x11/roxterm/pkg-plist
@@ -33,4 +33,3 @@ share/locale/uk/LC_MESSAGES/roxterm.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/lib
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
diff --git a/x11/simdock/pkg-plist b/x11/simdock/pkg-plist
index 0b609a53199..093ee73d9f5 100644
--- a/x11/simdock/pkg-plist
+++ b/x11/simdock/pkg-plist
@@ -7,4 +7,3 @@ share/pixmaps/simdock.png
 %%DATADIR%%/mark.png
 %%DATADIR%%/question.png
 @dirrm share/simdock
-@dirrmtry share/applications
diff --git a/x11/tilda/pkg-plist b/x11/tilda/pkg-plist
index cf5e2c7f8f3..f8ec8d5beac 100644
--- a/x11/tilda/pkg-plist
+++ b/x11/tilda/pkg-plist
@@ -20,7 +20,6 @@ share/locale/tr/LC_MESSAGES/tilda.mo
 share/locale/zh_CN/LC_MESSAGES/tilda.mo
 share/pixmaps/tilda.png
 share/tilda.glade
-@dirrmtry share/applications
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/x11/tint/Makefile b/x11/tint/Makefile
index d164d0f0ba6..820ff14ece0 100644
--- a/x11/tint/Makefile
+++ b/x11/tint/Makefile
@@ -63,7 +63,6 @@ do-install:
 .if ${PORT_OPTIONS:MPYCONF}
 	${INSTALL_PROGRAM} ${PYCONF_SRC}/tint2conf ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${PYCONF_SRC}/tintwizard.py ${STAGEDIR}${PREFIX}/bin
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.svg ${STAGEDIR}${PREFIX}/share/pixmaps
diff --git a/x11/wbarconf/Makefile b/x11/wbarconf/Makefile
index 297f6bc37ee..eb793e361c3 100644
--- a/x11/wbarconf/Makefile
+++ b/x11/wbarconf/Makefile
@@ -27,7 +27,6 @@ do-install:
 	(cd ${WRKSRC}/wbarbacks/ && ${COPYTREE_SHARE} \* ${DATADIR}/wbarbacks/)
 	${INSTALL_DATA} ${WRKSRC}/messages.pot ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/wbarconf.png ${PREFIX}/share/pixmaps
-	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/wbarconf.desktop ${PREFIX}/share/applications
 	(cd ${WRKSRC}/locale/ && ${COPYTREE_SHARE} \* ${PREFIX}/share/locale/)
 .if !defined(NOPORTDOCS)
diff --git a/x11/wbarconf/pkg-plist b/x11/wbarconf/pkg-plist
index 22efe49dd2f..668cf668a66 100644
--- a/x11/wbarconf/pkg-plist
+++ b/x11/wbarconf/pkg-plist
@@ -21,4 +21,3 @@ share/pixmaps/wbarconf.png
 %%DATADIR%%/wbarbacks/wbarback9.png
 @dirrm %%DATADIR%%/wbarbacks
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/x11/xfce4-screenshooter-plugin/pkg-plist b/x11/xfce4-screenshooter-plugin/pkg-plist
index 7c9fef32c3a..8d4ec0052f9 100644
--- a/x11/xfce4-screenshooter-plugin/pkg-plist
+++ b/x11/xfce4-screenshooter-plugin/pkg-plist
@@ -155,7 +155,6 @@ share/xfce4/panel/plugins/screenshooter.desktop
 @dirrm %%DOCSDIR%%/ast/images
 @dirrm %%DOCSDIR%%/ast
 @dirrm %%DOCSDIR%%
-@dirrmtry share/applications
 @dirrmtry lib/xfce4/panel/plugins
 @dirrmtry lib/xfce4/panel
 @dirrmtry lib/xfce4
diff --git a/x11/xfce4-taskmanager/pkg-plist b/x11/xfce4-taskmanager/pkg-plist
index 395455f5ea0..665134ce571 100644
--- a/x11/xfce4-taskmanager/pkg-plist
+++ b/x11/xfce4-taskmanager/pkg-plist
@@ -52,4 +52,3 @@ share/locale/zh_TW/LC_MESSAGES/xfce4-taskmanager.mo
 @dirrmtry share/locale/kk
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
-@dirrmtry share/applications
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index 50104885025..793cacad3be 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -437,6 +437,5 @@ share/xscreensaver/config/zoom.xml
 @dirrm share/xscreensaver/glade
 @dirrm share/xscreensaver
 @dirrm bin/xscreensaver-hacks
-@dirrmtry share/applications
 @cwd %%LOCALBASE%%
 lib/X11/app-defaults/XScreenSaver
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index e9cb5dd82ee..56ede55755c 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -504,7 +504,6 @@ share/pixmaps/xscreensaver.xpm
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale
-@dirrmtry share/applications
 @dirrmtry %%DATADIR%%/config
 @dirrm %%DATADIR%%/glade
 @dirrmtry %%DATADIR%%
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 2a0307c4cb3..130a4d422de 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -93,7 +93,6 @@ post-install:
 .for f in koi8rxterm resize uxterm xterm
 	@${CHMOD} ${BINMODE} ${PREFIX}/bin/${f}
 .endfor
-	@${MKDIR} ${PREFIX}/share/applications/
 	@${INSTALL_DATA} ${WRKSRC}/xterm.desktop ${PREFIX}/share/applications/
 .if ${PORT_OPTIONS:MGNOME}
 	@-update-desktop-database
diff --git a/x11/xterm/pkg-plist b/x11/xterm/pkg-plist
index 721c443b1e0..bc9539d7dc0 100644
--- a/x11/xterm/pkg-plist
+++ b/x11/xterm/pkg-plist
@@ -17,6 +17,5 @@ share/pixmaps/xterm-color_32x32.xpm
 share/pixmaps/xterm-color_48x48.xpm
 share/pixmaps/xterm_32x32.xpm
 share/pixmaps/xterm_48x48.xpm
-@dirrmtry share/applications
 %%GNOME%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 %%GNOME%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/x11/yad/pkg-plist b/x11/yad/pkg-plist
index 15ad9c584f3..f60ca535ee9 100644
--- a/x11/yad/pkg-plist
+++ b/x11/yad/pkg-plist
@@ -30,4 +30,3 @@ share/icons/hicolor/96x96/apps/yad.png
 @dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-%%ICONBROWSER%%@dirrmtry share/applications
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 4321292b245..42f1c492e22 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -138,7 +138,6 @@ share/locale/zu/LC_MESSAGES/yelp.mo
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES