- Fix pkg-plist [1];

  - Switch to OptionNG;
  - Trim header;

Reported by:	beat (via pointyhat) [1]
Feature safe:	yes

2 files changed, 85 insertions, 65 deletions

diff --git a/multimedia/banshee/Makefile b/multimedia/banshee/Makefile
index 019a54368b0f..8b04cc325ef3 100644
--- a/multimedia/banshee/Makefile
+++ b/multimedia/banshee/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	banshee
-# Date created:				Jul 10 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
+# Created by:	Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	banshee
 PORTVERSION=	2.6.0
@@ -26,12 +22,17 @@ LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/mono.pc:${PORTSDIR}/lang/mono \
 		${LOCALBASE}/libdata/pkgconfig/mono-addins.pc:${PORTSDIR}/devel/mono-addins \
 		${LOCALBASE}/libdata/pkgconfig/notify-sharp.pc:${PORTSDIR}/devel/notify-sharp
 
-OPTIONS=	DOCS      "Install documentation"    on \
-		BOO       "Enable Boo support"       off \
-		BPMDETECT "Enable BPM detection"     on \
-		MTP       "Enable MTP support"       on \
-		APPLEDEV  "Enable Apple device DAP"  off \
-		YOUTUBE   "Enable Youtube support"   on
+# For now, remove APPLEDEV and BOO since they are broken
+OPTIONS_DEFINE=	DOCS BPMDETECT GIO MTP WEBKIT YOUTUBE
+
+APPLEDEV_DESC=	Apple device
+BOO_DESC=	Boo
+BPMDETECT_DESC=	Force dependency on soundtouch (required for BPM detection)
+GIO_DESC=	Use GIO for disk access
+WEBKIT_DESC=	Build and/or install extensions using Webkit 
+YOUTUBE_DESC=	Build and/or install the Youtube extension
+
+OPTIONS_DEFAULT=BPMDETECT GIO MTP WEBKIT YOUTUBE
 
 USE_XZ=		yes
 USE_GMAKE=	yes
@@ -44,7 +45,11 @@ USE_XORG=	xrandr xxf86vm
 USE_SQLITE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--with-vendor-build-id=FreeBSD\ BSD\#\ Project
+CONFIGURE_ARGS=	--with-vendor-build-id=FreeBSD\ BSD\#\ Project --disable-gio-hardware
+
+.include <bsd.port.options.mk>
+
+.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -57,28 +62,28 @@ PLIST_SUB+=	NLS="@comment "
 # Need absolute path for build/icon-install-theme.
 INSTALL=	/usr/bin/install
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
-
-.if exists(${LOCALBASE}/libdata/pkgconfig/gio-sharp-2.0.pc)
-PLIST_SUB+=		HAS_GIO=""
+.if ${PORT_OPTIONS:MGIO}
+CONFIGURE_ARGS+=--enable-gio
+LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/gtk-sharp-beans-2.0.pc:${PORTSDIR}/x11-toolkits/gtk-sharp-beans
+PLIST_SUB+=	OPT_GIO=""
 .else
-PLIST_SUB+=		HAS_GIO="@comment "
+CONFIGURE_ARGS+=--disable-gio
+PLIST_SUB+=	OPT_GIO="@comment "
 .endif
 
-.if defined(WITHOUT_DOCS) || defined(NOPORTDOCS)
-CONFIGURE_ARGS+=	--disable-docs
-PLIST_SUB+=		OPT_DOCS="@comment "
+.if ${PORT_OPTIONS:MDOCS}
+CONFIGURE_ARGS+=--enable-docs
+PLIST_SUB+=	OPT_DOCS=""
 .else
-CONFIGURE_ARGS+=	--enable-docs
-PLIST_SUB+=		OPT_DOCS=""
+CONFIGURE_ARGS+=--disable-docs
+PLIST_SUB+=	OPT_DOCS="@comment "
 .endif
 
-.if !defined(WITHOUT_BPMDETECT)
+.if ${PORT_OPTIONS:MBPMDETECT}
 USE_GSTREAMER+=	soundtouch
 .endif
 
-.if defined(WITH_BOO)
+.if ${PORT_OPTIONS:MBOO}
 CONFIGURE_ARGS+=--enable-boo
 BUILD_DEPENDS+=	booc:${PORTSDIR}/lang/boo
 RUN_DEPENDS+=	booc:${PORTSDIR}/lang/boo
@@ -88,7 +93,7 @@ CONFIGURE_ARGS+=--disable-boo
 PLIST_SUB+=	OPT_BOO="@comment "
 .endif
 
-.if !defined(WITHOUT_APPLEDEV)
+.if ${PORT_OPTIONS:MAPPLEDEV}
 CONFIGURE_ARGS+=--enable-appledevice
 LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/libgpodsharp.pc:${PORTSDIR}/audio/libgpod
 BROKEN=		Missing dependency
@@ -98,7 +103,7 @@ CONFIGURE_ARGS+=--disable-appledevice
 PLIST_SUB+=	APPLEDEV="@comment "
 .endif
 
-.if !defined(WITHOUT_MTP)
+.if ${PORTSDIR:MMTP}
 CONFIGURE_ARGS+=--enable-mtp
 LIB_DEPENDS+=	mtp:${PORTSDIR}/audio/libmtp
 PLIST_SUB+=	OPT_MTP=""
@@ -107,7 +112,16 @@ CONFIGURE_ARGS+=--disable-mtp
 PLIST_SUB+=	OPT_MTP="@comment "
 .endif
 
-.if !defined(WITHOUT_YOUTUBE)
+.if ${PORT_OPTIONS:MWEBKIT}
+CONFIGURE_ARGS+=--enable-webkit
+LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/webkit-sharp-1.0.pc:${PORTSDIR}/www/webkit-sharp
+PLIST_SUB+=	OPT_WEBKIT=""
+.else
+CONFIGURE_ARGS+=--disable-webkit
+PLIST_SUB+=	OPT_WEBKIT="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MYOUTUBE}
 CONFIGURE_ARGS+=--enable-youtube
 LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/gdata-sharp-youtube.pc:${PORTSDIR}/devel/google-gdata
 PLIST_SUB+=	OPT_YOUTUBE=""
@@ -116,4 +130,10 @@ CONFIGURE_ARGS+=--disable-youtube
 PLIST_SUB+=	OPT_YOUTUBE="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.if ${PORT_OPTIONS:MWEBKIT} || ${PORT_OPTIONS:MYOUTUBE}
+PLIST_SUB+=	OPT_WEBKITORYOUTUBE=""
+.else
+PLIST_SUB+=	OPT_WEBKITORYOUTUBE="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/multimedia/banshee/pkg-plist b/multimedia/banshee/pkg-plist
index c32645337337..333903ab66eb 100644
--- a/multimedia/banshee/pkg-plist
+++ b/multimedia/banshee/pkg-plist
@@ -4,8 +4,8 @@ bin/muinshee
 lib/banshee/Backends/Banshee.GStreamer.dll
 lib/banshee/Backends/Banshee.GStreamer.dll.config
 lib/banshee/Backends/Banshee.GStreamer.dll.mdb
-lib/banshee/Backends/Banshee.Gio.dll
-lib/banshee/Backends/Banshee.Gio.dll.mdb
+%%OPT_GIO%%lib/banshee/Backends/Banshee.Gio.dll
+%%OPT_GIO%%lib/banshee/Backends/Banshee.Gio.dll.mdb
 lib/banshee/Backends/Banshee.Gnome.dll
 lib/banshee/Backends/Banshee.Gnome.dll.mdb
 lib/banshee/Backends/Banshee.NowPlaying.X11.dll
@@ -13,12 +13,12 @@ lib/banshee/Backends/Banshee.NowPlaying.X11.dll.mdb
 lib/banshee/Backends/Banshee.Unix.dll
 lib/banshee/Backends/Banshee.Unix.dll.config
 lib/banshee/Backends/Banshee.Unix.dll.mdb
-lib/banshee/Backends/gio-sharp.dll
-lib/banshee/Backends/gio-sharp.dll.config
-lib/banshee/Backends/gio-sharp.dll.mdb
-lib/banshee/Backends/gtk-sharp-beans.dll
-lib/banshee/Backends/gtk-sharp-beans.dll.config
-lib/banshee/Backends/gtk-sharp-beans.dll.mdb
+%%OPT_GIO%%lib/banshee/Backends/gio-sharp.dll
+%%OPT_GIO%%lib/banshee/Backends/gio-sharp.dll.config
+%%OPT_GIO%%lib/banshee/Backends/gio-sharp.dll.mdb
+%%OPT_GIO%%lib/banshee/Backends/gtk-sharp-beans.dll
+%%OPT_GIO%%lib/banshee/Backends/gtk-sharp-beans.dll.config
+%%OPT_GIO%%lib/banshee/Backends/gtk-sharp-beans.dll.mdb
 lib/banshee/Backends/libbnpx11.a
 lib/banshee/Backends/libbnpx11.la
 lib/banshee/Backends/libbnpx11.so
@@ -33,8 +33,8 @@ lib/banshee/Banshee.Services.dll.config
 lib/banshee/Banshee.Services.dll.mdb
 lib/banshee/Banshee.ThickClient.dll
 lib/banshee/Banshee.ThickClient.dll.mdb
-lib/banshee/Banshee.WebBrowser.dll
-lib/banshee/Banshee.WebBrowser.dll.mdb
+%%OPT_WEBKIT%%lib/banshee/Banshee.WebBrowser.dll
+%%OPT_WEBKIT%%lib/banshee/Banshee.WebBrowser.dll.mdb
 lib/banshee/Banshee.Widgets.dll
 lib/banshee/Banshee.Widgets.dll.config
 lib/banshee/Banshee.Widgets.dll.mdb
@@ -43,8 +43,8 @@ lib/banshee/Banshee.exe.config
 lib/banshee/Banshee.exe.mdb
 lib/banshee/Beroe.exe
 lib/banshee/Beroe.exe.mdb
-lib/banshee/Extensions/Banshee.AmazonMp3.Store.dll
-lib/banshee/Extensions/Banshee.AmazonMp3.Store.dll.mdb
+%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.AmazonMp3.Store.dll
+%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.AmazonMp3.Store.dll.mdb
 lib/banshee/Extensions/Banshee.AmazonMp3.exe
 lib/banshee/Extensions/Banshee.AmazonMp3.exe.mdb
 lib/banshee/Extensions/Banshee.Audiobook.dll
@@ -63,8 +63,8 @@ lib/banshee/Extensions/Banshee.Dap.MassStorage.dll.mdb
 %%OPT_MTP%%lib/banshee/Extensions/Banshee.Dap.Mtp.dll.mdb
 lib/banshee/Extensions/Banshee.Dap.dll
 lib/banshee/Extensions/Banshee.Dap.dll.mdb
-lib/banshee/Extensions/Banshee.Emusic.Store.dll
-lib/banshee/Extensions/Banshee.Emusic.Store.dll.mdb
+%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.Emusic.Store.dll
+%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.Emusic.Store.dll.mdb
 lib/banshee/Extensions/Banshee.Emusic.dll
 lib/banshee/Extensions/Banshee.Emusic.dll.mdb
 lib/banshee/Extensions/Banshee.FileSystemQueue.dll
@@ -83,8 +83,8 @@ lib/banshee/Extensions/Banshee.LibraryWatcher.dll
 lib/banshee/Extensions/Banshee.LibraryWatcher.dll.mdb
 lib/banshee/Extensions/Banshee.MiniMode.dll
 lib/banshee/Extensions/Banshee.MiniMode.dll.mdb
-lib/banshee/Extensions/Banshee.MiroGuide.dll
-lib/banshee/Extensions/Banshee.MiroGuide.dll.mdb
+%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.MiroGuide.dll
+%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.MiroGuide.dll.mdb
 lib/banshee/Extensions/Banshee.Mpris.dll
 lib/banshee/Extensions/Banshee.Mpris.dll.mdb
 lib/banshee/Extensions/Banshee.MultimediaKeys.dll
@@ -102,8 +102,8 @@ lib/banshee/Extensions/Banshee.PlayerMigration.dll
 lib/banshee/Extensions/Banshee.PlayerMigration.dll.mdb
 lib/banshee/Extensions/Banshee.Podcasting.dll
 lib/banshee/Extensions/Banshee.Podcasting.dll.mdb
-lib/banshee/Extensions/Banshee.Wikipedia.dll
-lib/banshee/Extensions/Banshee.Wikipedia.dll.mdb
+%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.Wikipedia.dll
+%%OPT_WEBKIT%%lib/banshee/Extensions/Banshee.Wikipedia.dll.mdb
 %%OPT_YOUTUBE%%lib/banshee/Extensions/Banshee.YouTube.dll
 %%OPT_YOUTUBE%%lib/banshee/Extensions/Banshee.YouTube.dll.mdb
 lib/banshee/Halie.exe
@@ -137,9 +137,9 @@ lib/banshee/gconf-schema-extractor.exe
 lib/banshee/libbanshee.a
 lib/banshee/libbanshee.la
 lib/banshee/libbanshee.so
-lib/banshee/libossifer.a
-lib/banshee/libossifer.la
-lib/banshee/libossifer.so
+%%OPT_WEBKIT%%lib/banshee/libossifer.a
+%%OPT_WEBKIT%%lib/banshee/libossifer.la
+%%OPT_WEBKIT%%lib/banshee/libossifer.so
 %%PORTDOCS%%lib/monodoc/sources/banshee-docs.source
 %%PORTDOCS%%lib/monodoc/sources/banshee-docs.tree
 %%PORTDOCS%%lib/monodoc/sources/banshee-docs.zip
@@ -183,7 +183,7 @@ share/applications/banshee.desktop
 %%DATADIR%%/icons/hicolor/16x16/actions/media-repeat-single.png
 %%DATADIR%%/icons/hicolor/16x16/actions/media-write-cd.png
 %%DATADIR%%/icons/hicolor/16x16/categories/amazon-mp3-source.png
-%%DATADIR%%/icons/hicolor/16x16/categories/amazon-mp3-store-source.png
+%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/16x16/categories/amazon-mp3-store-source.png
 %%DATADIR%%/icons/hicolor/16x16/categories/audiobook.png
 %%DATADIR%%/icons/hicolor/16x16/categories/internet-archive.png
 %%DATADIR%%/icons/hicolor/16x16/categories/lastfm-audioscrobbler.png
@@ -191,12 +191,12 @@ share/applications/banshee.desktop
 %%DATADIR%%/icons/hicolor/16x16/categories/lastfm-personal.png
 %%DATADIR%%/icons/hicolor/16x16/categories/lastfm-recommended.png
 %%DATADIR%%/icons/hicolor/16x16/categories/lastfm-tag.png
-%%DATADIR%%/icons/hicolor/16x16/categories/miro-guide-source.png
+%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/16x16/categories/miro-guide-source.png
 %%DATADIR%%/icons/hicolor/16x16/categories/podcast.png
 %%DATADIR%%/icons/hicolor/16x16/categories/radio.png
 %%DATADIR%%/icons/hicolor/16x16/categories/source-playlist.png
 %%DATADIR%%/icons/hicolor/16x16/categories/source-smart-playlist.png
-%%DATADIR%%/icons/hicolor/16x16/categories/wikipedia.png
+%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/16x16/categories/wikipedia.png
 %%OPT_YOUTUBE%%%%DATADIR%%/icons/hicolor/16x16/categories/youtube.png
 %%DATADIR%%/icons/hicolor/16x16/devices/phone-google-nexus-one.png
 %%DATADIR%%/icons/hicolor/16x16/devices/phone-htc-g1-white.png
@@ -214,7 +214,7 @@ share/applications/banshee.desktop
 %%DATADIR%%/icons/hicolor/22x22/actions/media-import-audio-cd.png
 %%DATADIR%%/icons/hicolor/22x22/actions/media-write-cd.png
 %%DATADIR%%/icons/hicolor/22x22/categories/amazon-mp3-source.png
-%%DATADIR%%/icons/hicolor/22x22/categories/amazon-mp3-store-source.png
+%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/22x22/categories/amazon-mp3-store-source.png
 %%DATADIR%%/icons/hicolor/22x22/categories/audiobook.png
 %%DATADIR%%/icons/hicolor/22x22/categories/internet-archive.png
 %%DATADIR%%/icons/hicolor/22x22/categories/lastfm-audioscrobbler.png
@@ -222,12 +222,12 @@ share/applications/banshee.desktop
 %%DATADIR%%/icons/hicolor/22x22/categories/lastfm-personal.png
 %%DATADIR%%/icons/hicolor/22x22/categories/lastfm-recommended.png
 %%DATADIR%%/icons/hicolor/22x22/categories/lastfm-tag.png
-%%DATADIR%%/icons/hicolor/22x22/categories/miro-guide-source.png
+%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/22x22/categories/miro-guide-source.png
 %%DATADIR%%/icons/hicolor/22x22/categories/podcast.png
 %%DATADIR%%/icons/hicolor/22x22/categories/radio.png
 %%DATADIR%%/icons/hicolor/22x22/categories/source-playlist.png
 %%DATADIR%%/icons/hicolor/22x22/categories/source-smart-playlist.png
-%%DATADIR%%/icons/hicolor/22x22/categories/wikipedia.png
+%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/22x22/categories/wikipedia.png
 %%OPT_YOUTUBE%%%%DATADIR%%/icons/hicolor/22x22/categories/youtube.png
 %%DATADIR%%/icons/hicolor/22x22/devices/phone-google-nexus-one.png
 %%DATADIR%%/icons/hicolor/22x22/devices/phone-htc-g1-white.png
@@ -235,7 +235,7 @@ share/applications/banshee.desktop
 %%DATADIR%%/icons/hicolor/22x22/devices/phone-nook.png
 %%DATADIR%%/icons/hicolor/22x22/devices/phone-palm-pre.png
 %%DATADIR%%/icons/hicolor/22x22/devices/phone-xperia-arc.png
-%%DATADIR%%/icons/hicolor/24x24/categories/miro-guide-source.png
+%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/24x24/categories/miro-guide-source.png
 %%OPT_YOUTUBE%%%%DATADIR%%/icons/hicolor/24x24/categories/youtube.png
 %%DATADIR%%/icons/hicolor/24x24/devices/phone-google-nexus-one.png
 %%DATADIR%%/icons/hicolor/24x24/devices/phone-htc-g1-white.png
@@ -249,8 +249,8 @@ share/applications/banshee.desktop
 %%DATADIR%%/icons/hicolor/256x256/devices/phone-palm-pre.png
 %%DATADIR%%/icons/hicolor/256x256/devices/phone-xperia-arc.png
 %%DATADIR%%/icons/hicolor/32x32/actions/media-write-cd.png
-%%DATADIR%%/icons/hicolor/32x32/categories/miro-guide-source.png
-%%DATADIR%%/icons/hicolor/32x32/categories/wikipedia.png
+%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/32x32/categories/miro-guide-source.png
+%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/32x32/categories/wikipedia.png
 %%DATADIR%%/icons/hicolor/32x32/devices/phone-google-nexus-one.png
 %%DATADIR%%/icons/hicolor/32x32/devices/phone-htc-g1-white.png
 %%DATADIR%%/icons/hicolor/32x32/devices/phone-nokia-n900.png
@@ -259,19 +259,19 @@ share/applications/banshee.desktop
 %%DATADIR%%/icons/hicolor/32x32/devices/phone-xperia-arc.png
 %%DATADIR%%/icons/hicolor/48x48/actions/media-write-cd.png
 %%DATADIR%%/icons/hicolor/48x48/categories/audiobook.png
-%%DATADIR%%/icons/hicolor/48x48/categories/miro-guide-source.png
+%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/48x48/categories/miro-guide-source.png
 %%DATADIR%%/icons/hicolor/48x48/categories/podcast.png
 %%DATADIR%%/icons/hicolor/48x48/categories/radio.png
-%%DATADIR%%/icons/hicolor/48x48/categories/wikipedia.png
+%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/48x48/categories/wikipedia.png
 %%DATADIR%%/icons/hicolor/48x48/devices/phone-google-nexus-one.png
 %%DATADIR%%/icons/hicolor/48x48/devices/phone-htc-g1-white.png
 %%DATADIR%%/icons/hicolor/48x48/devices/phone-nokia-n900.png
 %%DATADIR%%/icons/hicolor/48x48/devices/phone-nook.png
 %%DATADIR%%/icons/hicolor/48x48/devices/phone-palm-pre.png
 %%DATADIR%%/icons/hicolor/48x48/devices/phone-xperia-arc.png
-%%DATADIR%%/icons/hicolor/scalable/categories/miro-guide-source.svg
+%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/scalable/categories/miro-guide-source.svg
 %%DATADIR%%/icons/hicolor/scalable/categories/radio.svg
-%%DATADIR%%/icons/hicolor/scalable/categories/wikipedia.svg
+%%OPT_WEBKIT%%%%DATADIR%%/icons/hicolor/scalable/categories/wikipedia.svg
 %%DATADIR%%/icons/hicolor/scalable/devices/phone-nokia-n900.svg
 share/dbus-1/services/org.bansheeproject.Banshee.service
 share/dbus-1/services/org.bansheeproject.CollectionIndexer.service
@@ -706,14 +706,14 @@ share/mime/packages/banshee-emx.xml
 @dirrm %%DATADIR%%/icons/hicolor/48x48/actions
 @dirrm %%DATADIR%%/icons/hicolor/48x48
 @dirrm %%DATADIR%%/icons/hicolor/32x32/devices
-@dirrm %%DATADIR%%/icons/hicolor/32x32/categories
+%%OPT_WEBKIT%%@dirrm %%DATADIR%%/icons/hicolor/32x32/categories
 @dirrm %%DATADIR%%/icons/hicolor/32x32/actions
 @dirrm %%DATADIR%%/icons/hicolor/32x32
 @dirrm %%DATADIR%%/icons/hicolor/256x256/devices
 @dirrm %%DATADIR%%/icons/hicolor/256x256/categories
 @dirrm %%DATADIR%%/icons/hicolor/256x256
 @dirrm %%DATADIR%%/icons/hicolor/24x24/devices
-@dirrm %%DATADIR%%/icons/hicolor/24x24/categories
+%%OPT_WEBKITORYOUTUBE%%@dirrm %%DATADIR%%/icons/hicolor/24x24/categories
 @dirrm %%DATADIR%%/icons/hicolor/24x24
 @dirrm %%DATADIR%%/icons/hicolor/22x22/devices
 @dirrm %%DATADIR%%/icons/hicolor/22x22/categories