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

Approved by:	portmgr (bdrewery)

17 files changed, 1 insertions, 28 deletions

diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist
index a322e86895f1..bf2386736f7a 100644
--- a/net-p2p/amule-devel/pkg-plist
+++ b/net-p2p/amule-devel/pkg-plist
@@ -169,7 +169,6 @@
 %%WEBSERVER%%@dirrm %%DATADIR%%/webserver/default
 %%WEBSERVER%%@dirrm %%DATADIR%%/webserver
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
 %%CAS%%@dirrmtry share/cas
 %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ast
diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist
index fad1c37e56f6..46a05c668511 100644
--- a/net-p2p/amule/pkg-plist
+++ b/net-p2p/amule/pkg-plist
@@ -167,7 +167,6 @@
 %%WEBSERVER%%@dirrm %%DATADIR%%/webserver/default
 %%WEBSERVER%%@dirrm %%DATADIR%%/webserver
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
 %%CAS%%@dirrmtry share/cas
 %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ast
diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile
index 1aee60e5ccfa..f12ba112ac7f 100644
--- a/net-p2p/deluge/Makefile
+++ b/net-p2p/deluge/Makefile
@@ -83,29 +83,19 @@ post-patch:
 
 post-install:
 # do these by hand, else they wind up in the wrong place
-	if [ ! -d ${PREFIX}/share/icons/hicolor/scalable/apps ]; then \
 	${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps ; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/deluge/data/icons/scalable/apps/deluge.svg \
 		${PREFIX}/share/icons/hicolor/scalable/apps
 .for size in 16 22 24 32 36 48 64 72 96 128 192 256
-	if [ ! -d ${PREFIX}/share/icons/hicolor/${size}x${size}/apps ]; then \
-		${MKDIR} ${PREFIX}/share/icons/hicolor/${size}x${size}/apps ; \
-	fi
+	${MKDIR} ${PREFIX}/share/icons/hicolor/${size}x${size}/apps ; \
 	${INSTALL_DATA} ${WRKSRC}/deluge/data/icons/hicolor/${size}x${size}/apps/deluge.png \
 		${PREFIX}/share/icons/hicolor/${size}x${size}/apps
 .endfor
-	if [ ! -d ${PREFIX}/share/pixmaps ]; then \
-	${MKDIR} ${PREFIX}/share/pixmaps ; \
-	fi
 .for file in png xpm
 	${INSTALL_DATA} ${WRKSRC}/deluge/data/pixmaps/deluge.${file} \
 		${PREFIX}/share/pixmaps
 .endfor
 .if ${PORT_OPTIONS:MGTK2}
-	if [ ! -d ${PREFIX}/share/applications ]; then \
-		${MKDIR} ${PREFIX}/share/applications ; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/deluge/data/share/applications/deluge.desktop \
 		${PREFIX}/share/applications
 .endif
diff --git a/net-p2p/deluge/pkg-plist b/net-p2p/deluge/pkg-plist
index a1a9ffc7676b..ce92c6e30c3c 100644
--- a/net-p2p/deluge/pkg-plist
+++ b/net-p2p/deluge/pkg-plist
@@ -1302,7 +1302,6 @@ share/pixmaps/deluge.xpm
 @dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-@dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/web/themes/images/gray/window
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/web/themes/images/gray/tree
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/web/themes/images/gray/toolbar
diff --git a/net-p2p/eiskaltdcpp-gtk/pkg-plist b/net-p2p/eiskaltdcpp-gtk/pkg-plist
index d5d0ec733e4d..51c85646bf1a 100644
--- a/net-p2p/eiskaltdcpp-gtk/pkg-plist
+++ b/net-p2p/eiskaltdcpp-gtk/pkg-plist
@@ -137,4 +137,3 @@ share/locale/uk/LC_MESSAGES/eiskaltdcpp-gtk.mo
 @dirrm share/eiskaltdcpp/gtk/themes
 @dirrm share/eiskaltdcpp/gtk/ui
 @dirrm share/eiskaltdcpp/gtk
-@dirrmtry share/applications
diff --git a/net-p2p/eiskaltdcpp-qt/pkg-plist b/net-p2p/eiskaltdcpp-qt/pkg-plist
index 79e694c50578..c11923a6ce1d 100644
--- a/net-p2p/eiskaltdcpp-qt/pkg-plist
+++ b/net-p2p/eiskaltdcpp-qt/pkg-plist
@@ -270,4 +270,3 @@ share/eiskaltdcpp/qt/ts/uk.qm
 @dirrm share/eiskaltdcpp/qt/ts
 @dirrm share/eiskaltdcpp/qt/resources
 @dirrm share/eiskaltdcpp/qt
-@dirrmtry share/applications
diff --git a/net-p2p/gnunet-gtk/pkg-plist b/net-p2p/gnunet-gtk/pkg-plist
index b1f38f02eef7..fa8db4f2ade2 100644
--- a/net-p2p/gnunet-gtk/pkg-plist
+++ b/net-p2p/gnunet-gtk/pkg-plist
@@ -298,5 +298,4 @@ share/icons/hicolor/scalable/apps/gnunet-fs-gtk.svg
 @dirrm share/gnunet-gtk/flags
 @dirrm share/gnunet-gtk/config.d
 @dirrm share/gnunet-gtk
-@dirrmtry share/applications
 @dirrm include/gnunet-gtk
diff --git a/net-p2p/gtk-gnutella/pkg-plist b/net-p2p/gtk-gnutella/pkg-plist
index ebf84498e21d..9c95834c1b4b 100644
--- a/net-p2p/gtk-gnutella/pkg-plist
+++ b/net-p2p/gtk-gnutella/pkg-plist
@@ -85,4 +85,3 @@ share/pixmaps/gtk-gnutella.svg
 @dirrm %%DATADIR%%/el
 @dirrm %%DATADIR%%/%%ARCH%%-freebsd
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/net-p2p/gtorrentviewer/pkg-plist b/net-p2p/gtorrentviewer/pkg-plist
index 5fccb68c11b9..e6e05b6f52b3 100644
--- a/net-p2p/gtorrentviewer/pkg-plist
+++ b/net-p2p/gtorrentviewer/pkg-plist
@@ -22,4 +22,3 @@ share/pixmaps/gtorrentviewer.xpm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/GTorrentViewer/pixmaps
 @dirrm share/GTorrentViewer
-@dirrmtry share/applications
diff --git a/net-p2p/linuxdcpp/pkg-plist b/net-p2p/linuxdcpp/pkg-plist
index b145f16ea370..e52a30646caf 100644
--- a/net-p2p/linuxdcpp/pkg-plist
+++ b/net-p2p/linuxdcpp/pkg-plist
@@ -1,6 +1,5 @@
 bin/linuxdcpp
 share/applications/linuxdcpp.desktop
-@dirrmtry share/applications
 %%DATADIR%%/glade/downloadqueue.glade
 %%DATADIR%%/glade/favoritehubs.glade
 %%DATADIR%%/glade/favoriteusers.glade
diff --git a/net-p2p/qbittorrent/pkg-plist b/net-p2p/qbittorrent/pkg-plist
index e330f6012452..d8b05885d17c 100644
--- a/net-p2p/qbittorrent/pkg-plist
+++ b/net-p2p/qbittorrent/pkg-plist
@@ -12,4 +12,3 @@ share/icons/hicolor/64x64/apps/qbittorrent.png
 share/icons/hicolor/72x72/apps/qbittorrent.png
 share/icons/hicolor/96x96/apps/qbittorrent.png
 share/pixmaps/qbittorrent.png
-@dirrmtry share/applications
diff --git a/net-p2p/transmission-gtk/pkg-plist b/net-p2p/transmission-gtk/pkg-plist
index b73fc361758d..97c7013bd8f5 100644
--- a/net-p2p/transmission-gtk/pkg-plist
+++ b/net-p2p/transmission-gtk/pkg-plist
@@ -138,6 +138,5 @@ share/pixmaps/transmission.png
 @dirrmtry share/locale/an/LC_MESSAGES
 @dirrmtry share/locale/an
 %%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/net-p2p/transmission-qt4/Makefile b/net-p2p/transmission-qt4/Makefile
index faa081887e16..4c1c8b587b35 100644
--- a/net-p2p/transmission-qt4/Makefile
+++ b/net-p2p/transmission-qt4/Makefile
@@ -43,10 +43,8 @@ post-install: general-install
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/qt/README.txt ${DOCSDIR}/README-qt4
 .endif
-	@${MKDIR} ${PREFIX}/share/applications
 	@${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
 		${PREFIX}/share/applications/
-	@${MKDIR} ${PREFIX}/share/pixmaps
 	@${INSTALL_DATA} ${WRKSRC}/qt/icons/transmission.png \
 		${PREFIX}/share/pixmaps/transmission-qt.png
 	@-update-desktop-database
diff --git a/net-p2p/transmission-qt4/pkg-plist b/net-p2p/transmission-qt4/pkg-plist
index b849d470c27d..4931235aecd4 100644
--- a/net-p2p/transmission-qt4/pkg-plist
+++ b/net-p2p/transmission-qt4/pkg-plist
@@ -6,6 +6,5 @@ share/applications/transmission-qt.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README-qt4
 share/pixmaps/transmission-qt.png
 %%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/net-p2p/tribler/Makefile b/net-p2p/tribler/Makefile
index 8cb2e68cacdb..6b49782e45df 100644
--- a/net-p2p/tribler/Makefile
+++ b/net-p2p/tribler/Makefile
@@ -104,7 +104,6 @@ post-install:
 	@${MKDIR} ${DESKTOPDIR}
 	(cd ${WRKDIR}/usr/share/applications \
 		&& ${INSTALL_DATA} tribler.desktop ${DESKTOPDIR})
-	@${MKDIR} ${PREFIX}/share/pixmaps
 	(cd ${WRKDIR}/usr/share/pixmaps \
 		&& ${INSTALL_DATA} tribler.xpm ${PREFIX}/share/pixmaps)
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/net-p2p/tribler/pkg-plist b/net-p2p/tribler/pkg-plist
index d00e8345ea8c..77a4911f0d06 100644
--- a/net-p2p/tribler/pkg-plist
+++ b/net-p2p/tribler/pkg-plist
@@ -1756,7 +1756,6 @@ share/applications/tribler.desktop
 %%PORTDOCS%%%%DOCSDIR%%/readme.txt
 share/pixmaps/tribler.xpm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool
 @dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy
 @dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/template
diff --git a/net-p2p/valknut/pkg-plist b/net-p2p/valknut/pkg-plist
index dfec3f99bb60..1a7cea3dd167 100644
--- a/net-p2p/valknut/pkg-plist
+++ b/net-p2p/valknut/pkg-plist
@@ -140,7 +140,6 @@ share/pixmaps/valknut.png
 @dirrm %%DATADIR%%/icons/appl
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
 @dirrmtry share/icons/hicolor/64x64/apps
 @dirrmtry share/icons/hicolor/64x64
 @dirrmtry share/icons/hicolor/48x48/apps