Index: head/audio/kid3-kde4/Makefile =================================================================== --- head/audio/kid3-kde4/Makefile (revision 395454) +++ head/audio/kid3-kde4/Makefile (revision 395455) @@ -1,124 +1,117 @@ # $FreeBSD$ PORTNAME= kid3 -PORTVERSION= 3.2.0 +PORTVERSION= 3.2.1 CATEGORIES= audio kde MASTER_SITES= SF MAINTAINER= makc@FreeBSD.org COMMENT?= MP3/Ogg/FLAC tag editor for KDE LICENSE= GPLv2 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 \ CLI 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 - -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 .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) # 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_GNOME= libxslt:build CMAKE_ARGS+= -DWITH_APPS="${KID3_CLI}QT" PLIST_SUB+= QT="" KDE="@comment " .else CONFLICTS_INSTALL+= kid3-qt4-3.* kid3-qt5-3.* USE_KDE4= kdelibs automoc4 kdeprefix CMAKE_ARGS+= -DWITH_APPS="${KID3_CLI}KDE" PLIST_SUB+= QT="@comment " KDE="" .endif PLIST_SUB+= SHLIB_VER=${PORTVERSION} CLI_DESC= Build and install command line utility CLI_USES= readline FLAC_DESC= Support for FLAC files FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac FLAC_CMAKE_ON= -DWITH_FLAC=ON FLAC_CMAKE_OFF= -DWITH_FLAC=OFF ID3LIB_DESC= Support for mp3 files ID3LIB_LIB_DEPENDS= libid3.so:${PORTSDIR}/audio/id3lib ID3LIB_CMAKE_ON= -DWITH_ID3LIB=ON ID3LIB_CMAKE_OFF= -DWITH_ID3LIB=OFF MP4V2_DESC= Support for mp4 files MP4V2_LIB_DEPENDS= libmp4v2.so:${PORTSDIR}/multimedia/mp4v2 MP4V2_CMAKE_ON= -DWITH_MP4V2=ON MP4V2_CMAKE_OFF= -DWITH_MP4V2=OFF VORBIS_DESC= Support for Ogg/Vorbis files VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis \ libogg.so:${PORTSDIR}/audio/libogg VORBIS_CMAKE_ON= -DWITH_VORBIS=ON VORBIS_CMAKE_OFF= -DWITH_VORBIS=OFF TAGLIB_DESC= Support for various audio formats TAGLIB_LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib TAGLIB_CMAKE_ON= -DWITH_TAGLIB=ON TAGLIB_CMAKE_OFF= -DWITH_TAGLIB=OFF CHROMAPRINT_DESC= Support for Chromaprint audio fingerprints CHROMAPRINT_LIB_DEPENDS= libchromaprint.so:${PORTSDIR}/audio/chromaprint CHROMAPRINT_CMAKE_ON= -DWITH_CHROMAPRINT=ON CHROMAPRINT_CMAKE_OFF= -DWITH_CHROMAPRINT=OFF .include .if ${PORT_OPTIONS:MCLI} KID3_CLI= CLI; .endif .if ${PORT_OPTIONS:MFLAC} || ${PORT_OPTIONS:MVORBIS} PLIST_SUB+= OGGFLAC="" .else PLIST_SUB+= OGGFLAC="@comment " .endif .include Index: head/audio/kid3-kde4/distinfo =================================================================== --- head/audio/kid3-kde4/distinfo (revision 395454) +++ head/audio/kid3-kde4/distinfo (revision 395455) @@ -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 Index: head/audio/kid3-kde4/pkg-plist =================================================================== --- head/audio/kid3-kde4/pkg-plist (revision 395454) +++ head/audio/kid3-kde4/pkg-plist (revision 395455) @@ -1,78 +1,65 @@ %%KDE%%bin/kid3 %%CLI%%bin/kid3-cli %%QT%%bin/kid3-qt 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 lib/kid3/libfreedbimport.so %%ID3LIB%%lib/kid3/libid3libmetadata.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 man/de/man1/kid3.1.gz %%CLI%%man/man1/kid3-cli.1.gz %%QT%%man/man1/kid3-qt.1.gz man/man1/kid3.1.gz %%QT%%share/appdata/kid3-qt.appdata.xml %%KDE%%share/appdata/kid3.appdata.xml %%KDE%%share/applications/kde4/kid3.desktop %%QT%%share/applications/kid3-qt.desktop %%KDE%%share/apps/kid3/kid3ui.rc %%KDE%%share/dbus-1/interfaces/net.sourceforge.Kid3.xml %%KDE%%share/doc/HTML/de/kid3/common %%KDE%%share/doc/HTML/de/kid3/index.cache.bz2 %%KDE%%share/doc/HTML/de/kid3/index.docbook %%KDE%%share/doc/HTML/en/kid3/common %%KDE%%share/doc/HTML/en/kid3/index.cache.bz2 %%KDE%%share/doc/HTML/en/kid3/index.docbook %%QT%%share/doc/kid3-qt/kid3_de.html %%QT%%share/doc/kid3-qt/kid3_en.html %%QT%%share/icons/hicolor/128x128/apps/kid3-qt.png %%KDE%%share/icons/hicolor/128x128/apps/kid3.png %%QT%%share/icons/hicolor/16x16/apps/kid3-qt.png %%KDE%%share/icons/hicolor/16x16/apps/kid3.png %%QT%%share/icons/hicolor/32x32/apps/kid3-qt.png %%KDE%%share/icons/hicolor/32x32/apps/kid3.png %%QT%%share/icons/hicolor/48x48/apps/kid3-qt.png %%KDE%%share/icons/hicolor/48x48/apps/kid3.png %%QT%%share/icons/hicolor/64x64/apps/kid3-qt.png %%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 %%DATADIR%%/translations/kid3_et.qm %%DATADIR%%/translations/kid3_fi.qm %%DATADIR%%/translations/kid3_fr.qm %%DATADIR%%/translations/kid3_it.qm %%DATADIR%%/translations/kid3_nl.qm %%DATADIR%%/translations/kid3_pl.qm %%DATADIR%%/translations/kid3_ru.qm %%DATADIR%%/translations/kid3_sr.qm %%DATADIR%%/translations/kid3_sr@ijekavian.qm %%DATADIR%%/translations/kid3_sr@ijekavianlatin.qm %%DATADIR%%/translations/kid3_sr@latin.qm %%DATADIR%%/translations/kid3_tr.qm %%DATADIR%%/translations/kid3_zh_CN.qm %%DATADIR%%/translations/kid3_zh_TW.qm Index: head/audio/kid3-qt5/Makefile =================================================================== --- head/audio/kid3-qt5/Makefile (revision 395454) +++ head/audio/kid3-qt5/Makefile (revision 395455) @@ -1,10 +1,8 @@ # $FreeBSD$ 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"