2 files changed, 94 insertions, 95 deletions

diff --git a/audio/gqradio/Makefile b/audio/gqradio/Makefile
index ed62d7764db1..8d6db65eae98 100644
--- a/audio/gqradio/Makefile
+++ b/audio/gqradio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gqradio
 PORTVERSION=	1.9.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=gqmpeg
@@ -25,9 +25,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|share/gqradio|share/gnome/gqradio|; \
-		 s|\(doc/gqradio\)-\$$VERSION|\1|' \
+	@${REINPLACE_CMD} -e 's|\(doc/gqradio\)-\$$VERSION|\1|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|^\(readmedir = \).*|\1$$(prefix)/share/doc/gqradio|; \
diff --git a/audio/gqradio/pkg-plist b/audio/gqradio/pkg-plist
index 1a551fabbda0..092e0efa0601 100644
--- a/audio/gqradio/pkg-plist
+++ b/audio/gqradio/pkg-plist
@@ -3,96 +3,97 @@ share/doc/gqradio/ChangeLog
 share/doc/gqradio/README
 share/doc/gqradio/SKIN-SPECS
 share/doc/gqradio/TODO
-share/gnome/applications/gqradio.desktop
-share/gnome/gqradio/skins/SKIN-SPECS
-share/gnome/gqradio/skins/default/btn-grey-34x12-advanced1.png
-share/gnome/gqradio/skins/default/btn-grey-34x12-advanced2.png
-share/gnome/gqradio/skins/default/btn-grey-34x12-clear.png
-share/gnome/gqradio/skins/default/btn-grey-34x12-config.png
-share/gnome/gqradio/skins/default/btn-grey-34x12-del.png
-share/gnome/gqradio/skins/default/btn-grey-34x12-scan.png
-share/gnome/gqradio/skins/default/btn-grey-34x12-set.png
-share/gnome/gqradio/skins/default/btn-grey-34x20-mode.png
-share/gnome/gqradio/skins/default/btn-grey-34x20-mute.png
-share/gnome/gqradio/skins/default/btn-grey-42x20-down.png
-share/gnome/gqradio/skins/default/btn-grey-42x20-up.png
-share/gnome/gqradio/skins/default/btn-grey-expand.png
-share/gnome/gqradio/skins/default/btn-grey-shrink.png
-share/gnome/gqradio/skins/default/btn-grey-sizer.png
-share/gnome/gqradio/skins/default/btn-pda-16-minus.png
-share/gnome/gqradio/skins/default/btn-pda-16-plus.png
-share/gnome/gqradio/skins/default/btn-pda-exit.png
-share/gnome/gqradio/skins/default/btn-pda-iconify.png
-share/gnome/gqradio/skins/default/btn-pos-14-down.png
-share/gnome/gqradio/skins/default/btn-pos-14-up.png
-share/gnome/gqradio/skins/default/digit-digital-15-aa.png
-share/gnome/gqradio/skins/default/digit-digital-24-aa.png
-share/gnome/gqradio/skins/default/item-cycle-6.png
-share/gnome/gqradio/skins/default/item-radio-mute-large.png
-share/gnome/gqradio/skins/default/item-radio-scanning-11.png
-share/gnome/gqradio/skins/default/item-radio-stereo.png
-share/gnome/gqradio/skins/default/item-radio-strength-9.png
-share/gnome/gqradio/skins/default/item-radio-tunemode.png
-share/gnome/gqradio/skins/default/item-radio-volume-19.png
-share/gnome/gqradio/skins/default/item-set.png
-share/gnome/gqradio/skins/default/list-pos-back.png
-share/gnome/gqradio/skins/default/list-pos-row-menu.png
-share/gnome/gqradio/skins/default/list-pos-row.png
-share/gnome/gqradio/skins/default/main-pos-blank.png
-share/gnome/gqradio/skins/default/main-pos-extra.png
-share/gnome/gqradio/skins/default/menu_back_green.png
-share/gnome/gqradio/skins/default/menu_list_icons.png
-share/gnome/gqradio/skins/default/pic-dot.png
-share/gnome/gqradio/skins/default/pic-mhz.png
-share/gnome/gqradio/skins/default/skindata
-share/gnome/gqradio/skins/default/skindata_advanced
-share/gnome/gqradio/skins/default/skindata_menu
-share/gnome/gqradio/skins/default/skindata_presets
-share/gnome/gqradio/skins/default/skindata_presets_advanced
-share/gnome/gqradio/skins/default/skindata_submenu
-share/gnome/gqradio/skins/default/slider-pos-14h.png
-share/gnome/gqradio/skins/skyblue/back-blue.png
-share/gnome/gqradio/skins/skyblue/back-list-blue.png
-share/gnome/gqradio/skins/skyblue/back-menu-blue.png
-share/gnome/gqradio/skins/skyblue/btn-22-sizer2.png
-share/gnome/gqradio/skins/skyblue/btn-blue14-fade-close.png
-share/gnome/gqradio/skins/skyblue/btn-blue14-fade-down.png
-share/gnome/gqradio/skins/skyblue/btn-blue14-fade-iconify.png
-share/gnome/gqradio/skins/skyblue/btn-blue14-fade-up.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-clear.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-config.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-left.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-list.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-minus.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-mode3.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-mute.png
-share/gnome/gqradio/skins/skyblue/btn-blue22-fade-right.png
-share/gnome/gqradio/skins/skyblue/btn-blue22t-fade-add.png
-share/gnome/gqradio/skins/skyblue/btn-blue22t-fade-scan.png
-share/gnome/gqradio/skins/skyblue/digit-digital-15-aa.png
-share/gnome/gqradio/skins/skyblue/digit-digital-24-aa.png
-share/gnome/gqradio/skins/skyblue/item-cycle-6.png
-share/gnome/gqradio/skins/skyblue/item-radio-mute-large.png
-share/gnome/gqradio/skins/skyblue/item-radio-tunemode.png
-share/gnome/gqradio/skins/skyblue/item-set.png
-share/gnome/gqradio/skins/skyblue/item-signal4.png
-share/gnome/gqradio/skins/skyblue/item-volume12-shadow.png
-share/gnome/gqradio/skins/skyblue/list-back.png
-share/gnome/gqradio/skins/skyblue/list-menu-icons.png
-share/gnome/gqradio/skins/skyblue/list-menu-row20.png
-share/gnome/gqradio/skins/skyblue/list-row16.png
-share/gnome/gqradio/skins/skyblue/menu_list_icons.png
-share/gnome/gqradio/skins/skyblue/pic-dot.png
-share/gnome/gqradio/skins/skyblue/pic-mhz.png
-share/gnome/gqradio/skins/skyblue/skindata
-share/gnome/gqradio/skins/skyblue/skindata_menu
-share/gnome/gqradio/skins/skyblue/skindata_presets
-share/gnome/gqradio/skins/skyblue/skindata_submenu
-share/gnome/gqradio/skins/skyblue/slider-vert-24.png
-share/gnome/pixmaps/gqradio.png
+share/applications/gqradio.desktop
+share/gqradio/skins/SKIN-SPECS
+share/gqradio/skins/default/btn-grey-34x12-advanced1.png
+share/gqradio/skins/default/btn-grey-34x12-advanced2.png
+share/gqradio/skins/default/btn-grey-34x12-clear.png
+share/gqradio/skins/default/btn-grey-34x12-config.png
+share/gqradio/skins/default/btn-grey-34x12-del.png
+share/gqradio/skins/default/btn-grey-34x12-scan.png
+share/gqradio/skins/default/btn-grey-34x12-set.png
+share/gqradio/skins/default/btn-grey-34x20-mode.png
+share/gqradio/skins/default/btn-grey-34x20-mute.png
+share/gqradio/skins/default/btn-grey-42x20-down.png
+share/gqradio/skins/default/btn-grey-42x20-up.png
+share/gqradio/skins/default/btn-grey-expand.png
+share/gqradio/skins/default/btn-grey-shrink.png
+share/gqradio/skins/default/btn-grey-sizer.png
+share/gqradio/skins/default/btn-pda-16-minus.png
+share/gqradio/skins/default/btn-pda-16-plus.png
+share/gqradio/skins/default/btn-pda-exit.png
+share/gqradio/skins/default/btn-pda-iconify.png
+share/gqradio/skins/default/btn-pos-14-down.png
+share/gqradio/skins/default/btn-pos-14-up.png
+share/gqradio/skins/default/digit-digital-15-aa.png
+share/gqradio/skins/default/digit-digital-24-aa.png
+share/gqradio/skins/default/item-cycle-6.png
+share/gqradio/skins/default/item-radio-mute-large.png
+share/gqradio/skins/default/item-radio-scanning-11.png
+share/gqradio/skins/default/item-radio-stereo.png
+share/gqradio/skins/default/item-radio-strength-9.png
+share/gqradio/skins/default/item-radio-tunemode.png
+share/gqradio/skins/default/item-radio-volume-19.png
+share/gqradio/skins/default/item-set.png
+share/gqradio/skins/default/list-pos-back.png
+share/gqradio/skins/default/list-pos-row-menu.png
+share/gqradio/skins/default/list-pos-row.png
+share/gqradio/skins/default/main-pos-blank.png
+share/gqradio/skins/default/main-pos-extra.png
+share/gqradio/skins/default/menu_back_green.png
+share/gqradio/skins/default/menu_list_icons.png
+share/gqradio/skins/default/pic-dot.png
+share/gqradio/skins/default/pic-mhz.png
+share/gqradio/skins/default/skindata
+share/gqradio/skins/default/skindata_advanced
+share/gqradio/skins/default/skindata_menu
+share/gqradio/skins/default/skindata_presets
+share/gqradio/skins/default/skindata_presets_advanced
+share/gqradio/skins/default/skindata_submenu
+share/gqradio/skins/default/slider-pos-14h.png
+share/gqradio/skins/skyblue/back-blue.png
+share/gqradio/skins/skyblue/back-list-blue.png
+share/gqradio/skins/skyblue/back-menu-blue.png
+share/gqradio/skins/skyblue/btn-22-sizer2.png
+share/gqradio/skins/skyblue/btn-blue14-fade-close.png
+share/gqradio/skins/skyblue/btn-blue14-fade-down.png
+share/gqradio/skins/skyblue/btn-blue14-fade-iconify.png
+share/gqradio/skins/skyblue/btn-blue14-fade-up.png
+share/gqradio/skins/skyblue/btn-blue22-fade-clear.png
+share/gqradio/skins/skyblue/btn-blue22-fade-config.png
+share/gqradio/skins/skyblue/btn-blue22-fade-left.png
+share/gqradio/skins/skyblue/btn-blue22-fade-list.png
+share/gqradio/skins/skyblue/btn-blue22-fade-minus.png
+share/gqradio/skins/skyblue/btn-blue22-fade-mode3.png
+share/gqradio/skins/skyblue/btn-blue22-fade-mute.png
+share/gqradio/skins/skyblue/btn-blue22-fade-right.png
+share/gqradio/skins/skyblue/btn-blue22t-fade-add.png
+share/gqradio/skins/skyblue/btn-blue22t-fade-scan.png
+share/gqradio/skins/skyblue/digit-digital-15-aa.png
+share/gqradio/skins/skyblue/digit-digital-24-aa.png
+share/gqradio/skins/skyblue/item-cycle-6.png
+share/gqradio/skins/skyblue/item-radio-mute-large.png
+share/gqradio/skins/skyblue/item-radio-tunemode.png
+share/gqradio/skins/skyblue/item-set.png
+share/gqradio/skins/skyblue/item-signal4.png
+share/gqradio/skins/skyblue/item-volume12-shadow.png
+share/gqradio/skins/skyblue/list-back.png
+share/gqradio/skins/skyblue/list-menu-icons.png
+share/gqradio/skins/skyblue/list-menu-row20.png
+share/gqradio/skins/skyblue/list-row16.png
+share/gqradio/skins/skyblue/menu_list_icons.png
+share/gqradio/skins/skyblue/pic-dot.png
+share/gqradio/skins/skyblue/pic-mhz.png
+share/gqradio/skins/skyblue/skindata
+share/gqradio/skins/skyblue/skindata_menu
+share/gqradio/skins/skyblue/skindata_presets
+share/gqradio/skins/skyblue/skindata_submenu
+share/gqradio/skins/skyblue/slider-vert-24.png
+share/pixmaps/gqradio.png
 share/locale/fr/LC_MESSAGES/gqradio.mo
 @dirrm share/doc/gqradio
-@dirrm share/gnome/gqradio/skins/default
-@dirrm share/gnome/gqradio/skins/skyblue
-@dirrm share/gnome/gqradio/skins
-@dirrm share/gnome/gqradio
+@dirrm share/gqradio/skins/default
+@dirrm share/gqradio/skins/skyblue
+@dirrm share/gqradio/skins
+@dirrm share/gqradio
+@dirrmtry share/applications