audio/kid3-kde4:

- Update to 3.2.1
- Remove QML option, which is mainly intended for developers
- Remove incorrect BROKEN on 9-i386, the actual bug was in Qt ports (PR 198738)

4 files changed, 5 insertions, 27 deletions

diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile
index b0768359e965..712caf623914 100644
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kid3
-PORTVERSION=	3.2.0
+PORTVERSION=	3.2.1
 CATEGORIES=	audio kde
 MASTER_SITES=	SF
 
@@ -14,7 +14,8 @@ USE_PERL5=	build
 USES=		cmake:outsource perl5
 CMAKE_ARGS=	-DWITH_DOCBOOKDIR=${LOCALBASE}/share/xsl/docbook \
 		-DWITH_MANDIR=man \
-		-DFFMPEG_ROOT=${LOCALBASE}
+		-DFFMPEG_ROOT=${LOCALBASE} \
+		-DWITH_QML=OFF
 CXXFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=	CHROMAPRINT FLAC ID3LIB MP4V2 VORBIS TAGLIB \
@@ -29,18 +30,10 @@ 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
-
-OPTIONS_DEFINE+=	QML
-OPTIONS_DEFAULT+=	QML
-QML_DESC=	Scripting support (using QML/JavaScript)
-QML_CMAKE_ON=	-DWITH_QML=ON
-QML_CMAKE_OFF=	-DWITH_QML=OFF
-QML_USE=	QT5=qml,quick
 .else
 # Qt 4 and KDE 4
 USE_QT4=	qmake_build moc_build rcc_build uic_build \
 		linguisttools_build
-CMAKE_ARGS+=	-DWITH_QML=OFF
 PLIST_SUB+=	QML="@comment "
 .endif
 
diff --git a/audio/kid3-kde4/distinfo b/audio/kid3-kde4/distinfo
index e1f2b18ba3d9..c9db01f167c0 100644
--- a/audio/kid3-kde4/distinfo
+++ b/audio/kid3-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kid3-3.2.0.tar.gz) = 0197ee6484e9b80ffae39867833fce04ac23ec143d4ff6f1a074af0efba1d503
-SIZE (kid3-3.2.0.tar.gz) = 1212725
+SHA256 (kid3-3.2.1.tar.gz) = da686929b5329f910b96b4fd1a10d490ffac4a604be22a795405460871afe494
+SIZE (kid3-3.2.1.tar.gz) = 1215072
diff --git a/audio/kid3-kde4/pkg-plist b/audio/kid3-kde4/pkg-plist
index 6a8e9c548cf4..793d6f3f8a82 100644
--- a/audio/kid3-kde4/pkg-plist
+++ b/audio/kid3-kde4/pkg-plist
@@ -5,10 +5,6 @@ lib/libkid3-core.so
 lib/libkid3-core.so.%%SHLIB_VER%%
 lib/libkid3-gui.so
 lib/libkid3-gui.so.%%SHLIB_VER%%
-%%QML%%lib/kid3/imports/Kid3/Kid3Script.qml
-%%QML%%lib/kid3/imports/Kid3/libkid3qml.so
-%%QML%%lib/kid3/imports/Kid3/plugins.qmltypes
-%%QML%%lib/kid3/imports/Kid3/qmldir
 %%CHROMAPRINT%%lib/kid3/libacoustidimport.so
 lib/kid3/libamazonimport.so
 lib/kid3/libdiscogsimport.so
@@ -17,7 +13,6 @@ lib/kid3/libfreedbimport.so
 %%MP4V2%%lib/kid3/libmp4v2metadata.so
 lib/kid3/libmusicbrainzimport.so
 %%OGGFLAC%%lib/kid3/liboggflacmetadata.so
-%%QML%%lib/kid3/libqmlcommand.so
 %%TAGLIB%%lib/kid3/libtaglibmetadata.so
 %%CLI%%man/de/man1/kid3-cli.1.gz
 %%QT%%man/de/man1/kid3-qt.1.gz
@@ -51,14 +46,6 @@ man/man1/kid3.1.gz
 %%KDE%%share/icons/hicolor/64x64/apps/kid3.png
 %%QT%%share/icons/hicolor/scalable/apps/kid3-qt.svg
 %%KDE%%share/icons/hicolor/scalable/apps/kid3.svgz
-%%QML%%%%DATADIR%%/qml/script/EmbedAlbumArt.qml
-%%QML%%%%DATADIR%%/qml/script/EmbedLyrics.qml
-%%QML%%%%DATADIR%%/qml/script/ExportCsv.qml
-%%QML%%%%DATADIR%%/qml/script/ExtractAlbumArt.qml
-%%QML%%%%DATADIR%%/qml/script/QmlConsole.qml
-%%QML%%%%DATADIR%%/qml/script/ReplayGain2SoundCheck.qml
-%%QML%%%%DATADIR%%/qml/script/ResizeAlbumArt.qml
-%%QML%%%%DATADIR%%/qml/script/ShowTextEncodingV1.qml
 %%DATADIR%%/translations/kid3_cs.qm
 %%DATADIR%%/translations/kid3_de.qm
 %%DATADIR%%/translations/kid3_es.qm
diff --git a/audio/kid3-qt5/Makefile b/audio/kid3-qt5/Makefile
index c0325f8272a5..490fac473527 100644
--- a/audio/kid3-qt5/Makefile
+++ b/audio/kid3-qt5/Makefile
@@ -4,7 +4,5 @@ PKGNAMESUFFIX=	-qt5
 
 COMMENT=	Qt 5 based MP3/Ogg/FLAC tag editor
 
-BROKEN_FreeBSD_9_i386=	does not build (gcc coredump)
-
 MASTERDIR=	${.CURDIR}/../kid3-kde4
 .include "${MASTERDIR}/Makefile"