Index: head/audio/qmpdclient/Makefile
===================================================================
--- head/audio/qmpdclient/Makefile	(revision 394649)
+++ head/audio/qmpdclient/Makefile	(revision 394650)
@@ -1,56 +1,49 @@
 # Created by: uyamba@gmail.com
 # $FreeBSD$
 
 PORTNAME=	qmpdclient
 PORTVERSION=	1.2.2
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://dump.bitcheese.net/files/
 
 MAINTAINER=	uyamba@gmail.com
 COMMENT=	Easy to use musicpd client written in Qt4
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		tar:bzip2 qmake
+USES=		qmake tar:bzip2
 USE_QT4=	moc_build rcc_build uic_build \
 		corelib gui network xml xmlpatterns
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	DBUS NLS DEBUG
 
 DATADIR=	${PREFIX}/share/QMPDClient
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-.include  <bsd.port.options.mk>
+OPTIONS_SUB=	NLS
 
-.if ! ${PORT_OPTIONS:MNLS}
-PLIST_SUB+=	NLS="@comment "
-.else
-USE_QT4+=	linguist_build
-PLIST_SUB+=	NLS=""
-.endif
+NLS_USE=	QT4=linguisttools_build
 
-.if ${PORT_OPTIONS:MDBUS}
-USE_QT4+=	dbus
-QMAKE_ARGS+=	"CONFIG+=qdbus"
-.endif
+DBUS_QMAKE_ON=	CONFIG+=qdbus
+DBUS_USE=	QT4=dbus
 
-.if ${PORT_OPTIONS:MDEBUG}
-QMAKE_ARGS+=	"CONFIG+=debug"
-.endif
+DEBUG_QMAKE_ON=	CONFIG+=debug
+
+.include  <bsd.port.options.mk>
 
 post-patch:
 .if ! ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e '/INSTALLS += translations/d' \
 		${WRKSRC}/${PORTNAME}.pro
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
 		-e 's|lupdate|lupdate-qt4|' \
 		-e 's|lrelease|lrelease-qt4|' \
 		${WRKSRC}/${PORTNAME}.pro
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \
 		${WRKSRC}/src/notifications_dbus.cpp
 
 .include <bsd.port.mk>
Index: head/audio/qmpdclient/files/patch-qmpdclient.desktop
===================================================================
--- head/audio/qmpdclient/files/patch-qmpdclient.desktop	(revision 394649)
+++ head/audio/qmpdclient/files/patch-qmpdclient.desktop	(revision 394650)
@@ -1,10 +1,10 @@
---- qmpdclient.desktop.orig	2011-02-04 14:22:08.000000000 +0300
-+++ qmpdclient.desktop	2011-03-25 13:43:51.000000000 +0300
-@@ -4,6 +4,6 @@
+--- qmpdclient.desktop.orig	2011-06-08 09:16:26 UTC
++++ qmpdclient.desktop
+@@ -4,6 +4,6 @@ Name=QMPDClient
  GenericName=Qt4 based MPD client
  Comment=A nicer MPD client
  Exec=qmpdclient
 -Categories=Qt;Network;Music;
 +Categories=Qt;AudioVideo;Player;
  Icon=qmpdclient
  Terminal=false
Index: head/audio/qmpdclient/files/patch-qmpdclient.pro
===================================================================
--- head/audio/qmpdclient/files/patch-qmpdclient.pro	(revision 394649)
+++ head/audio/qmpdclient/files/patch-qmpdclient.pro	(revision 394650)
@@ -1,38 +1,38 @@
---- 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 @@
+--- qmpdclient.pro.orig	2011-06-08 09:16:26 UTC
++++ qmpdclient.pro
+@@ -3,7 +3,7 @@ PREFIX = /usr/local
  
  # Most people need not muck about below here
  #!contains(QT_MAJOR_VERSION, 4):error(QMPDClient requires Qt 4)
 -CONFIG += qt debug
 +CONFIG += qt
  
  # addition ldflags for release build
  QMAKE_LFLAGS_RELEASE += -O2 -g0 -s
-@@ -212,16 +212,15 @@
+@@ -212,16 +212,15 @@ unix {
          SOURCES += src/qmpdclient_x11.cpp
          LIBS += -lX11
          # Check for dbus support
 -        contains(QT_CONFIG, dbus) {
 +        contains(CONFIG, qdbus) {
              message(DBus: enabled)
 -            CONFIG += qdbus
              SOURCES += src/notifications_dbus.cpp \
              	src/qdbus_adaptor.cpp
              HEADERS += src/qdbus_adaptor.h
              DEFINES += WITH_DBUS
          }
          else {
 -            message(DBus: disabled (Qt is not compiled with dbus support))
 +            message(DBus: disabled)
              SOURCES += src/notifications_nodbus.cpp
          }
      }
-@@ -253,6 +252,7 @@
+@@ -253,6 +252,7 @@ unix {
  translations.commands = lrelease $$TRANSLATIONS
  translations.files = lang/cs_CZ.qm lang/de_DE.qm lang/es_ES.qm lang/fr_FR.qm lang/it_IT.qm lang/nl_NL.qm lang/nn_NO.qm lang/no_NO.qm lang/pt_BR.qm lang/ru_RU.qm lang/sv_SE.qm lang/tr_TR.qm lang/uk_UA.qm lang/zh_CN.qm lang/zh_TW.qm
  translations.path = $$PREFIX/share/QMPDClient/translations
 +translations.CONFIG += no_check_exist
  
  INSTALLS += translations