From owner-svn-ports-all@FreeBSD.ORG Wed Nov 13 01:57:14 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 0DDDE497; Wed, 13 Nov 2013 01:57:14 +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 D672F2978; Wed, 13 Nov 2013 01:57:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAD1vDJ6003344; Wed, 13 Nov 2013 01:57:13 GMT (envelope-from avilla@svn.freebsd.org) Received: (from avilla@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAD1vDVZ003342; Wed, 13 Nov 2013 01:57:13 GMT (envelope-from avilla@svn.freebsd.org) Message-Id: <201311130157.rAD1vDVZ003342@svn.freebsd.org> From: Alberto Villa Date: Wed, 13 Nov 2013 01:57:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333638 - head/multimedia/phonon 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: Wed, 13 Nov 2013 01:57:14 -0000 Author: avilla Date: Wed Nov 13 01:57:13 2013 New Revision: 333638 URL: http://svnweb.freebsd.org/changeset/ports/333638 Log: - Fix plist when WITH_DEBUG is set. - Add LICENSE. - Use LIB_DEPENDS new format. - Use OPTIONS helpers. Modified: head/multimedia/phonon/Makefile head/multimedia/phonon/pkg-plist Modified: head/multimedia/phonon/Makefile ============================================================================== --- head/multimedia/phonon/Makefile Wed Nov 13 01:54:10 2013 (r333637) +++ head/multimedia/phonon/Makefile Wed Nov 13 01:57:13 2013 (r333638) @@ -11,7 +11,9 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= KDE multimedia framework -LIB_DEPENDS= qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist +LICENSE= LGPL21 + +LIB_DEPENDS= libqzeitgeist.so:${PORTSDIR}/sysutils/qzeitgeist CONFLICTS= qt4-phonon-4* @@ -27,19 +29,14 @@ CMAKE_ARGS= -DPHONON_INSTALL_QT_EXTENSIO -DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF USE_LDCONFIG= yes -OPTIONS_DEFINE= PULSEAUDIO - -.include +PLIST_SUB= QT_PREFIX=${QT_PREFIX} -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio -USE_GNOME+= glib20 -CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=ON -.else -CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF -.endif +OPTIONS_DEFINE= PULSEAUDIO -PLIST_SUB+= QT_PREFIX=${QT_PREFIX} +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +PULSEAUDIO_USE= GNOME=glib20 +PULSEAUDIO_CMAKE_ON= -DWITH_PulseAudio:BOOL=ON +PULSEAUDIO_CMAKE_OFF= -DWITH_PulseAudio:BOOL=OFF post-install: ${MKDIR} ${STAGEDIR}${QT_INCDIR} Modified: head/multimedia/phonon/pkg-plist ============================================================================== --- head/multimedia/phonon/pkg-plist Wed Nov 13 01:54:10 2013 (r333637) +++ head/multimedia/phonon/pkg-plist Wed Nov 13 01:57:13 2013 (r333638) @@ -159,7 +159,7 @@ include/phonon/volumefaderinterface.h include/phonon/volumeslider.h lib/cmake/phonon/PhononConfig.cmake lib/cmake/phonon/PhononConfigVersion.cmake -lib/cmake/phonon/PhononTargets-release.cmake +lib/cmake/phonon/PhononTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/phonon/PhononTargets.cmake lib/libphonon.so lib/libphonon.so.4