- Update to 0.4.7

- Replace CPPFLAGS and LDFLAGS by USES= localbase
- Cosmetic change for documentation
- Fix build when NLS option is not set

PR:		209717
Submitted by:	<ericturgeon@ghostbsd.org> (maintainer)

4 files changed, 37 insertions, 12 deletions

diff --git a/audio/lxmusic/Makefile b/audio/lxmusic/Makefile
index b9b731e4b690..ab62a2d306de 100644
--- a/audio/lxmusic/Makefile
+++ b/audio/lxmusic/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	lxmusic
-PORTVERSION=	0.4.5
-PORTREVISION=	1
+PORTVERSION=	0.4.7
 CATEGORIES=	audio
-MASTER_SITES=	SF/ghostbsdproject/package/LXMusic/
+MASTER_SITES=	SF/lxde/LXMusic%20%28music%20player%29/LXMusic%20${PORTVERSION:R}.x/
 
 MAINTAINER=	ericturgeon@ghostbsd.org
 COMMENT=	LXDE music player based on xmms2
@@ -16,24 +15,24 @@ LICENSE_COMB=	dual
 LIB_DEPENDS=	libxmmsclient.so:audio/xmms2 \
 		libnotify.so:devel/libnotify
 
-USES=		gmake desktop-file-utils pkgconfig
+USES=		gettext-tools gmake desktop-file-utils localbase \
+		pkgconfig tar:xz
 USE_GNOME=	gtk20 intltool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
+LDFLAGS+=	-lpthread
 
 PORTDOCS=	AUTHORS README
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
-NLS_USES=	gettext
+NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=nls
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
diff --git a/audio/lxmusic/distinfo b/audio/lxmusic/distinfo
index 6dbdd2bfff28..4eeb56ca3bea 100644
--- a/audio/lxmusic/distinfo
+++ b/audio/lxmusic/distinfo
@@ -1,2 +1,3 @@
-SHA256 (lxmusic-0.4.5.tar.gz) = b9527495da616d811707c3084c0fcfe241bf74563dcffef22b1dd37a23fc5ff8
-SIZE (lxmusic-0.4.5.tar.gz) = 291221
+TIMESTAMP = 1464014391
+SHA256 (lxmusic-0.4.7.tar.xz) = 4933987338eb6e8c77d63b14cea5a8886146e75acbc38a21438c6c3f47bc06ba
+SIZE (lxmusic-0.4.7.tar.xz) = 180300
diff --git a/audio/lxmusic/files/patch-configure b/audio/lxmusic/files/patch-configure
new file mode 100644
index 000000000000..b38ff0a50375
--- /dev/null
+++ b/audio/lxmusic/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2016-02-21 00:00:57 UTC
++++ configure
+@@ -6815,7 +6815,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
+ 
+     fi
+   fi
+-     USE_NLS=yes
++     #USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no
diff --git a/audio/lxmusic/pkg-plist b/audio/lxmusic/pkg-plist
index 0923d6e367d5..006d2dd27d56 100644
--- a/audio/lxmusic/pkg-plist
+++ b/audio/lxmusic/pkg-plist
@@ -1,20 +1,24 @@
 bin/lxmusic
+man/man1/lxmusic.1.gz
 share/applications/lxmusic.desktop
 %%NLS%%share/locale/af/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/lxmusic.mo
+%%NLS%%share/locale/be/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/lxmusic.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/bn_IN/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/da/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/de/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/el/LC_MESSAGES/lxmusic.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/es/LC_MESSAGES/lxmusic.mo
-%%NLS%%share/locale/es_VE/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/et/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/fa/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/lxmusic.mo
+%%NLS%%share/locale/fo/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/frp/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/lxmusic.mo
@@ -22,25 +26,35 @@ share/applications/lxmusic.desktop
 %%NLS%%share/locale/hr/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/id/LC_MESSAGES/lxmusic.mo
+%%NLS%%share/locale/is/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/it/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/lxmusic.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/lxmusic.mo
+%%NLS%%share/locale/lg/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/ml/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/lxmusic.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/ps/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/lxmusic.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/lxmusic.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/lxmusic.mo
+%%NLS%%share/locale/te/LC_MESSAGES/lxmusic.mo
+%%NLS%%share/locale/th/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/lxmusic.mo
+%%NLS%%share/locale/tt_RU/LC_MESSAGES/lxmusic.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/lxmusic.mo
@@ -48,7 +62,7 @@ share/applications/lxmusic.desktop
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/lxmusic.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/lxmusic.mo
 %%DATADIR%%/lxmusic.ui.glade
-%%DATADIR%%/popup.ui.glade
 %%DATADIR%%/pref-dlg.ui.glade
 %%DATADIR%%/track-info.ui.glade
 share/pixmaps/lxmusic.png
+