Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Nov 2013 01:57:13 +0000 (UTC)
From:      Alberto Villa <avilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r333638 - head/multimedia/phonon
Message-ID:  <201311130157.rAD1vDVZ003342@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
+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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311130157.rAD1vDVZ003342>