summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2013-10-22 13:57:35 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2013-10-22 13:57:35 +0000
commita2105d9f79b4b1fd476adf76673c3c11c40dc633 (patch)
tree8ef09580acc4a6416ee6abeb00ca71999c743d2f
parent- Remove manual creation and removal of share/applications, as it's now in th... (diff)
- Remove manual creation and removal of share/applications, as it's now in the mtree (categories starting with [bce])
Approved by: portmgr (bdrewery)
Notes
Notes: svn path=/head/; revision=331271
-rw-r--r--benchmarks/phoronix-test-suite/pkg-plist4
-rw-r--r--biology/gperiodic/Makefile2
-rw-r--r--biology/gperiodic/pkg-plist1
-rw-r--r--biology/ugene/pkg-plist1
-rw-r--r--cad/geda-gattrib/pkg-plist1
-rw-r--r--cad/geda-gschem/pkg-plist1
-rw-r--r--cad/geda/pkg-plist1
-rw-r--r--cad/gerbv/Makefile1
-rw-r--r--cad/gerbv/pkg-plist1
-rw-r--r--cad/gtkwave/pkg-plist1
-rw-r--r--cad/kicad-devel/Makefile3
-rw-r--r--cad/kicad/pkg-plist1
-rw-r--r--cad/leocad/pkg-plist1
-rw-r--r--cad/librecad/Makefile2
-rw-r--r--cad/librecad/pkg-plist1
-rw-r--r--cad/openscad/pkg-plist1
-rw-r--r--cad/qelectrotech/pkg-plist1
-rw-r--r--cad/qfsm/Makefile1
-rw-r--r--cad/qfsm/pkg-plist1
-rw-r--r--cad/repsnapper/pkg-plist1
-rw-r--r--chinese/fcitx/pkg-plist1
-rw-r--r--chinese/gcin/pkg-plist1
-rw-r--r--chinese/pcmanx/pkg-plist1
-rw-r--r--chinese/qterm/pkg-plist1
-rw-r--r--chinese/reciteword/pkg-plist1
-rw-r--r--chinese/srecite/pkg-plist1
-rw-r--r--comms/amtterm/Makefile1
-rw-r--r--comms/chirp/pkg-plist1
-rw-r--r--comms/cutecom/pkg-plist1
-rw-r--r--comms/efax-gtk/pkg-plist1
-rw-r--r--comms/fldigi/pkg-plist1
-rw-r--r--comms/flwrap/pkg-plist1
-rw-r--r--comms/gnokii/pkg-plist1
-rw-r--r--comms/gpredict/pkg-plist1
-rw-r--r--comms/gpsk31/pkg-plist1
-rw-r--r--comms/hamfax/pkg-plist1
-rw-r--r--comms/syncterm/pkg-plist1
-rw-r--r--comms/tilp2/pkg-plist1
-rw-r--r--comms/xdx/pkg-plist1
-rw-r--r--editors/abiword/pkg-plist1
-rw-r--r--editors/bless/pkg-plist1
-rw-r--r--editors/codelite/pkg-plist1
-rw-r--r--editors/conglomerate/pkg-plist1
-rw-r--r--editors/cream/Makefile2
-rw-r--r--editors/cream/pkg-plist1
-rw-r--r--editors/emacs-devel/pkg-plist1
-rw-r--r--editors/emacs/pkg-plist1
-rw-r--r--editors/emacs23/pkg-plist1
-rw-r--r--editors/fxite/Makefile1
-rw-r--r--editors/gedit/pkg-plist1
-rw-r--r--editors/ghex/pkg-plist1
-rw-r--r--editors/gmanedit/pkg-plist1
-rw-r--r--editors/gphpedit/pkg-plist1
-rw-r--r--editors/gummi/pkg-plist1
-rw-r--r--editors/gwrite/pkg-plist1
-rw-r--r--editors/komodo-ide/pkg-plist1
-rw-r--r--editors/leafpad/pkg-plist1
-rw-r--r--editors/madedit/pkg-plist1
-rw-r--r--editors/mined/pkg-plist1
-rw-r--r--editors/mlview/pkg-plist1
-rw-r--r--editors/openoffice-3/Makefile1
-rw-r--r--editors/openoffice-4/Makefile1
-rw-r--r--editors/openoffice-devel/Makefile1
-rw-r--r--editors/poedit/pkg-plist1
-rw-r--r--editors/py-room/pkg-plist1
-rw-r--r--editors/scite/Makefile2
-rw-r--r--editors/scite/pkg-plist1
-rw-r--r--editors/scribes/pkg-plist1
-rw-r--r--editors/texmaker/pkg-plist1
-rw-r--r--editors/texmakerx/pkg-plist1
-rw-r--r--editors/textroom/pkg-plist1
-rw-r--r--editors/winefish/pkg-plist1
-rw-r--r--editors/xemacs/Makefile2
-rw-r--r--editors/xemacs/pkg-plist1
-rw-r--r--editors/xmlcopyeditor/pkg-plist1
-rw-r--r--editors/xvile/pkg-plist1
-rw-r--r--editors/zim/pkg-plist1
-rw-r--r--emulators/aqemu/pkg-plist1
-rw-r--r--emulators/desmume/pkg-plist1
-rw-r--r--emulators/fceux/Makefile1
-rw-r--r--emulators/fceux/pkg-plist1
-rw-r--r--emulators/gxmame/pkg-plist1
-rw-r--r--emulators/hatari/pkg-plist1
-rw-r--r--emulators/higan/Makefile1
-rw-r--r--emulators/higan/pkg-plist1
-rw-r--r--emulators/i386-wine-devel/pkg-plist1
-rw-r--r--emulators/i386-wine/pkg-plist1
-rw-r--r--emulators/open-vm-tools/pkg-plist1
-rw-r--r--emulators/pcsxr/pkg-plist1
-rw-r--r--emulators/qemu-launcher/pkg-plist1
-rw-r--r--emulators/raine/pkg-plist1
-rw-r--r--emulators/snes9x-gtk/pkg-plist1
-rw-r--r--emulators/swine/Makefile1
-rw-r--r--emulators/swine/pkg-plist1
-rw-r--r--emulators/tilem/pkg-plist1
-rw-r--r--emulators/virtualbox-ose-legacy/Makefile2
-rw-r--r--emulators/virtualbox-ose-legacy/pkg-plist1
-rw-r--r--emulators/virtualbox-ose/Makefile2
-rw-r--r--emulators/virtualbox-ose/pkg-plist1
-rw-r--r--emulators/visualboyadvance-m/pkg-plist1
-rw-r--r--emulators/wine-devel/pkg-plist1
-rw-r--r--emulators/wine/pkg-plist1
-rw-r--r--emulators/xcpc/pkg-plist1
103 files changed, 5 insertions, 110 deletions
diff --git a/benchmarks/phoronix-test-suite/pkg-plist b/benchmarks/phoronix-test-suite/pkg-plist
index a304b02a7c0e..f61b718ba4c7 100644
--- a/benchmarks/phoronix-test-suite/pkg-plist
+++ b/benchmarks/phoronix-test-suite/pkg-plist
@@ -379,5 +379,7 @@ bin/phoronix-test-suite
@dirrm %%DATADIR%%/pts-core
@dirrm %%DATADIR%%
%%BASH_COMPLETIONS%%@dirrmtry etc/bash_completion.d
-%%X11%%@dirrmtry share/applications
%%X11%%@dirrmtry share/icons/hicolor/64x64/apps
+%%X11%%@dirrmtry share/icons/hicolor/64x64
+%%X11%%@dirrmtry share/icons/hicolor
+%%X11%%@dirrmtry share/icons
diff --git a/biology/gperiodic/Makefile b/biology/gperiodic/Makefile
index 013af8531d21..ae32d424b788 100644
--- a/biology/gperiodic/Makefile
+++ b/biology/gperiodic/Makefile
@@ -32,10 +32,8 @@ do-build:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gperiodic ${PREFIX}/bin
- @${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/gperiodic.desktop \
${PREFIX}/share/applications
- @${MKDIR} ${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKSRC}/gperiodic.png \
${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKSRC}/gperiodic-crystal.png \
diff --git a/biology/gperiodic/pkg-plist b/biology/gperiodic/pkg-plist
index cf1839f7c641..0520be903881 100644
--- a/biology/gperiodic/pkg-plist
+++ b/biology/gperiodic/pkg-plist
@@ -10,4 +10,3 @@ share/locale/sv/LC_MESSAGES/gperiodic.mo
share/locale/tr/LC_MESSAGES/gperiodic.mo
share/pixmaps/gperiodic.png
share/pixmaps/gperiodic-crystal.png
-@dirrmtry share/applications
diff --git a/biology/ugene/pkg-plist b/biology/ugene/pkg-plist
index 927adce7aa40..39415697299c 100644
--- a/biology/ugene/pkg-plist
+++ b/biology/ugene/pkg-plist
@@ -1133,6 +1133,5 @@ share/pixmaps/ugene.xpm
@dirrm %%DATADIR%%/back_translation/Bacteria
@dirrm %%DATADIR%%/back_translation
@dirrm %%DATADIR%%
-@dirrmtry share/applications
@dirrm lib/ugene/plugins
@dirrm lib/ugene
diff --git a/cad/geda-gattrib/pkg-plist b/cad/geda-gattrib/pkg-plist
index 2ed3b3caffdd..8f17357a55b7 100644
--- a/cad/geda-gattrib/pkg-plist
+++ b/cad/geda-gattrib/pkg-plist
@@ -14,7 +14,6 @@ share/icons/hicolor/scalable/apps/geda-gattrib.svg
@dirrmtry share/icons/hicolor
@dirrmtry share/icons
@dirrmtry %%DATADIR%%
-@dirrmtry share/applications
%%NLS%%@dirrmtry lib/locale/nl_NL/LC_MESSAGES
%%NLS%%@dirrmtry lib/locale/nl_NL
%%NLS%%@dirrmtry lib/locale/es_ES/LC_MESSAGES
diff --git a/cad/geda-gschem/pkg-plist b/cad/geda-gschem/pkg-plist
index a225cbb228a3..401158ac6b5d 100644
--- a/cad/geda-gschem/pkg-plist
+++ b/cad/geda-gschem/pkg-plist
@@ -83,4 +83,3 @@ share/locale/ru/LC_MESSAGES/geda-gschem.mo
@dirrmtry %%DATADIR%%/scheme
@dirrmtry %%DATADIR%%/bitmap
@dirrmtry %%DATADIR%%
-@dirrmtry share/applications
diff --git a/cad/geda/pkg-plist b/cad/geda/pkg-plist
index d24ed211083c..2c23605edb6a 100644
--- a/cad/geda/pkg-plist
+++ b/cad/geda/pkg-plist
@@ -2399,7 +2399,6 @@ share/mime/packages/libgeda.xml
%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/RF_Amp
%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
@dirrm include/libgeda
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index 70a1a72a9d70..ffcd22877d5f 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -31,7 +31,6 @@ post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s|desktop||g' ${WRKSRC}/Makefile.in
post-install:
- @${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/desktop/gerbv.desktop \
${PREFIX}/share/applications
@${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps
diff --git a/cad/gerbv/pkg-plist b/cad/gerbv/pkg-plist
index 29683f33bf9b..902932a8e8a5 100644
--- a/cad/gerbv/pkg-plist
+++ b/cad/gerbv/pkg-plist
@@ -118,7 +118,6 @@ share/icons/hicolor/scalable/apps/gerbv.svg
%%PORTDOCS%%@dirrm %%DOCSDIR%%/eagle
%%PORTDOCS%%@dirrm %%DOCSDIR%%/PNG-print
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
@dirrm include/gerbv-%%VERSION%%
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/cad/gtkwave/pkg-plist b/cad/gtkwave/pkg-plist
index 5bf6d96c34cc..35bf6b6e0a42 100644
--- a/cad/gtkwave/pkg-plist
+++ b/cad/gtkwave/pkg-plist
@@ -89,7 +89,6 @@ share/icons/gtkwave_savefiles_256x256x32.png
@dirrmtry share/mime/application
@dirrmtry share/mime/packages
@dirrmtry share/mime
-@dirrmtry share/applications
@dirrmtry share/icons/gnome/16x16/mimetypes
@dirrmtry share/icons/gnome/16x16
@dirrmtry share/icons/gnome/32x32/mimetypes
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 4da43670572a..d3fed891bcd3 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -160,8 +160,7 @@ PLIST_FILE_LIST= bin/freeroute.jnlp \
PLIST_DIR_LIST= lib/kicad
-PLIST_SHAREDDIR_LIST= share/applications \
- share/mimelnk/application \
+PLIST_SHAREDDIR_LIST= share/mimelnk/application \
share/mimelnk
build-plist:
diff --git a/cad/kicad/pkg-plist b/cad/kicad/pkg-plist
index 30ee3d4e69d3..3ed09ee879cd 100644
--- a/cad/kicad/pkg-plist
+++ b/cad/kicad/pkg-plist
@@ -405,6 +405,5 @@ share/mimelnk/application/x-kicad-schematic.desktop
%%PORTDOCS%%@dirrm %%DOCSDIR%%/adc-dac
%%PORTDOCS%%@dirrm %%DOCSDIR%%/74xx
@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
@dirrm lib/kicad/plugins
@dirrm lib/kicad
diff --git a/cad/leocad/pkg-plist b/cad/leocad/pkg-plist
index 610dbf8071ad..3ddcc9301d25 100644
--- a/cad/leocad/pkg-plist
+++ b/cad/leocad/pkg-plist
@@ -15,4 +15,3 @@ share/pixmaps/leocad.png
@dirrmtry share/mime/application
@dirrmtry share/mime
@dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
index 1bd86a72f6cd..34e69e2f876b 100644
--- a/cad/librecad/Makefile
+++ b/cad/librecad/Makefile
@@ -52,10 +52,8 @@ post-build:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/unix/librecad ${STAGEDIR}${PREFIX}/bin
cd ${WRKSRC}/unix/resources && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/desktop/librecad.desktop \
${STAGEDIR}${PREFIX}/share/applications
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKSRC}/res/main/librecad.png \
${STAGEDIR}${PREFIX}/share/pixmaps
diff --git a/cad/librecad/pkg-plist b/cad/librecad/pkg-plist
index 6d7f99430ebf..f3c19f39f88b 100644
--- a/cad/librecad/pkg-plist
+++ b/cad/librecad/pkg-plist
@@ -142,4 +142,3 @@ share/pixmaps/librecad.png
@dirrm %%DATADIR%%/fonts
@dirrm %%DATADIR%%/doc
@dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/cad/openscad/pkg-plist b/cad/openscad/pkg-plist
index 3498d72524ed..be2a25774baa 100644
--- a/cad/openscad/pkg-plist
+++ b/cad/openscad/pkg-plist
@@ -81,4 +81,3 @@ share/pixmaps/openscad.png
@dirrm %%DATADIR%%/libraries
@dirrm %%DATADIR%%/examples
@dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/cad/qelectrotech/pkg-plist b/cad/qelectrotech/pkg-plist
index 8d0ef9487ed2..0e953c9e0c17 100644
--- a/cad/qelectrotech/pkg-plist
+++ b/cad/qelectrotech/pkg-plist
@@ -308,7 +308,6 @@ share/mimelnk/application/x-qet-element.desktop
@dirrmtry share/mime
@dirrmtry share/mimelnk/application
@dirrmtry share/mimelnk
-@dirrmtry share/applications
@dirrmtry share/icons/hicolor/16x16/apps
@dirrmtry share/icons/hicolor/16x16/mimetypes
@dirrmtry share/icons/hicolor/16x16
diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index 8a61be95e1f3..081f14dba2fa 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -38,7 +38,6 @@ post-patch:
do-install:
(cd ${WRKSRC} && ${INSTALL_PROGRAM} qfsm ${PREFIX}/bin)
- @${MKDIR} ${PREFIX}/share/applications
(cd ${WRKSRC}/desktop && ${INSTALL_DATA} qfsm.desktop \
${PREFIX}/share/applications)
.for i in 32x32 48x48 64x64
diff --git a/cad/qfsm/pkg-plist b/cad/qfsm/pkg-plist
index f392f47b8d34..6f4979f9187c 100644
--- a/cad/qfsm/pkg-plist
+++ b/cad/qfsm/pkg-plist
@@ -74,6 +74,5 @@ share/mimelnk/application/x-qfsm.desktop
@dirrmtry share/icons
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@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
diff --git a/cad/repsnapper/pkg-plist b/cad/repsnapper/pkg-plist
index 62de4f92286a..1682245f41d7 100644
--- a/cad/repsnapper/pkg-plist
+++ b/cad/repsnapper/pkg-plist
@@ -9,7 +9,6 @@ share/repsnapper/repsnapper.ui
share/repsnapper/repsnapper.svg
share/icons/hicolor/scalable/apps/repsnapper.svg
@dirrmtry etc/xdg/repsnapper
-@dirrmtry share/applications
@dirrmtry share/locale/de_DE/LC_MESSAGES
@dirrmtry share/locale/de_DE
@dirrm share/repsnapper
diff --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist
index 19dc2a4f8f11..bebc6a3eec88 100644
--- a/chinese/fcitx/pkg-plist
+++ b/chinese/fcitx/pkg-plist
@@ -356,7 +356,6 @@ share/locale/ja/LC_MESSAGES/fcitx.mo
share/locale/zh_CN/LC_MESSAGES/fcitx.mo
share/locale/zh_TW/LC_MESSAGES/fcitx.mo
share/mime/packages/x-fskin.xml
-@dirrmtry share/applications
@dirrmtry share/icons/gnome/scalable/status
@dirrmtry share/icons/gnome/scalable
@dirrmtry share/icons/gnome
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index f1145dff5605..97f8fbd8139d 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -147,7 +147,6 @@ share/icons/gcin.png
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm share/icons/gcin
@dirrmtry share/icons
-@dirrmtry share/applications
@dirrmtry %%DATADIR%%/table
@dirrmtry %%DATADIR%%/script
@dirrmtry %%DATADIR%%
diff --git a/chinese/pcmanx/pkg-plist b/chinese/pcmanx/pkg-plist
index 6dc2a80fa8f9..285fdd91eb05 100644
--- a/chinese/pcmanx/pkg-plist
+++ b/chinese/pcmanx/pkg-plist
@@ -14,4 +14,3 @@ share/pixmaps/pcmanx.svg
@dirrmtry %%DATADIR%%/nancy_bot
@dirrmtry %%DATADIR%%/script
@dirrmtry %%DATADIR%%
-@dirrmtry share/applications
diff --git a/chinese/qterm/pkg-plist b/chinese/qterm/pkg-plist
index d171b60933ea..a7f152db64e5 100644
--- a/chinese/qterm/pkg-plist
+++ b/chinese/qterm/pkg-plist
@@ -52,4 +52,3 @@ share/qterm/scripts/websnap.js
@dirrmtry share/icons/hicolor/128x128
@dirrmtry share/icons/hicolor
@dirrmtry share/icons
-@dirrmtry share/applications
diff --git a/chinese/reciteword/pkg-plist b/chinese/reciteword/pkg-plist
index aa074128f5a8..e65c60d39654 100644
--- a/chinese/reciteword/pkg-plist
+++ b/chinese/reciteword/pkg-plist
@@ -676,4 +676,3 @@ share/pixmaps/rwdict.png
@dirrm %%DATADIR%%/books/fkbdc
@dirrm %%DATADIR%%/books
@dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/chinese/srecite/pkg-plist b/chinese/srecite/pkg-plist
index 922fd81069a9..7bf9d99a4451 100644
--- a/chinese/srecite/pkg-plist
+++ b/chinese/srecite/pkg-plist
@@ -122,4 +122,3 @@ share/icons/srecite.png
@dirrm share/srecite/icon
@dirrm share/srecite/wordbooks
@dirrm share/srecite
-@dirrmtry share/applications
diff --git a/comms/amtterm/Makefile b/comms/amtterm/Makefile
index abef404a1264..475f73f75df4 100644
--- a/comms/amtterm/Makefile
+++ b/comms/amtterm/Makefile
@@ -22,7 +22,6 @@ MAKE_ARGS+= HAVE_GTK=no
PLIST_FILES= bin/${PORTNAME} \
bin/amttool \
share/applications/gamt.desktop
-PLIST_DIRSTRY= share/applications
MAN1= gamt.1 ${PORTNAME}.1 amttool.1
MAN7= amt-howto.7
MANCOMPRESSED= no
diff --git a/comms/chirp/pkg-plist b/comms/chirp/pkg-plist
index 5f18e91c8568..7742761f45a8 100644
--- a/comms/chirp/pkg-plist
+++ b/comms/chirp/pkg-plist
@@ -282,5 +282,4 @@ share/pixmaps/chirp.png
@dirrm share/chirp/images
@dirrm share/chirp/stock_configs
@dirrm share/chirp
-@dirrmtry share/applications
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/cutecom/pkg-plist b/comms/cutecom/pkg-plist
index 6a23fa1603bf..1d66afd9f9b9 100644
--- a/comms/cutecom/pkg-plist
+++ b/comms/cutecom/pkg-plist
@@ -1,3 +1,2 @@
bin/cutecom
share/applications/cutecom.desktop
-@dirrmtry share/applications
diff --git a/comms/efax-gtk/pkg-plist b/comms/efax-gtk/pkg-plist
index d7fc467afba4..8ffda11ed52c 100644
--- a/comms/efax-gtk/pkg-plist
+++ b/comms/efax-gtk/pkg-plist
@@ -23,4 +23,3 @@ share/applications/efax-gtk.desktop
%%NLS%%share/locale/zh_CN/LC_MESSAGES/efax-gtk.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/efax-gtk.mo
share/pixmaps/efax-gtk.png
-@dirrmtry share/applications
diff --git a/comms/fldigi/pkg-plist b/comms/fldigi/pkg-plist
index 0551e6c4bf42..63591b5b59e9 100644
--- a/comms/fldigi/pkg-plist
+++ b/comms/fldigi/pkg-plist
@@ -14,4 +14,3 @@ share/pixmaps/fldigi.xpm
%%PORTDOCS%%%%DOCSDIR%%/guide.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm share/fldigi
-@dirrmtry share/applications
diff --git a/comms/flwrap/pkg-plist b/comms/flwrap/pkg-plist
index b914f20ae64d..b456aa58bcc7 100644
--- a/comms/flwrap/pkg-plist
+++ b/comms/flwrap/pkg-plist
@@ -3,4 +3,3 @@ share/applications/flwrap.desktop
share/pixmaps/flwrap.xpm
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
diff --git a/comms/gnokii/pkg-plist b/comms/gnokii/pkg-plist
index b430171e2e1b..dc8e20587233 100644
--- a/comms/gnokii/pkg-plist
+++ b/comms/gnokii/pkg-plist
@@ -59,4 +59,3 @@ share/locale/sv/LC_MESSAGES/gnokii.mo
%%SMSD%%@dirrm lib/smsd
%%SMSD%%@dirrm share/smsd
%%X11%%share/applications/xgnokii.desktop
-%%X11%%@dirrmtry share/applications
diff --git a/comms/gpredict/pkg-plist b/comms/gpredict/pkg-plist
index 74fa1bae3840..2b217b304bd4 100644
--- a/comms/gpredict/pkg-plist
+++ b/comms/gpredict/pkg-plist
@@ -154,4 +154,3 @@ share/pixmaps/gpredict/maps/nasa-topo_800.png
@dirrm %%DATADIR%%/data/satdata
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/comms/gpsk31/pkg-plist b/comms/gpsk31/pkg-plist
index 5ec31dc2bb64..a6b95acb73a3 100644
--- a/comms/gpsk31/pkg-plist
+++ b/comms/gpsk31/pkg-plist
@@ -5,4 +5,3 @@ bin/gpsk31
share/applications/gpsk31.desktop
share/pixmaps/gpsk31.png
@dirrm share/gpsk31
-@dirrm share/applications
diff --git a/comms/hamfax/pkg-plist b/comms/hamfax/pkg-plist
index 4b56c7c41be7..931469c06c59 100644
--- a/comms/hamfax/pkg-plist
+++ b/comms/hamfax/pkg-plist
@@ -3,5 +3,4 @@ share/applications/hamfax.desktop
%%DATADIR%%/hamfax.html
%%DATADIR%%/hamfax_de.qm
%%DATADIR%%/hamfax_fr.qm
-@dirrmtry share/applications
@dirrm %%DATADIR%%
diff --git a/comms/syncterm/pkg-plist b/comms/syncterm/pkg-plist
index f512c52a3cf6..6ca0f6f5f9d2 100644
--- a/comms/syncterm/pkg-plist
+++ b/comms/syncterm/pkg-plist
@@ -5,4 +5,3 @@ share/applications/syncterm.desktop
@dirrmtry share/icons/hicolor/64x64
@dirrmtry share/icons/hicolor
@dirrmtry share/icons
-@dirrmtry share/applications
diff --git a/comms/tilp2/pkg-plist b/comms/tilp2/pkg-plist
index 0f53855d5deb..8c7f7d44f49f 100644
--- a/comms/tilp2/pkg-plist
+++ b/comms/tilp2/pkg-plist
@@ -129,4 +129,3 @@ share/mime/packages/tilp.xml
@dirrm %%DATADIR%%
@dirrmtry share/mime/packages
@dirrmtry share/mime
-@dirrmtry share/applications
diff --git a/comms/xdx/pkg-plist b/comms/xdx/pkg-plist
index 734c5af3a27d..e2dda3813382 100644
--- a/comms/xdx/pkg-plist
+++ b/comms/xdx/pkg-plist
@@ -27,4 +27,3 @@ share/locale/fr/LC_MESSAGES/xdx.mo
share/locale/nl/LC_MESSAGES/xdx.mo
share/locale/pl/LC_MESSAGES/xdx.mo
share/locale/pt/LC_MESSAGES/xdx.mo
-@dirrmtry share/applications
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
diff --git a/emulators/aqemu/pkg-plist b/emulators/aqemu/pkg-plist
index e70ccce31b3c..49f33cca1021 100644
--- a/emulators/aqemu/pkg-plist
+++ b/emulators/aqemu/pkg-plist
@@ -67,4 +67,3 @@ share/pixmaps/aqemu_64x64.png
@dirrm share/aqemu/os_templates
@dirrm share/aqemu/os_icons
@dirrm share/aqemu
-@dirrmtry share/applications
diff --git a/emulators/desmume/pkg-plist b/emulators/desmume/pkg-plist
index 12d4e568e67b..61881a3a8874 100644
--- a/emulators/desmume/pkg-plist
+++ b/emulators/desmume/pkg-plist
@@ -15,7 +15,6 @@ share/locale/zh_TW/LC_MESSAGES/desmume.mo
share/pixmaps/DeSmuME.xpm
@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%
-@dirrmtry share/applications
@dirrmtry share/locale/zh_CN/LC_MESSAGES
@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/zh_TW/LC_MESSAGES
diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile
index 7c8d609c9c4f..203fa911ac1f 100644
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@@ -129,7 +129,6 @@ post-install:
.endfor
@${MV} ${WRKSRC}/documentation/tech ${DOCSDIR}
.endif
- ${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/fceux.desktop \
${PREFIX}/share/applications/fceux.desktop
@${INSTALL_DATA} ${WRKSRC}/fceux.png \
diff --git a/emulators/fceux/pkg-plist b/emulators/fceux/pkg-plist
index 130e73cd2077..2cc559c28221 100644
--- a/emulators/fceux/pkg-plist
+++ b/emulators/fceux/pkg-plist
@@ -106,4 +106,3 @@ share/pixmaps/fceux.png
%%PORTDOCS%%@dirrm %%DOCSDIR%%/tech/cpu
%%PORTDOCS%%@dirrm %%DOCSDIR%%/tech
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
diff --git a/emulators/gxmame/pkg-plist b/emulators/gxmame/pkg-plist
index 0392417df669..7f608fa3efaa 100644
--- a/emulators/gxmame/pkg-plist
+++ b/emulators/gxmame/pkg-plist
@@ -35,4 +35,3 @@ share/doc/gxmame/html/includes/gxmame.css
@dirrm share/doc/gxmame/html/includes
@dirrm share/doc/gxmame/html
@dirrm share/doc/gxmame
-@dirrmtry share/applications
diff --git a/emulators/hatari/pkg-plist b/emulators/hatari/pkg-plist
index 499877ce02a1..6af0b4b8db6d 100644
--- a/emulators/hatari/pkg-plist
+++ b/emulators/hatari/pkg-plist
@@ -61,6 +61,5 @@ share/pixmaps/hatari-icon.png
%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
@dirrmtry man/fr/man1
@dirrmtry man/fr
diff --git a/emulators/higan/Makefile b/emulators/higan/Makefile
index 5e43a28ae867..578ef2c06eef 100644
--- a/emulators/higan/Makefile
+++ b/emulators/higan/Makefile
@@ -139,7 +139,6 @@ do-install:
${LN} -sf ${PREFIX}/lib/libananke.so.1 ${PREFIX}/lib/libananke.so
${INSTALL_PROGRAM} ${WRKSRC}/higan/out/higan ${PREFIX}/bin/
${INSTALL_DATA} ${WRKSRC}/higan/data/higan.png ${PREFIX}/share/pixmaps/
- ${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/higan/data/higan.desktop ${PREFIX}/share/applications/
${MKDIR} ${DATADIR}/Video\ Shaders
(cd ${WRKSRC}/higan/profile && ${COPYTREE_SHARE} \* ${DATADIR}/)
diff --git a/emulators/higan/pkg-plist b/emulators/higan/pkg-plist
index 46f04b3510dd..1e022517f72c 100644
--- a/emulators/higan/pkg-plist
+++ b/emulators/higan/pkg-plist
@@ -23,4 +23,3 @@ share/pixmaps/higan.png
@dirrm %%DATADIR%%/Game Boy Advance.sys
@dirrm %%DATADIR%%/Famicom.sys
@dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/emulators/i386-wine-devel/pkg-plist b/emulators/i386-wine-devel/pkg-plist
index af9b5f4b0b9a..ccd26f11ad44 100644
--- a/emulators/i386-wine-devel/pkg-plist
+++ b/emulators/i386-wine-devel/pkg-plist
@@ -2156,7 +2156,6 @@ share/wine/wine.inf
@dirrm share/wine/fonts
@dirrm share/wine
@dirrm share/doc/wine
-@dirrmtry share/applications
@dirrm lib32/wine/fakedlls
@dirrm lib32/wine
@dirrm lib32/.libGL/dri
diff --git a/emulators/i386-wine/pkg-plist b/emulators/i386-wine/pkg-plist
index 3eebe5755162..c35ee23085aa 100644
--- a/emulators/i386-wine/pkg-plist
+++ b/emulators/i386-wine/pkg-plist
@@ -1985,7 +1985,6 @@ share/wine/wine.inf
@dirrm share/wine/fonts
@dirrm share/wine
@dirrm share/doc/wine
-@dirrmtry share/applications
@dirrm lib32/wine/fakedlls
@dirrm lib32/wine
@dirrm lib32/.libGL/dri
diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist
index c73f79066289..2836829fd8f4 100644
--- a/emulators/open-vm-tools/pkg-plist
+++ b/emulators/open-vm-tools/pkg-plist
@@ -74,7 +74,6 @@ share/vmware-tools/scripts/vmware/network
@dirrmtry share/vmware-tools/scripts
@dirrmtry share/vmware-tools
@dirrmtry libdata/pkgconfig
-%%X11%%@dirrmtry share/applications
@dirrm lib/open-vm-tools/plugins/common
@dirrm lib/open-vm-tools/plugins/vmsvc
%%X11%%@dirrm lib/open-vm-tools/plugins/vmusr
diff --git a/emulators/pcsxr/pkg-plist b/emulators/pcsxr/pkg-plist
index 91ccaf369f44..8c730ec50636 100644
--- a/emulators/pcsxr/pkg-plist
+++ b/emulators/pcsxr/pkg-plist
@@ -32,7 +32,6 @@ share/pcsxr/pcsxr.png
@dirrm share/pcsxr
share/pixmaps/pcsxr-icon.png
share/applications/pcsxr.desktop
-@dirrmtry share/applications
lib/pcsxr/cfgBladeSio1
lib/pcsxr/cfgDFXVideo
lib/pcsxr/cfgpeopsxgl
diff --git a/emulators/qemu-launcher/pkg-plist b/emulators/qemu-launcher/pkg-plist
index 529b1983e5c7..11c8a5e2638a 100644
--- a/emulators/qemu-launcher/pkg-plist
+++ b/emulators/qemu-launcher/pkg-plist
@@ -11,7 +11,6 @@ share/locale/lt/LC_MESSAGES/qemu-launcher.mo
%%DATADIR%%/icons/hicolor/scalable/apps/qemu-launcher.svg
%%DATADIR%%/icons/hicolor/16x16/apps/qemu-launcher.png
%%DATADIR%%/icons/hicolor/48x48/apps/qemu-launcher.png
-@dirrmtry share/applications/
@dirrm %%DATADIR%%/pixmaps/
@dirrm %%DATADIR%%/icons/hicolor/scalable/apps
@dirrm %%DATADIR%%/icons/hicolor/scalable/
diff --git a/emulators/raine/pkg-plist b/emulators/raine/pkg-plist
index c22062f7d57e..0fa26a831577 100644
--- a/emulators/raine/pkg-plist
+++ b/emulators/raine/pkg-plist
@@ -31,4 +31,3 @@ share/pixmaps/raine.png
@dirrmtry %%DATADIR%%/artwork
@dirrm %%DATADIR%%/languages
@dirrmtry %%DATADIR%%
-@dirrmtry share/applications
diff --git a/emulators/snes9x-gtk/pkg-plist b/emulators/snes9x-gtk/pkg-plist
index f315db0b8951..857627b394f4 100644
--- a/emulators/snes9x-gtk/pkg-plist
+++ b/emulators/snes9x-gtk/pkg-plist
@@ -1,6 +1,5 @@
bin/snes9x-gtk
share/pixmaps/snes9x.svg
share/applications/snes9x.desktop
-@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
diff --git a/emulators/swine/Makefile b/emulators/swine/Makefile
index 2d845d19e29a..2d113f191130 100644
--- a/emulators/swine/Makefile
+++ b/emulators/swine/Makefile
@@ -51,7 +51,6 @@ do-install:
@(cd ${WRKSRC} && ${COPYTREE_SHARE} "translations images" ${DATADIR})
${LN} -sf ${DATADIR}/images/swine32.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
- ${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/resources/*.desktop ${PREFIX}/share/applications/
.if ${PORT_OPTIONS:MDOCS}
diff --git a/emulators/swine/pkg-plist b/emulators/swine/pkg-plist
index d39e634d0961..2d9db08cc63a 100644
--- a/emulators/swine/pkg-plist
+++ b/emulators/swine/pkg-plist
@@ -79,5 +79,4 @@ share/pixmaps/swine.png
@dirrm %%DATADIR%%/translations
@dirrm %%DATADIR%%/images
@dirrm %%DATADIR%%
-@dirrmtry share/applications
@dirrm lib/swine
diff --git a/emulators/tilem/pkg-plist b/emulators/tilem/pkg-plist
index 81a71000b271..5ea27fce05fd 100644
--- a/emulators/tilem/pkg-plist
+++ b/emulators/tilem/pkg-plist
@@ -65,4 +65,3 @@ share/tilem2/symbols/ti86.sym
@dirrm share/tilem2/icons/hicolor
@dirrm share/tilem2/icons
@dirrm share/tilem2
-@dirrmtry share/applications
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index 92db231201f0..1698ddf77b5a 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -304,9 +304,7 @@ post-install:
@${FIND} ${PREFIX}/lib/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755
.if ${PORT_OPTIONS:MQT4}
- ${MKDIR} ${PREFIX}/share/pixmaps/
${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${PREFIX}/share/pixmaps/VBox.png
- ${MKDIR} ${PREFIX}/share/applications/
${INSTALL_DATA} ${WRKSRC}/src/VBox/Installer/freebsd/virtualbox.desktop ${PREFIX}/share/applications/virtualbox.desktop
.endif
@${CAT} ${PKGMESSAGE}
diff --git a/emulators/virtualbox-ose-legacy/pkg-plist b/emulators/virtualbox-ose-legacy/pkg-plist
index 1e60acad9deb..8a1b7a2ad1fe 100644
--- a/emulators/virtualbox-ose-legacy/pkg-plist
+++ b/emulators/virtualbox-ose-legacy/pkg-plist
@@ -617,7 +617,6 @@ include/virtualbox/xpcom/xpcom-config.h
@dirrm %%DATADIR%%/samples
@dirrm %%DATADIR%%/idl
@dirrm %%DATADIR%%
-%%QT4%%@dirrmtry share/applications
@dirrm lib/virtualbox/components
%%GUESTADDITIONS%%@dirrm lib/virtualbox/additions
@dirrm lib/virtualbox
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index d29c90852ab0..15f016c125ce 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -321,9 +321,7 @@ post-install:
@${FIND} ${PREFIX}/lib/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755
.if ${PORT_OPTIONS:MQT4}
- ${MKDIR} ${PREFIX}/share/pixmaps/
${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${PREFIX}/share/pixmaps/VBox.png
- ${MKDIR} ${PREFIX}/share/applications/
${INSTALL_DATA} ${WRKSRC}/src/VBox/Installer/freebsd/virtualbox.desktop ${PREFIX}/share/applications/virtualbox.desktop
.endif
@${CAT} ${PKGMESSAGE}
diff --git a/emulators/virtualbox-ose/pkg-plist b/emulators/virtualbox-ose/pkg-plist
index 4e6258648787..609a7b27c1cc 100644
--- a/emulators/virtualbox-ose/pkg-plist
+++ b/emulators/virtualbox-ose/pkg-plist
@@ -629,7 +629,6 @@ include/virtualbox/xpcom/xpcom-config.h
@dirrm %%DATADIR%%/samples
@dirrm %%DATADIR%%/idl
@dirrmtry %%DATADIR%%
-%%QT4%%@dirrmtry share/applications
@dirrm lib/virtualbox/components
%%GUESTADDITIONS%%@dirrm lib/virtualbox/additions
@dirrmtry lib/virtualbox
diff --git a/emulators/visualboyadvance-m/pkg-plist b/emulators/visualboyadvance-m/pkg-plist
index 7f45b4fccf38..5cde44e342b7 100644
--- a/emulators/visualboyadvance-m/pkg-plist
+++ b/emulators/visualboyadvance-m/pkg-plist
@@ -34,4 +34,3 @@ etc/vbam.cfg-example
%%GVBAM%%@dirrm share/icons/hicolor/16x16
%%GVBAM%%@dirrm share/icons/hicolor
%%GVBAM%%@dirrm share/icons
-%%GVBAM%%@dirrm share/applications
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 81532793843b..aaf7c552426d 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -2024,7 +2024,6 @@ share/applications/wine.desktop
%%PORTDOCS%%%%DOCSDIR%%/README.winedbg
%%PORTDOCS%%%%DOCSDIR%%/README.winedump
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
@dirrm lib/wine/fakedlls
@dirrm lib/wine
@dirrm include/wine/windows/ddk
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index b0f3c4322ff5..567a0002d9bd 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -1841,7 +1841,6 @@ share/applications/wine.desktop
%%PORTDOCS%%%%DOCSDIR%%/README.winedbg
%%PORTDOCS%%%%DOCSDIR%%/README.winedump
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
@dirrm lib/wine/fakedlls
@dirrm lib/wine
@dirrm include/wine/windows/ddk
diff --git a/emulators/xcpc/pkg-plist b/emulators/xcpc/pkg-plist
index c27f551ead95..668f48250a62 100644
--- a/emulators/xcpc/pkg-plist
+++ b/emulators/xcpc/pkg-plist
@@ -7,4 +7,3 @@ share/pixmaps/xcpc.xpm
%%DATADIR%%/roms/cpc664.rom
@dirrm %%DATADIR%%/roms
@dirrm %%DATADIR%%
-@dirrmtry share/applications