3 files changed, 47 insertions, 51 deletions

diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index 00bfe6543d70..b10ddcf2f48e 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gmpc
-PORTVERSION=	0.15.0
+PORTVERSION=	0.15.1
 PORTEPOCH=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://download.sarine.nl/gmpc-0.15.0/ \
+MASTER_SITES=	http://download.sarine.nl/gmpc-${PORTVERSION}/ \
 		http://download.gna.org/kanicule/freebsd/distfiles/
 
 MAINTAINER=	mathias@monnerville.com
@@ -20,7 +20,7 @@ LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	libglade2 gnomevfs2
+USE_GNOME=	libglade2 gnomevfs2 gnomehack
 USE_GETTEXT=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -43,8 +43,4 @@ CONFIGURE_ARGS+=	--disable-mmkeys
 CONFIGURE_ARGS+=	--disable-trayicon
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,g' \
-		${WRKSRC}/data/Makefile.in
-
 .include <bsd.port.post.mk>
diff --git a/audio/gmpc/distinfo b/audio/gmpc/distinfo
index 4642fb9e88e0..7140031fc8e6 100644
--- a/audio/gmpc/distinfo
+++ b/audio/gmpc/distinfo
@@ -1,3 +1,3 @@
-MD5 (gmpc-0.15.0.tar.gz) = 00fc95f8f67a2d9c7b7d3bf58299148c
-SHA256 (gmpc-0.15.0.tar.gz) = 4d0da17757e01ec66dfaa92966344db701195f5e191bdd58420070273380804e
-SIZE (gmpc-0.15.0.tar.gz) = 764372
+MD5 (gmpc-0.15.1.tar.gz) = 91031522e576b907e888ee0509a6bc10
+SHA256 (gmpc-0.15.1.tar.gz) = 952f9319924f4b4bf27542b27ff4e70c6a66ff32ca8bad77091b3228cf6dfce1
+SIZE (gmpc-0.15.1.tar.gz) = 765419
diff --git a/audio/gmpc/pkg-plist b/audio/gmpc/pkg-plist
index 251e71b6e1b0..85ef3a1b07fc 100644
--- a/audio/gmpc/pkg-plist
+++ b/audio/gmpc/pkg-plist
@@ -11,36 +11,36 @@ include/gmpc/metadata.h
 include/gmpc/plugin.h
 libdata/pkgconfig/gmpc.pc
 share/applications/gmpc.desktop
-share/gmpc/gmpc-add-url.png
-share/gmpc/gmpc-loading-cover.png
-share/gmpc/gmpc-no-cover.png
-share/gmpc/gmpc-tray-disconnected.png
-share/gmpc/gmpc-tray-pause.png
-share/gmpc/gmpc-tray-play.png
-share/gmpc/gmpc-tray.png
-share/gmpc/gmpc-volume.png
-share/gmpc/gmpc.glade
-share/gmpc/gmpc.png
-share/gmpc/hicolor/16x16/actions/media-playlist.png
-share/gmpc/hicolor/16x16/actions/media-tag.png
-share/gmpc/hicolor/16x16/actions/playlist-browser.png
-share/gmpc/hicolor/16x16/actions/playlist-search-browser.png
-share/gmpc/hicolor/16x16/actions/tag-browser.png
-share/gmpc/hicolor/22x22/actions/media-playlist.png
-share/gmpc/hicolor/32x32/actions/media-playlist.png
-share/gmpc/hicolor/32x32/actions/media-tag.png
-share/gmpc/hicolor/32x32/actions/playlist-browser.png
-share/gmpc/hicolor/32x32/actions/playlist-search-browser.png
-share/gmpc/hicolor/32x32/actions/tag-browser.png
-share/gmpc/hicolor/48x48/actions/media-playlist.png
-share/gmpc/hicolor/48x48/actions/media-tag.png
-share/gmpc/hicolor/48x48/actions/tag-browser.png
-share/gmpc/media-album.png
-share/gmpc/media-artist.png
-share/gmpc/media-audiofile.png
-share/gmpc/media-playback-start.png
-share/gmpc/media-stream.png
-share/gmpc/playlist3.glade
+%%DATADIR%%/gmpc-add-url.png
+%%DATADIR%%/gmpc-loading-cover.png
+%%DATADIR%%/gmpc-no-cover.png
+%%DATADIR%%/gmpc-tray-disconnected.png
+%%DATADIR%%/gmpc-tray-pause.png
+%%DATADIR%%/gmpc-tray-play.png
+%%DATADIR%%/gmpc-tray.png
+%%DATADIR%%/gmpc-volume.png
+%%DATADIR%%/gmpc.glade
+%%DATADIR%%/gmpc.png
+%%DATADIR%%/hicolor/16x16/actions/media-playlist.png
+%%DATADIR%%/hicolor/16x16/actions/media-tag.png
+%%DATADIR%%/hicolor/16x16/actions/playlist-browser.png
+%%DATADIR%%/hicolor/16x16/actions/playlist-search-browser.png
+%%DATADIR%%/hicolor/16x16/actions/tag-browser.png
+%%DATADIR%%/hicolor/22x22/actions/media-playlist.png
+%%DATADIR%%/hicolor/32x32/actions/media-playlist.png
+%%DATADIR%%/hicolor/32x32/actions/media-tag.png
+%%DATADIR%%/hicolor/32x32/actions/playlist-browser.png
+%%DATADIR%%/hicolor/32x32/actions/playlist-search-browser.png
+%%DATADIR%%/hicolor/32x32/actions/tag-browser.png
+%%DATADIR%%/hicolor/48x48/actions/media-playlist.png
+%%DATADIR%%/hicolor/48x48/actions/media-tag.png
+%%DATADIR%%/hicolor/48x48/actions/tag-browser.png
+%%DATADIR%%/media-album.png
+%%DATADIR%%/media-artist.png
+%%DATADIR%%/media-audiofile.png
+%%DATADIR%%/media-playback-start.png
+%%DATADIR%%/media-stream.png
+%%DATADIR%%/playlist3.glade
 share/locale/de/LC_MESSAGES/gmpc.mo
 share/locale/fr/LC_MESSAGES/gmpc.mo
 share/locale/gl/LC_MESSAGES/gmpc.mo
@@ -48,15 +48,15 @@ share/locale/nl/LC_MESSAGES/gmpc.mo
 share/locale/pl/LC_MESSAGES/gmpc.mo
 share/locale/ru/LC_MESSAGES/gmpc.mo
 share/pixmaps/gmpc.png
-@dirrm share/gmpc/hicolor/48x48/actions
-@dirrm share/gmpc/hicolor/48x48
-@dirrm share/gmpc/hicolor/32x32/actions
-@dirrm share/gmpc/hicolor/32x32
-@dirrm share/gmpc/hicolor/22x22/actions
-@dirrm share/gmpc/hicolor/22x22
-@dirrm share/gmpc/hicolor/16x16/actions
-@dirrm share/gmpc/hicolor/16x16
-@dirrm share/gmpc/hicolor
-@dirrm include/gmpc
-@dirrm share/gmpc
+@dirrmtry %%DATADIR%%/hicolor/48x48/actions
+@dirrmtry %%DATADIR%%/hicolor/48x48
+@dirrmtry %%DATADIR%%/hicolor/32x32/actions
+@dirrmtry %%DATADIR%%/hicolor/32x32
+@dirrmtry %%DATADIR%%/hicolor/22x22/actions
+@dirrmtry %%DATADIR%%/hicolor/22x22
+@dirrmtry %%DATADIR%%/hicolor/16x16/actions
+@dirrmtry %%DATADIR%%/hicolor/16x16
+@dirrmtry %%DATADIR%%/hicolor
+@dirrm %%DATADIR%%
 @dirrmtry share/applications
+@dirrm include/gmpc