Date: Tue, 18 Aug 2015 20:02:36 +0000 (UTC) From: "Philip M. Gollucci" <pgollucci@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394650 - in head/audio/qmpdclient: . files Message-ID: <201508182002.t7IK2adM006860@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pgollucci Date: Tue Aug 18 20:02:35 2015 New Revision: 394650 URL: https://svnweb.freebsd.org/changeset/ports/394650 Log: audio/qmpdclient: qt4-linguist -> qt4-linguisttools, use OPTIONS helpers - Use OPTIONS helpers. - Use qt4-linguisttools (build time dependency) for NLS. - Sort USES. - Regenerate patches with 'make makepatch'. PR: 202112 Submitted by: s3erios@gmail.com Approved by: uyamba@gmail.com Modified: head/audio/qmpdclient/Makefile head/audio/qmpdclient/files/patch-qmpdclient.desktop head/audio/qmpdclient/files/patch-qmpdclient.pro Modified: head/audio/qmpdclient/Makefile ============================================================================== --- head/audio/qmpdclient/Makefile Tue Aug 18 20:02:30 2015 (r394649) +++ head/audio/qmpdclient/Makefile Tue Aug 18 20:02:35 2015 (r394650) @@ -13,7 +13,7 @@ COMMENT= Easy to use musicpd client writ 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 @@ -23,23 +23,16 @@ 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} Modified: head/audio/qmpdclient/files/patch-qmpdclient.desktop ============================================================================== --- head/audio/qmpdclient/files/patch-qmpdclient.desktop Tue Aug 18 20:02:30 2015 (r394649) +++ head/audio/qmpdclient/files/patch-qmpdclient.desktop Tue Aug 18 20:02:35 2015 (r394650) @@ -1,6 +1,6 @@ ---- 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 Modified: head/audio/qmpdclient/files/patch-qmpdclient.pro ============================================================================== --- head/audio/qmpdclient/files/patch-qmpdclient.pro Tue Aug 18 20:02:30 2015 (r394649) +++ head/audio/qmpdclient/files/patch-qmpdclient.pro Tue Aug 18 20:02:35 2015 (r394650) @@ -1,6 +1,6 @@ ---- 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) @@ -9,7 +9,7 @@ # 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 @@ -28,7 +28,7 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508182002.t7IK2adM006860>