svn commit: r335507 - in head/audio/kid3-kde4: . files

[Max Brazhnikov]

Author: makc
Date: Mon Dec  2 16:10:20 2013
New Revision: 335507
URL: http://svnweb.freebsd.org/changeset/ports/335507

Log:
  - Restore PHONON option for kid-qt4 (and add patch to fix build)
  - Prepare for Qt 5 port

Added:
  head/audio/kid3-kde4/files/patch-src__app__cli__kid3cli.cpp   (contents, props changed)
Modified:
  head/audio/kid3-kde4/Makefile

Modified: head/audio/kid3-kde4/Makefile
==============================================================================
--- head/audio/kid3-kde4/Makefile	Mon Dec  2 16:07:53 2013	(r335506)
+++ head/audio/kid3-kde4/Makefile	Mon Dec  2 16:10:20 2013	(r335507)
@@ -10,8 +10,6 @@ COMMENT?=	MP3/Ogg/FLAC tag editor for KD
 
 LICENSE=	GPLv2
 
-USE_QT4=	qmake_build moc_build rcc_build uic_build \
-		linguist_build
 USE_PERL5=	build
 USES=		cmake:outsource perl5
 CMAKE_ARGS=	-DWITH_DOCBOOKDIR=${LOCALBASE}/share/xsl/docbook \
@@ -24,18 +22,41 @@ OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 OPTIONS_SUB=	yes
 NO_OPTIONS_SORT=	yes
 
+.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt5"
+CONFLICTS_INSTALL+=	kid3-qt4-3.*
+
+USE_QT5=	core dbus gui multimedia network testlib xml widgets \
+		buildtools_build linguisttools_build qmake_build
+CMAKE_ARGS+=	-DWITH_QT5=true
+.else
+# Qt 4 and KDE 4
+USE_QT4=	qmake_build moc_build rcc_build uic_build \
+		linguist_build
+.endif
+
+.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4"
+CONFLICTS_INSTALL+=	kid3-qt5-3.*
+
+USE_QT4+=	corelib dbus gui network xml
+
+OPTIONS_DEFINE+=	PHONON
+PHONON_DESC=	Build with Phonon support
+PHONON_CMAKE_OFF=	-DWITH_PHONON=OFF
+PHONON_USE=	QT4=phonon
+.endif
+
 .if defined(PKGNAMESUFFIX)
-CONFLICTS_INSTALL=	kid3-3.*
+# Qt 4 and Qt 5
+CONFLICTS_INSTALL+=	kid3-3.*
 
 BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 
 USES+=		desktop-file-utils
-USE_QT4+=	corelib dbus gui network phonon xml
 USE_GNOME=	libxslt:build
 CMAKE_ARGS+=	-DWITH_APPS="${KID3_CLI}QT"
 PLIST_SUB+=	QT="" KDE="@comment "
 .else
-CONFLICTS_INSTALL=	kid3-qt4-3.*
+CONFLICTS_INSTALL+=	kid3-qt4-3.* kid3-qt5-3.*
 
 USE_KDE4=	kdelibs automoc4 kdeprefix
 CMAKE_ARGS+=	-DWITH_APPS="${KID3_CLI}KDE"

Added: head/audio/kid3-kde4/files/patch-src__app__cli__kid3cli.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/kid3-kde4/files/patch-src__app__cli__kid3cli.cpp	Mon Dec  2 16:10:20 2013	(r335507)
@@ -0,0 +1,14 @@
+--- ./src/app/cli/kid3cli.cpp.orig	2013-11-29 06:55:07.000000000 +0000
++++ ./src/app/cli/kid3cli.cpp	2013-12-02 14:35:10.196660693 +0000
+@@ -276,7 +276,10 @@
+          << new CopyCommand(this)
+          << new PasteCommand(this)
+          << new RemoveCommand(this)
+-         << new PlayCommand(this);
++#if defined HAVE_PHONON || QT_VERSION >= 0x050000
++         << new PlayCommand(this)
++#endif
++         ;
+   connect(m_app, SIGNAL(fileSelectionUpdateRequested()),
+           this, SLOT(updateSelectedFiles()));
+   connect(m_app, SIGNAL(selectedFilesUpdated()),