From owner-svn-ports-all@FreeBSD.ORG Thu Nov 21 15:55:59 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 40EC86DD; Thu, 21 Nov 2013 15:55:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2F77E20AB; Thu, 21 Nov 2013 15:55:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rALFtxge051476; Thu, 21 Nov 2013 15:55:59 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rALFtwAg051472; Thu, 21 Nov 2013 15:55:58 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201311211555.rALFtwAg051472@svn.freebsd.org> From: Max Brazhnikov Date: Thu, 21 Nov 2013 15:55:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334498 - in head/audio: last.fm qjackctl qsampler qsynth X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Nov 2013 15:55:59 -0000 Author: makc Date: Thu Nov 21 15:55:58 2013 New Revision: 334498 URL: http://svnweb.freebsd.org/changeset/ports/334498 Log: - Get rid of QMAKEFLAGS - Use options helpers - Use globally provided LRELEASE/LUPDATE - Convert LIB_DEPENDS to new style Modified: head/audio/last.fm/Makefile head/audio/qjackctl/Makefile head/audio/qsampler/Makefile head/audio/qsynth/Makefile Modified: head/audio/last.fm/Makefile ============================================================================== --- head/audio/last.fm/Makefile Thu Nov 21 15:41:06 2013 (r334497) +++ head/audio/last.fm/Makefile Thu Nov 21 15:55:58 2013 (r334498) @@ -61,7 +61,7 @@ post-patch: post-build: cd ${WRKSRC}/src/output/RtAudio && \ - ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} && make + ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKE_ARGS} && make do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/last.fm.sh ${PREFIX}/bin/last.fm Modified: head/audio/qjackctl/Makefile ============================================================================== --- head/audio/qjackctl/Makefile Thu Nov 21 15:41:06 2013 (r334497) +++ head/audio/qjackctl/Makefile Thu Nov 21 15:55:58 2013 (r334498) @@ -31,12 +31,9 @@ MAKE_JOBS_UNSAFE=yes MAN1= qjackctl.1 -LUPDATE= ${LOCALBASE}/bin/lupdate-qt4 -LRELEASE= ${LOCALBASE}/bin/lrelease-qt4 - post-configure: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -o ${PORTNAME}.mak \ - ${QMAKEFLAGS} + ${QMAKE_ARGS} post-install: @${STRIP_CMD} ${PREFIX}/bin/${PORTNAME} Modified: head/audio/qsampler/Makefile ============================================================================== --- head/audio/qsampler/Makefile Thu Nov 21 15:41:06 2013 (r334497) +++ head/audio/qsampler/Makefile Thu Nov 21 15:55:58 2013 (r334498) @@ -14,8 +14,8 @@ COMMENT= Qt-based front end to LinuxSamp LICENSE= GPLv2 # (or later) LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= gig.10:${PORTSDIR}/audio/libgig \ - lscp.6:${PORTSDIR}/audio/liblscp +LIB_DEPENDS= libgig.so:${PORTSDIR}/audio/libgig \ + liblscp.so:${PORTSDIR}/audio/liblscp RUN_DEPENDS= linuxsampler:${PORTSDIR}/audio/linuxsampler USE_QT4= corelib gui \ @@ -30,15 +30,12 @@ CONFIGURE_ENV= ac_cv_path_ac_qmake=${QMA ac_cv_path_ac_lupdate=${LUPDATE} \ ac_cv_path_ac_lrelease=${LRELEASE} -LUPDATE= ${LOCALBASE}/bin/lupdate-qt4 -LRELEASE= ${LOCALBASE}/bin/lrelease-qt4 - post-patch: @${REINPLACE_CMD} -e 's|make -f|$$(MAKE) -f|' ${WRKSRC}/Makefile.in post-configure: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -o ${PORTNAME}.mak \ - ${QMAKEFLAGS} + ${QMAKE_ARGS} post-install: @${STRIP_CMD} ${PREFIX}/bin/qsampler Modified: head/audio/qsynth/Makefile ============================================================================== --- head/audio/qsynth/Makefile Thu Nov 21 15:41:06 2013 (r334497) +++ head/audio/qsynth/Makefile Thu Nov 21 15:55:58 2013 (r334498) @@ -15,8 +15,12 @@ LIB_DEPENDS= fluidsynth:${PORTSDIR}/audi OPTIONS_DEFINE= GRADIENT SYSTEM_TRAY OPTIONS_DEFAULT= GRADIENT SYSTEM_TRAY + GRADIENT_DESC= Gradient eye-candy +GRADIENT_CONFIGURE_OFF= --disable-gradient + SYSTEM_TRAY_DESC= System-tray icon +SYSTEM_TRAY_CONFIGURE_OFF= --disable-system-tray USE_QT4= gui linguist_build moc_build qmake_build rcc_build uic_build NO_STAGE= yes @@ -26,26 +30,16 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_path_ac_moc=${MOC} \ ac_cv_path_ac_uic=${UIC} \ ac_cv_path_ac_qmake=${QMAKE} \ - ac_cv_path_ac_lupdate=${LOCALBASE}/bin/lupdate-qt4 \ - ac_cv_path_ac_lrelease=${LOCALBASE}/bin/lrelease-qt4 + ac_cv_path_ac_lupdate=${LUPDATE} \ + ac_cv_path_ac_lrelease=${LRELEASE} CONFIGURE_ARGS= --localedir=${DATADIR} \ --with-qt=${QT_PREFIX} \ --with-fluidsynth=${LOCALBASE} INSTALLS_ICONS= yes -.include - -.if empty(PORT_OPTIONS:MGRADIENT) -CONFIGURE_ARGS+=--disable-gradient -.endif - -.if empty(PORT_OPTIONS:MSYSTEM_TRAY) -CONFIGURE_ARGS+=--disable-system-tray -.endif - post-configure: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -o qsynth.mak \ - ${QMAKEFLAGS}) + ${QMAKE_ARGS}) post-install: @${STRIP_CMD} ${PREFIX}/bin/qsynth