aboutsummaryrefslogtreecommitdiff
path: root/multimedia/phonon
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2013-02-04 16:18:24 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2013-02-04 16:18:24 +0000
commit5561ab9dd9a4ded52f37739083dbb51438d45066 (patch)
tree73221b138108219ae9b51d40bdce2b1cdd6539db /multimedia/phonon
parent9b947220ddd549862b50feae44b632072f2caa09 (diff)
downloadports-5561ab9dd9a4ded52f37739083dbb51438d45066.tar.gz
ports-5561ab9dd9a4ded52f37739083dbb51438d45066.zip
Merge from area51 repository:
- Trip Makefile header - Convert to new options framework / rename option
Notes
Notes: svn path=/head/; revision=311634
Diffstat (limited to 'multimedia/phonon')
-rw-r--r--multimedia/phonon/Makefile29
-rw-r--r--multimedia/phonon/pkg-message4
-rw-r--r--multimedia/phonon/pkg-plist3
3 files changed, 9 insertions, 27 deletions
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 255c7f678f25..846001701b3b 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -1,7 +1,4 @@
-# New ports collection Makefile for: phonon
-# Date created: 2008-01-30
-# Whom: Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
# $FreeBSD$
PORTNAME= phonon
@@ -15,7 +12,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE multimedia framework
-LIB_DEPENDS= qzeitgeist.1:${PORTSDIR}/sysutils/qzeitgeist
+LIB_DEPENDS= qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist
CONFLICTS= qt4-phonon-4*
@@ -27,29 +24,17 @@ USE_QT4= dbus gui \
USE_XZ= yes
USE_CMAKE= yes
CMAKE_ARGS= -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE \
- -DPHONON_NO_PLATFORMPLUGIN:BOOL=TRUE
+ -DPHONON_NO_PLATFORMPLUGIN:BOOL=TRUE \
+ -DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
-OPTIONS= PULSEAUDIO "Support playback via PulseAudio" off
-# DESIGNER "Install Qt Designer plugin" off \
+OPTIONS_DEFINE= PULSEAUDIO
.include <bsd.port.options.mk>
-# qt4-designer depends on phonon. Disable this option to avoid a
-# circular dependency.
-.undef WITH_DESIGNER
-.ifdef(WITH_DESIGNER)
-USE_QT4+= designer
-CMAKE_ARGS+= -DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=ON
-PLIST_SUB+= DESIGNER=""
-.else
-CMAKE_ARGS+= -DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF
-PLIST_SUB+= DESIGNER="@comment "
-.endif
-
-.ifdef(WITH_PULSEAUDIO)
-LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
+.if ${PORT_OPTIONS:MPULSEAUDIO}
+LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio
USE_GNOME+= glib20
CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=ON
.else
diff --git a/multimedia/phonon/pkg-message b/multimedia/phonon/pkg-message
index 93eb3571a49c..a3aca2afd70c 100644
--- a/multimedia/phonon/pkg-message
+++ b/multimedia/phonon/pkg-message
@@ -1,7 +1,7 @@
======================================================================
Please, consider installing backends for Phonon:
-multimedia/phonon-gstreamer GStreamer backend
-multimedia/phonon-vlc VLC backend
+- multimedia/phonon-gstreamer GStreamer backend
+- multimedia/phonon-vlc VLC backend
======================================================================
diff --git a/multimedia/phonon/pkg-plist b/multimedia/phonon/pkg-plist
index b7d76db0ebf6..4dcd54a696c6 100644
--- a/multimedia/phonon/pkg-plist
+++ b/multimedia/phonon/pkg-plist
@@ -197,10 +197,7 @@ share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
%%QT_LIBDIR_REL%%/libphonon.so.4
%%QT_LIBDIR_REL%%/libphononexperimental.so
%%QT_LIBDIR_REL%%/libphononexperimental.so.4
-%%DESIGNER%%%%QT_PLUGINDIR_REL%%/designer/libphononwidgets.so
share/qt4/mkspecs/modules/qt_phonon.pri
@dirrmtry share/qt4/mkspecs/modules
-%%DESIGNER%%@dirrmtry %%QT_PLUGINDIR_REL%%/designer
-%%DESIGNER%%@dirrmtry %%QT_PLUGINDIR_REL%%
@dirrmtry %%QT_LIBDIR_REL%%
@dirrmtry %%QT_INCDIR_REL%%