From b9723f5eb059836be694bcf60d84f737ac558bd0 Mon Sep 17 00:00:00 2001 From: fluffy Date: Tue, 11 May 2010 10:09:51 +0000 Subject: - The FreeBSD KDE team is pleased to announce Qt-4.6.2 for FreeBSD With hat on: kde@ --- multimedia/qt4-multimedia/Makefile | 1 - multimedia/qt4-phonon-gst/Makefile | 3 +-- multimedia/qt4-phonon/Makefile | 3 +-- multimedia/qt4-phonon/pkg-plist | 1 + 4 files changed, 3 insertions(+), 5 deletions(-) (limited to 'multimedia') diff --git a/multimedia/qt4-multimedia/Makefile b/multimedia/qt4-multimedia/Makefile index 51346879f5e0..573f03d20be8 100644 --- a/multimedia/qt4-multimedia/Makefile +++ b/multimedia/qt4-multimedia/Makefile @@ -7,7 +7,6 @@ PORTNAME= multimedia PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES?= multimedia PKGNAMEPREFIX= qt4- diff --git a/multimedia/qt4-phonon-gst/Makefile b/multimedia/qt4-phonon-gst/Makefile index 868c0083e413..0ff7ea34b0a9 100644 --- a/multimedia/qt4-phonon-gst/Makefile +++ b/multimedia/qt4-phonon-gst/Makefile @@ -7,7 +7,6 @@ PORTNAME= phonon PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES?= multimedia PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -gst @@ -46,7 +45,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure -.if defined(WITH_KDE_PHONON) +.if !defined(WITH_QT_PHONON) IGNORE= conflicts with multimedia/phonon-gstreamer. You have defined WITH_KDE_PHONON to override Qt4 phonon .endif diff --git a/multimedia/qt4-phonon/Makefile b/multimedia/qt4-phonon/Makefile index 1156c5128568..9fae43627f0d 100644 --- a/multimedia/qt4-phonon/Makefile +++ b/multimedia/qt4-phonon/Makefile @@ -7,7 +7,6 @@ PORTNAME= phonon PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES?= multimedia PKGNAMEPREFIX= qt4- @@ -49,7 +48,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure .include -.if defined(WITH_KDE_PHONON) +.if !defined(WITH_QT_PHONON) IGNORE= conflicts with multimedia/phonon. You have defined WITH_KDE_PHONON to override Qt4 phonon .endif diff --git a/multimedia/qt4-phonon/pkg-plist b/multimedia/qt4-phonon/pkg-plist index f85ff269236e..d306ac2b6f93 100644 --- a/multimedia/qt4-phonon/pkg-plist +++ b/multimedia/qt4-phonon/pkg-plist @@ -32,6 +32,7 @@ include/qt4/phonon/ObjectDescriptionData include/qt4/phonon/ObjectDescriptionModel include/qt4/phonon/ObjectDescriptionModelData include/qt4/phonon/Path +include/qt4/phonon/Phonon include/qt4/phonon/PlatformPlugin include/qt4/phonon/SeekSlider include/qt4/phonon/StreamInterface -- cgit