4 files changed, 30 insertions, 29 deletions

diff --git a/audio/qmpdclient/Makefile b/audio/qmpdclient/Makefile
index 729464aad647..008624a43dda 100644
--- a/audio/qmpdclient/Makefile
+++ b/audio/qmpdclient/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qmpdclient
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	audio
 MASTER_SITES=	http://dump.bitcheese.net/files/
 
@@ -21,26 +21,27 @@ RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hico
 USE_BZIP2=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build \
-		corelib gui network webkit xml xmlpatterns
+		corelib gui network xml xmlpatterns
 MAKE_JOBS_SAFE=	yes
 INSTALLS_ICONS=	yes
 QMAKE_ARGS=	${QMAKE_PRO}
 QMAKE_PRO=	${PORTNAME}.pro
 
-OPTIONS=	DBUS	"Enable D-BUS support"	off
+OPTIONS=	DBUS	"Enable D-BUS support"	off \
+		NLS	"Enable National Language Support" on
 
 DATADIR=	${PREFIX}/share/QMPDClient
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include  <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_NLS)
+.if defined(WITHOUT_NLS)
+PLIST_SUB+=	NLS="@comment "
+.else
 QT_COMPONENTS+=	linguist_build
+PLIST_SUB+=	NLS=""
 .endif
 
-# TRANSLATIONS=	cs_CZ de_DE es_ES fr_FR it_IT nl_NL nn_NO no_NO \
-# 		pt_BR ru_RU sv_SE tr_TR uk_UA zh_CN zh_TW
-
 .if defined(WITH_DBUS) && !defined(WITHOUT_DBUS)
 QT_COMPONENTS+=	dbus
 QMAKEFLAGS+=	"CONFIG+=qdbus"
diff --git a/audio/qmpdclient/distinfo b/audio/qmpdclient/distinfo
index 2f2d3a749cf7..bb7627954949 100644
--- a/audio/qmpdclient/distinfo
+++ b/audio/qmpdclient/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qmpdclient-1.2.1.tar.bz2) = 9d57ffbf2985c1dbc9e8856e9c5edf5171e85152d8cf58ad692e85233a9b0773
-SIZE (qmpdclient-1.2.1.tar.bz2) = 271243
+SHA256 (qmpdclient-1.2.2.tar.bz2) = ed65705eaae8fb10fdce34ce20e010757a87423c2874479e1466e4368a866289
+SIZE (qmpdclient-1.2.2.tar.bz2) = 271565
diff --git a/audio/qmpdclient/files/patch-qmpdclient.pro b/audio/qmpdclient/files/patch-qmpdclient.pro
index 6a2e95509a1d..3c5363ec1988 100644
--- a/audio/qmpdclient/files/patch-qmpdclient.pro
+++ b/audio/qmpdclient/files/patch-qmpdclient.pro
@@ -1,5 +1,5 @@
---- qmpdclient.pro.orig	2011-02-04 14:22:08.000000000 +0300
-+++ qmpdclient.pro	2011-03-25 12:52:30.000000000 +0300
+--- qmpdclient.pro.orig	2011-06-08 13:16:26.000000000 +0400
++++ qmpdclient.pro	2011-09-21 14:18:07.000000000 +0400
 @@ -3,7 +3,7 @@
  
  # Most people need not muck about below here
@@ -11,7 +11,7 @@
  QMAKE_LFLAGS_RELEASE += -O2 -g0 -s
 @@ -212,16 +212,15 @@
          SOURCES += src/qmpdclient_x11.cpp
- 
+         LIBS += -lX11
          # Check for dbus support
 -        contains(QT_CONFIG, dbus) {
 +        contains(CONFIG, qdbus) {
diff --git a/audio/qmpdclient/pkg-plist b/audio/qmpdclient/pkg-plist
index 9f868dfba64e..e6ca2fe8ba5b 100644
--- a/audio/qmpdclient/pkg-plist
+++ b/audio/qmpdclient/pkg-plist
@@ -1,25 +1,25 @@
 bin/qmpdclient
-share/QMPDClient/translations/cs_CZ.qm
-share/QMPDClient/translations/de_DE.qm
-share/QMPDClient/translations/es_ES.qm
-share/QMPDClient/translations/fr_FR.qm
-share/QMPDClient/translations/it_IT.qm
-share/QMPDClient/translations/nl_NL.qm
-share/QMPDClient/translations/nn_NO.qm
-share/QMPDClient/translations/no_NO.qm
-share/QMPDClient/translations/pt_BR.qm
-share/QMPDClient/translations/ru_RU.qm
-share/QMPDClient/translations/sv_SE.qm
-share/QMPDClient/translations/tr_TR.qm
-share/QMPDClient/translations/uk_UA.qm
-share/QMPDClient/translations/zh_CN.qm
-share/QMPDClient/translations/zh_TW.qm
+%%NLS%%share/QMPDClient/translations/cs_CZ.qm
+%%NLS%%share/QMPDClient/translations/de_DE.qm
+%%NLS%%share/QMPDClient/translations/es_ES.qm
+%%NLS%%share/QMPDClient/translations/fr_FR.qm
+%%NLS%%share/QMPDClient/translations/it_IT.qm
+%%NLS%%share/QMPDClient/translations/nl_NL.qm
+%%NLS%%share/QMPDClient/translations/nn_NO.qm
+%%NLS%%share/QMPDClient/translations/no_NO.qm
+%%NLS%%share/QMPDClient/translations/pt_BR.qm
+%%NLS%%share/QMPDClient/translations/ru_RU.qm
+%%NLS%%share/QMPDClient/translations/sv_SE.qm
+%%NLS%%share/QMPDClient/translations/tr_TR.qm
+%%NLS%%share/QMPDClient/translations/uk_UA.qm
+%%NLS%%share/QMPDClient/translations/zh_CN.qm
+%%NLS%%share/QMPDClient/translations/zh_TW.qm
 share/applications/qmpdclient.desktop
 share/icons/hicolor/16x16/apps/qmpdclient.png
 share/icons/hicolor/22x22/apps/qmpdclient.png
 share/icons/hicolor/48x48/apps/qmpdclient.png
 share/icons/hicolor/64x64/apps/qmpdclient.png
 share/icons/hicolor/scalable/apps/qmpdclient.svg
-@dirrm share/QMPDClient/translations
-@dirrm share/QMPDClient
+@dirrmtry share/QMPDClient/translations
+@dirrmtry share/QMPDClient
 @dirrmtry share/applications