- Remove manual creation and removal of share/applications, as it's now in the mtree (categories starting with [bce])

Approved by:	portmgr (bdrewery)

38 files changed, 1 insertions, 40 deletions

diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index 82ea2eac0a67..639b55bf55a8 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -401,7 +401,6 @@ share/abiword-%%ABIVERSION%%/xsltml/tokens.xsl
 share/applications/abiword.desktop
 share/icons/abiword_48.png
 share/mime-info/abiword.keys
-@dirrmtry share/applications
 @dirrm share/abiword-%%ABIVERSION%%/xsltml
 @dirrm share/abiword-%%ABIVERSION%%/ui
 @dirrm share/abiword-%%ABIVERSION%%/templates
diff --git a/editors/bless/pkg-plist b/editors/bless/pkg-plist
index 0415f249edc0..c669b83a1926 100644
--- a/editors/bless/pkg-plist
+++ b/editors/bless/pkg-plist
@@ -74,5 +74,4 @@ share/pixmaps/bless-48x48.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/user/figures
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/user
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
 @dirrm lib/bless
diff --git a/editors/codelite/pkg-plist b/editors/codelite/pkg-plist
index a39497e5ee7b..8b8f1381711f 100644
--- a/editors/codelite/pkg-plist
+++ b/editors/codelite/pkg-plist
@@ -279,4 +279,3 @@ share/applications/codelite.desktop
 @dirrm %%DATADIR%%/gdb_printers
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/editors/conglomerate/pkg-plist b/editors/conglomerate/pkg-plist
index c4f45fe6909d..a54ba00eafb2 100644
--- a/editors/conglomerate/pkg-plist
+++ b/editors/conglomerate/pkg-plist
@@ -306,4 +306,3 @@ share/pixmaps/conglomerate/conglomerate-logo.png
 @dirrm %%DATADIR%%/dispspecs
 @dirrm %%DATADIR%%/css
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/editors/cream/Makefile b/editors/cream/Makefile
index 31ea9b9dd07a..4e3f8b99d1be 100644
--- a/editors/cream/Makefile
+++ b/editors/cream/Makefile
@@ -28,10 +28,8 @@ do-install:
 	${MKDIR} ${VIMRUNTIME}/cream/${f}
 	${INSTALL_DATA} ${WRKSRC}/${f}/* ${VIMRUNTIME}/cream/${f}
 .endfor
-	${MKDIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/cream.png ${WRKSRC}/cream.svg \
 		${PREFIX}/share/pixmaps
-	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/cream.desktop ${PREFIX}/share/applications
 .if !defined(NOPORTDOCS)
 .for f in docs docs-html
diff --git a/editors/cream/pkg-plist b/editors/cream/pkg-plist
index 95a96335de50..faadfb28ec5b 100644
--- a/editors/cream/pkg-plist
+++ b/editors/cream/pkg-plist
@@ -216,4 +216,3 @@ share/pixmaps/cream.svg
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs-html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 9afefdf00a1b..564c1c269c0d 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -32,7 +32,6 @@ share/icons/hicolor/scalable/mimetypes/emacs-document.svg
 @dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-@dirrmtry share/applications
 @unexec if [ ! -s /var/games/emacs/snake-scores ]; then rm -f /var/games/emacs/snake-scores; fi
 @unexec if [ ! -s /var/games/emacs/tetris-scores ]; then rm -f /var/games/emacs/tetris-scores; fi
 @unexec rmdir /var/games/emacs 2>/dev/null || true
diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist
index 9afefdf00a1b..564c1c269c0d 100644
--- a/editors/emacs/pkg-plist
+++ b/editors/emacs/pkg-plist
@@ -32,7 +32,6 @@ share/icons/hicolor/scalable/mimetypes/emacs-document.svg
 @dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-@dirrmtry share/applications
 @unexec if [ ! -s /var/games/emacs/snake-scores ]; then rm -f /var/games/emacs/snake-scores; fi
 @unexec if [ ! -s /var/games/emacs/tetris-scores ]; then rm -f /var/games/emacs/tetris-scores; fi
 @unexec rmdir /var/games/emacs 2>/dev/null || true
diff --git a/editors/emacs23/pkg-plist b/editors/emacs23/pkg-plist
index 94667e7f982f..c6c67b6ab9a7 100644
--- a/editors/emacs23/pkg-plist
+++ b/editors/emacs23/pkg-plist
@@ -38,7 +38,6 @@ share/icons/hicolor/scalable/mimetypes/emacs-document.svg
 @dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-@dirrmtry share/applications
 @unexec if [ ! -s /var/games/emacs/snake-scores ]; then rm -f /var/games/emacs/snake-scores; fi
 @unexec if [ ! -s /var/games/emacs/tetris-scores ]; then rm -f /var/games/emacs/tetris-scores; fi
 @unexec rmdir /var/games/emacs 2>/dev/null || true
diff --git a/editors/fxite/Makefile b/editors/fxite/Makefile
index a7895559ffa9..7be45e0ac88c 100644
--- a/editors/fxite/Makefile
+++ b/editors/fxite/Makefile
@@ -55,6 +55,5 @@ FOX_LIBS+=	`pkgconf fox17 --libs`
 PLIST_FILES=	bin/fxite \
 		share/pixmaps/fxite.xpm \
 		share/applications/fxite.desktop
-PLIST_DIRSTRY=	share/applications
 
 .include <bsd.port.mk>
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index 0823a841a09d..d13b938ee27c 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -624,7 +624,6 @@ share/omf/gedit/gedit-zh_TW.omf
 @dirrm share/gedit-2/icons
 @dirrm share/gedit-2
 @dirrm %%DOCSDIR%%
-@dirrmtry share/applications
 @dirrmtry libexec/gedit-2
 %%PYTHON%%@dirrm lib/gedit-2/plugins/snippets
 %%PYTHON%%@dirrm lib/gedit-2/plugins/quickopen
diff --git a/editors/ghex/pkg-plist b/editors/ghex/pkg-plist
index 9f4edc750e44..1729426c795b 100644
--- a/editors/ghex/pkg-plist
+++ b/editors/ghex/pkg-plist
@@ -126,7 +126,6 @@ share/locale/zh_TW/LC_MESSAGES/ghex-2.0.mo
 @dirrm share/gnome/help/ghex2/C
 @dirrm share/gnome/help/ghex2
 @dirrm include/gtkhex
-@dirrmtry share/applications
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
diff --git a/editors/gmanedit/pkg-plist b/editors/gmanedit/pkg-plist
index 6a9e48123d1a..3ace14cb77a7 100644
--- a/editors/gmanedit/pkg-plist
+++ b/editors/gmanedit/pkg-plist
@@ -7,4 +7,3 @@ share/locale/ja/LC_MESSAGES/gmanedit.mo
 share/locale/sv/LC_MESSAGES/gmanedit.mo
 share/pixmaps/gmanedit.png
 share/pixmaps/gmanedit_icon.png
-@dirrmtry share/applications
diff --git a/editors/gphpedit/pkg-plist b/editors/gphpedit/pkg-plist
index e76fe62e9d64..a522204b3844 100644
--- a/editors/gphpedit/pkg-plist
+++ b/editors/gphpedit/pkg-plist
@@ -3,4 +3,3 @@ share/applications/gphpedit.desktop
 share/gphpedit/php-gphpedit.api
 share/pixmaps/gphpedit.png
 @dirrm share/gphpedit
-@dirrmtry share/applications
diff --git a/editors/gummi/pkg-plist b/editors/gummi/pkg-plist
index 057db35a4127..b78c7e97558d 100644
--- a/editors/gummi/pkg-plist
+++ b/editors/gummi/pkg-plist
@@ -35,4 +35,3 @@ lib/gummi/latex_dvi.sh
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%
 @dirrm lib/gummi
-@dirrm share/applications
diff --git a/editors/gwrite/pkg-plist b/editors/gwrite/pkg-plist
index 5bd273c03ca3..96d4e7562fdc 100644
--- a/editors/gwrite/pkg-plist
+++ b/editors/gwrite/pkg-plist
@@ -52,6 +52,5 @@ share/applications/gwrite.desktop
 share/locale/fr/LC_MESSAGES/gwrite.mo
 share/locale/zh_CN/LC_MESSAGES/gwrite.mo
 share/pixmaps/gwrite.png
-@dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/gwrite/icons
 @dirrm %%PYTHON_SITELIBDIR%%/gwrite
diff --git a/editors/komodo-ide/pkg-plist b/editors/komodo-ide/pkg-plist
index e35a31b54aad..1241bad4fd8d 100644
--- a/editors/komodo-ide/pkg-plist
+++ b/editors/komodo-ide/pkg-plist
@@ -5040,4 +5040,3 @@ share/applications/komodo-ide-6.desktop
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/editors/leafpad/pkg-plist b/editors/leafpad/pkg-plist
index 24e7cae530fe..247ef5607d03 100644
--- a/editors/leafpad/pkg-plist
+++ b/editors/leafpad/pkg-plist
@@ -45,4 +45,3 @@ share/icons/hicolor/scalable/apps/leafpad.svg
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/leafpad.mo
 share/pixmaps/leafpad.png
 share/pixmaps/leafpad.xpm
-@dirrmtry share/applications
diff --git a/editors/madedit/pkg-plist b/editors/madedit/pkg-plist
index 9bfc504a53dd..77e4a58de773 100644
--- a/editors/madedit/pkg-plist
+++ b/editors/madedit/pkg-plist
@@ -47,7 +47,6 @@ share/pixmaps/madedit.xpm
 %%DATADIR%%/syntax/syntax_x86asm.syn
 %%DATADIR%%/syntax/syntax_xml.syn
 share/applications/madedit.desktop
-@dirrmtry share/applications
 @dirrmtry %%DATADIR%%/syntax
 @dirrmtry %%DATADIR%%
 @dirrmtry share/locale/ja_JP/LC_MESSAGES
diff --git a/editors/mined/pkg-plist b/editors/mined/pkg-plist
index de56d493432c..66cffc6b2dc4 100644
--- a/editors/mined/pkg-plist
+++ b/editors/mined/pkg-plist
@@ -51,4 +51,3 @@ share/pixmaps/mined.xpm
 @dirrm %%DATADIR%%/conf_user
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/editors/mlview/pkg-plist b/editors/mlview/pkg-plist
index 070393de58d1..db060e3601cb 100644
--- a/editors/mlview/pkg-plist
+++ b/editors/mlview/pkg-plist
@@ -63,4 +63,3 @@ share/locale/sr/LC_MESSAGES/mlview.mo
 share/locale/sr@Latn/LC_MESSAGES/mlview.mo
 share/locale/sv/LC_MESSAGES/mlview.mo
 @dirrm share/mlview
-@dirrmtry share/applications
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 033db6a419a8..084f359356a7 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -311,7 +311,6 @@ post-install:
 	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
 			${DESKTOPDIR}/${EXECBASE}
 	@${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}
 	@${ECHO_CMD} "@exec ${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index 20fe89b44b04..dd22c64d1903 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -325,7 +325,6 @@ post-install:
 	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
 			${DESKTOPDIR}/${EXECBASE}
 	@${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}
 	@${ECHO_CMD} "@exec ${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index eb6570977d73..499caecbb18e 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -325,7 +325,6 @@ post-install:
 	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
 			${DESKTOPDIR}/${EXECBASE}
 	@${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}
 	@${ECHO_CMD} "@exec ${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
diff --git a/editors/poedit/pkg-plist b/editors/poedit/pkg-plist
index ecf5025e7757..137cb3752da0 100644
--- a/editors/poedit/pkg-plist
+++ b/editors/poedit/pkg-plist
@@ -172,4 +172,3 @@ share/pixmaps/poedit.png
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/af_ZA/LC_MESSAGES
 @dirrmtry share/locale/af_ZA
-@dirrmtry share/applications
diff --git a/editors/py-room/pkg-plist b/editors/py-room/pkg-plist
index df8cdb22b2dc..0efe05e18abc 100644
--- a/editors/py-room/pkg-plist
+++ b/editors/py-room/pkg-plist
@@ -75,7 +75,6 @@ share/locale/tr/LC_MESSAGES/pyroom.mo
 share/locale/zh_CN/LC_MESSAGES/pyroom.mo
 share/locale/ku/LC_MESSAGES/pyroom.mo
 share/locale/sco/LC_MESSAGES/pyroom.mo
-@dirrmtry share/applications
 @dirrmtry share/locale/sco/LC_MESSAGES
 @dirrmtry share/locale/sco
 @dirrmtry share/locale/ku/LC_MESSAGES
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 3e55028cb2f8..f1d9a9cd6562 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -41,8 +41,6 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${MANPREFIX}/man/man1
-	@${MKDIR} ${PREFIX}/share/applications
-	@${MKDIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${PREFIX}/share/pixmaps
 	@${MKDIR} ${DATADIR}
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index 0e90169ae52a..adcd131aba00 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -78,4 +78,3 @@ share/pixmaps/Sci48M.png
 %%DATADIR%%/vhdl.properties
 %%DATADIR%%/yaml.properties
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/editors/scribes/pkg-plist b/editors/scribes/pkg-plist
index 072642433d9a..b71e1c509bd1 100644
--- a/editors/scribes/pkg-plist
+++ b/editors/scribes/pkg-plist
@@ -3967,7 +3967,6 @@ share/pixmaps/scribes.png
 @dirrm share/gnome/help/scribes/C/figures
 @dirrm share/gnome/help/scribes/C
 @dirrm share/gnome/help/scribes
-@dirrmtry share/applications
 @dirrm lib/scribes/LanguagePlugins/zencoding/filters
 @dirrm lib/scribes/LanguagePlugins/zencoding/GUI
 @dirrm lib/scribes/LanguagePlugins/zencoding
diff --git a/editors/texmaker/pkg-plist b/editors/texmaker/pkg-plist
index 7d5cdff6f36f..191998fe6451 100644
--- a/editors/texmaker/pkg-plist
+++ b/editors/texmaker/pkg-plist
@@ -123,4 +123,3 @@ share/texmaker/usermanual_fr.html
 share/texmaker/usermanual_hu.html
 share/texmaker/usermanual_ru.html
 @dirrm share/texmaker
-@dirrmtry share/applications
diff --git a/editors/texmakerx/pkg-plist b/editors/texmakerx/pkg-plist
index 49503a96ebdc..e6fbf655ea68 100644
--- a/editors/texmakerx/pkg-plist
+++ b/editors/texmakerx/pkg-plist
@@ -75,4 +75,3 @@ share/applications/texmakerx.desktop
 %%DATADIR%%/en_US.aff
 %%DATADIR%%/en_US.dic
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/editors/textroom/pkg-plist b/editors/textroom/pkg-plist
index 254a9864ef23..de234308c7a8 100644
--- a/editors/textroom/pkg-plist
+++ b/editors/textroom/pkg-plist
@@ -10,5 +10,4 @@ share/sounds/keyany.wav
 share/sounds/keyenter.wav
 @dirrmtry share/sounds
 @dirrmtry share/hunspell
-@dirrmtry share/applications
 @dirrm share/textroom
diff --git a/editors/winefish/pkg-plist b/editors/winefish/pkg-plist
index 2465880f1ecc..8a6893fd4899 100644
--- a/editors/winefish/pkg-plist
+++ b/editors/winefish/pkg-plist
@@ -31,4 +31,3 @@ share/mime/packages/winefish.xml
 @dirrm %%DATADIR%%
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/applications
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 389bffa233c0..67b575b9b526 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -165,7 +165,7 @@ post-install:
 .endfor
 .if !defined(WITHOUT_X11) && ${HAVE_GNOME:Mgnomehier}!=""
 	${INSTALL_DATA} ${WRKDIR}/xemacs.desktop \
-		${LOCALBASE}/share/applications
+		${PREFIX}/share/applications
 .endif
 # For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.
 # Do what PLIST does for pkg_add.
diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist
index 31918f461b26..deaba504d7ba 100644
--- a/editors/xemacs/pkg-plist
+++ b/editors/xemacs/pkg-plist
@@ -1235,4 +1235,3 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
 @dirrmtry lib/xemacs/site-lisp
 @dirrmtry lib/xemacs/site-modules
 @dirrmtry lib/xemacs
-%%DESKTOP%%@dirrmtry share/applications
diff --git a/editors/xmlcopyeditor/pkg-plist b/editors/xmlcopyeditor/pkg-plist
index be9dbbf8a031..33aaa4b3d1a2 100644
--- a/editors/xmlcopyeditor/pkg-plist
+++ b/editors/xmlcopyeditor/pkg-plist
@@ -372,4 +372,3 @@ share/pixmaps/xmlcopyeditor.png
 @dirrm %%DATADIR%%/catalog
 @dirrm %%DATADIR%%
 @dirrmtry share/pixmaps
-@dirrmtry share/applications
diff --git a/editors/xvile/pkg-plist b/editors/xvile/pkg-plist
index 0d7a85d435e8..13c70aec5cf5 100644
--- a/editors/xvile/pkg-plist
+++ b/editors/xvile/pkg-plist
@@ -260,5 +260,4 @@ share/pixmaps/vile.xpm
 @dirrm %%DATADIR%%/macros
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
 @dirrm lib/vile
diff --git a/editors/zim/pkg-plist b/editors/zim/pkg-plist
index bbbbd8d0f393..c6b1d2506d97 100644
--- a/editors/zim/pkg-plist
+++ b/editors/zim/pkg-plist
@@ -460,7 +460,6 @@ share/pixmaps/zim.png
 @dirrm share/icons/ubuntu-mono-dark/apps/22
 @dirrm share/icons/ubuntu-mono-dark/apps
 @dirrm share/icons/ubuntu-mono-dark
-@dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/zim/stores
 @dirrm %%PYTHON_SITELIBDIR%%/zim/plugins/versioncontrol
 @dirrm %%PYTHON_SITELIBDIR%%/zim/plugins/linkmap