3 files changed, 92 insertions, 57 deletions

diff --git a/audio/qmpdclient/Makefile b/audio/qmpdclient/Makefile
index 5a40bd34ab75..2dccef717393 100644
--- a/audio/qmpdclient/Makefile
+++ b/audio/qmpdclient/Makefile
@@ -6,40 +6,45 @@
 #
 
 PORTNAME=	qmpdclient
-PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTVERSION=	1.0.9
 CATEGORIES=	audio
-MASTER_SITES=	http://havtknut.tihlde.org/qmpdclient/files/
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
-DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+MASTER_SITES=	http://havtknut.tihlde.org/qmpdclient/files/%SUBDIR%/:src,i18n
+MASTER_SITE_SUBDIR=	translations/:i18n
+DISTFILES=	${EXTRACT_ONLY}:src ${I18N_DISTFILES}
+DIST_SUBDIR=	${DISTNAME}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	uyamba@gmail.com
 COMMENT=	Easy to use musicpd client written in QT4
 
 HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build \
-		linguist_build corelib gui
+		corelib xml gui
 QMAKE_ARGS=	-unix PREFIX=${PREFIX}
 
 OPTIONS=	DBUS	"Enable D-BUS support"	off
 
 DATADIR=	${PREFIX}/share/QMPDClient
 PLIST_FILES=	bin/${PORTNAME}
-PLIST_DIRS=	${DATADIR_REL}/translations \
-		${DATADIR_REL}
 
 USE_DOS2UNIX=	qmpdclient.pro
 
-TRANSLATIONS=	de_DE nl_NL nn_NO no_NO ru_RU
+.include  <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_NLS)
+QT_COMPONENTS+=	linguist_build
+
+TRANSLATIONS=	de_DE fr_FR it_IT nl_NL nn_NO no_NO ru_RU \
+		sv_SE tr_TR zh_CN zh_TW
+
 .for lang in ${TRANSLATIONS}
-DISTFILES+=	translations/${lang}.ts
+I18N_DISTFILES+=${lang}.ts:i18n
 PLIST_FILES+=	${DATADIR_REL}/translations/${lang}.qm
 .endfor
-
-.include  <bsd.port.pre.mk>
+PLIST_DIRS=	${DATADIR_REL}/translations \
+		${DATADIR_REL}
+.endif
 
 .if defined(WITH_DBUS) && !defined(WITHOUT_DBUS)
 QT_COMPONENTS+=	dbus
@@ -51,18 +56,24 @@ do-configure:
 		${QMAKE_ARGS} qmpdclient.pro
 
 post-build:
+.if !defined(WITHOUT_NLS)
 .for lang in ${TRANSLATIONS}
 	@${QT_PREFIX}/bin/lrelease-qt4 -compress \
-		${DISTDIR}/${DIST_SUBDIR}/translations/${lang}.ts \
+		${DISTDIR}/${DIST_SUBDIR}/${lang}.ts \
 		-qm ${WRKDIR}/${lang}.qm
 .endfor
+.else
+	@${DO_NADA}
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${TARGETDIR}/${DATADIR}/translations
+.if !defined(WITHOUT_NLS)
+	${MKDIR} ${DATADIR}/translations
 .for lang in ${TRANSLATIONS}
 	${INSTALL_DATA} ${WRKDIR}/${lang}.qm \
-		${TARGETDIR}/${DATADIR}/translations/${lang}.qm
+		${DATADIR}/translations/${lang}.qm
 .endfor
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/qmpdclient/distinfo b/audio/qmpdclient/distinfo
index 4a3fef24fd04..ccdd5ee5154e 100644
--- a/audio/qmpdclient/distinfo
+++ b/audio/qmpdclient/distinfo
@@ -1,18 +1,36 @@
-MD5 (qmpdclient/qmpdclient-1.0.8.tar.gz) = 5c4d9734b83d87d98fe6ea24fb38227c
-SHA256 (qmpdclient/qmpdclient-1.0.8.tar.gz) = 2b9076a5c51b2c201f64e74b8756645427de539974fda10c8dd77dd2b7973381
-SIZE (qmpdclient/qmpdclient-1.0.8.tar.gz) = 190349
-MD5 (qmpdclient/translations/de_DE.ts) = a917107d043cf364c801204564bec6d4
-SHA256 (qmpdclient/translations/de_DE.ts) = 2fc335b6382ca15ab0e563741c059e801c31a96397179b305c5bb2aa9cb00bf7
-SIZE (qmpdclient/translations/de_DE.ts) = 33591
-MD5 (qmpdclient/translations/nl_NL.ts) = 261d84593ba1816fdd9b5d9bb4a847a9
-SHA256 (qmpdclient/translations/nl_NL.ts) = 8d34f47ee367a65283f47c5efb3dabbe5059d6108df1a8c14060d82ba15fc7ef
-SIZE (qmpdclient/translations/nl_NL.ts) = 33503
-MD5 (qmpdclient/translations/nn_NO.ts) = caa89089c13c56a19206afca6cd8d4fe
-SHA256 (qmpdclient/translations/nn_NO.ts) = 6dde1ead2f0039f4dd349c8ee1940ce4ffed11bd729ec71f9a7ad8472ad14ce9
-SIZE (qmpdclient/translations/nn_NO.ts) = 50385
-MD5 (qmpdclient/translations/no_NO.ts) = a07df71a9346203433b8399516b1cfcc
-SHA256 (qmpdclient/translations/no_NO.ts) = 95ab42d5e610dbfdc4a4166f2f976ac4bf492dd1f726cac84880f30a9fdc6d5b
-SIZE (qmpdclient/translations/no_NO.ts) = 50448
-MD5 (qmpdclient/translations/ru_RU.ts) = d9cb99815c9d2e9c60fca520fd4b001d
-SHA256 (qmpdclient/translations/ru_RU.ts) = 73e4fdd4590655c3396f75fd9747a480e438c0e5957739843d2530c7d1dae93d
-SIZE (qmpdclient/translations/ru_RU.ts) = 50043
+MD5 (qmpdclient-1.0.9/qmpdclient-1.0.9.tar.gz) = 775d9a01b64408ba58997c089c0ed0d5
+SHA256 (qmpdclient-1.0.9/qmpdclient-1.0.9.tar.gz) = 4b979cbb8429f86cca49ee5b307c3971b16e6e21f6ea303ec55638ccf5025a3b
+SIZE (qmpdclient-1.0.9/qmpdclient-1.0.9.tar.gz) = 181058
+MD5 (qmpdclient-1.0.9/de_DE.ts) = a917107d043cf364c801204564bec6d4
+SHA256 (qmpdclient-1.0.9/de_DE.ts) = 2fc335b6382ca15ab0e563741c059e801c31a96397179b305c5bb2aa9cb00bf7
+SIZE (qmpdclient-1.0.9/de_DE.ts) = 33591
+MD5 (qmpdclient-1.0.9/fr_FR.ts) = 0a1a30a6d4e28a0035a8efa2d6a89bd4
+SHA256 (qmpdclient-1.0.9/fr_FR.ts) = 75c032f0d4c057a0be9483f8926a61aa05b7aadf56ad116b4079fcea46e7f982
+SIZE (qmpdclient-1.0.9/fr_FR.ts) = 50625
+MD5 (qmpdclient-1.0.9/it_IT.ts) = 48eaafeec8f41ad27bb0668c7b1552aa
+SHA256 (qmpdclient-1.0.9/it_IT.ts) = 7f4d65957e249ec27834135dff572121f983b614a51d6a66ba568ea7e5f0135e
+SIZE (qmpdclient-1.0.9/it_IT.ts) = 46621
+MD5 (qmpdclient-1.0.9/nl_NL.ts) = 261d84593ba1816fdd9b5d9bb4a847a9
+SHA256 (qmpdclient-1.0.9/nl_NL.ts) = 8d34f47ee367a65283f47c5efb3dabbe5059d6108df1a8c14060d82ba15fc7ef
+SIZE (qmpdclient-1.0.9/nl_NL.ts) = 33503
+MD5 (qmpdclient-1.0.9/nn_NO.ts) = f18e6bd851bad9c4394f8693afe47f02
+SHA256 (qmpdclient-1.0.9/nn_NO.ts) = 8918cd8285a4523821fd47a07356770e4d55d4ab7af1a4fec9331de9d012e317
+SIZE (qmpdclient-1.0.9/nn_NO.ts) = 52469
+MD5 (qmpdclient-1.0.9/no_NO.ts) = 5fb3e92815f4150799fdb46de71e91ad
+SHA256 (qmpdclient-1.0.9/no_NO.ts) = 101523d75054133163990cb810aa54b2b05bd94e9cab136d9a399b85db412bf1
+SIZE (qmpdclient-1.0.9/no_NO.ts) = 52527
+MD5 (qmpdclient-1.0.9/ru_RU.ts) = d9cb99815c9d2e9c60fca520fd4b001d
+SHA256 (qmpdclient-1.0.9/ru_RU.ts) = 73e4fdd4590655c3396f75fd9747a480e438c0e5957739843d2530c7d1dae93d
+SIZE (qmpdclient-1.0.9/ru_RU.ts) = 50043
+MD5 (qmpdclient-1.0.9/sv_SE.ts) = ed7a304f4d07616876b0f8c7a9c32e21
+SHA256 (qmpdclient-1.0.9/sv_SE.ts) = 911e02dd1d3c4506427791a9d8ab06d6bf24e06ef4c2c6cb8a3bfdcaffbbf414
+SIZE (qmpdclient-1.0.9/sv_SE.ts) = 49689
+MD5 (qmpdclient-1.0.9/tr_TR.ts) = 310fdeb5e4b9b9a8b5c4d9206e060dce
+SHA256 (qmpdclient-1.0.9/tr_TR.ts) = 161bc6dd60e10da1effbb2a3e036180bae47e139fc8fd04485acb32f9cdfadc6
+SIZE (qmpdclient-1.0.9/tr_TR.ts) = 50289
+MD5 (qmpdclient-1.0.9/zh_CN.ts) = 61a66795ee2743a99b0d53a663a4bb07
+SHA256 (qmpdclient-1.0.9/zh_CN.ts) = 8f18409d71a42e2251a6ac41772f8713d26b6f8a9bec4b26800a5e43bff2d2b6
+SIZE (qmpdclient-1.0.9/zh_CN.ts) = 37807
+MD5 (qmpdclient-1.0.9/zh_TW.ts) = 8546e682529f1ae64bebae375f97fcfc
+SHA256 (qmpdclient-1.0.9/zh_TW.ts) = 576cef45eb5c6193c8ff61a01ba37a51fc47079307da8e9814cd7d95ef276996
+SIZE (qmpdclient-1.0.9/zh_TW.ts) = 46289
diff --git a/audio/qmpdclient/files/patch-qmpdclient.pro b/audio/qmpdclient/files/patch-qmpdclient.pro
index 13ffd453f00d..e316d8d0af14 100644
--- a/audio/qmpdclient/files/patch-qmpdclient.pro
+++ b/audio/qmpdclient/files/patch-qmpdclient.pro
@@ -1,30 +1,36 @@
---- qmpdclient.pro.orig	2007-06-27 20:44:23.000000000 +0400
-+++ qmpdclient.pro	2007-07-25 14:59:51.000000000 +0400
-@@ -1,11 +1,3 @@
+--- qmpdclient.pro.orig	2008-05-28 23:32:48.000000000 +0400
++++ qmpdclient.pro	2008-05-28 23:36:27.000000000 +0400
+@@ -1,15 +1,5 @@
 -# installation prefix on *nix/osx
 -PREFIX = /usr/local
 -
+-
 -# Most people need not muck about below here
--!contains(QT_MAJOR_VERSION, 4) {
--	error(QMPDClient requires Qt 4)
+-
+-!contains(QT_MAJOR_VERSION, 4){
+-    error(QMPDClient requires Qt 4)
 -}
 -
- CONFIG += qt release #debug
- CONFIG -= debug # Needed to avoid console on win32
+-CONFIG += qt debug # release
+-#CONFIG -= debug # Needed to avoid console on win32
++CONFIG += qt release
++CONFIG -= debug
  TEMPLATE = app
-@@ -181,13 +173,12 @@
- 	SOURCES += src/qmpdclient_x11.cpp
+ RESOURCES = qmpdclient.qrc
+ VERSION = 1.0.9
+@@ -189,13 +179,12 @@
+         SOURCES += src/qmpdclient_x11.cpp
  
- 	# Check for dbus support
--	contains(QT_CONFIG, qdbus) {
-+	contains(CONFIG, qdbus) {
- 		message(DBus notifier: enabled)
--		CONFIG += qdbus
- 		SOURCES += src/notifications_dbus.cpp
- 	}
- 	else {
--		message(DBus notifier: disabled (Qt is not compiled with dbus support))
-+		message(DBus notifier: disabled)
- 		SOURCES += src/notifications_nodbus.cpp
- 	}
-   }
+         # Check for dbus support
+-        contains(QT_CONFIG, qdbus){
++        contains(CONFIG, qdbus){
+             message(DBus notifier: enabled)
+-            CONFIG += qdbus
+             SOURCES += src/notifications_dbus.cpp
+         }
+         else {
+-            message(DBus notifier: disabled (Qt is not compiled with dbus support))
++            message(DBus notifier: disabled)
+             SOURCES += src/notifications_nodbus.cpp
+         }
+     }