Date: Tue, 12 Nov 2013 16:50:12 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333590 - in head/audio: . kid3-kde4 kid3-kde4/files kid3-qt4 Message-ID: <201311121650.rACGoC7l018433@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Tue Nov 12 16:50:12 2013 New Revision: 333590 URL: http://svnweb.freebsd.org/changeset/ports/333590 Log: - Update to 3.0.1 - Add Qt 4 only port - Remove stale patch Added: head/audio/kid3-kde4/files/patch-CMakeLists.txt (contents, props changed) head/audio/kid3-qt4/ head/audio/kid3-qt4/Makefile (contents, props changed) Deleted: head/audio/kid3-kde4/files/patch-ffmpeg2 Modified: head/audio/Makefile head/audio/kid3-kde4/Makefile head/audio/kid3-kde4/distinfo head/audio/kid3-kde4/pkg-plist (contents, props changed) Modified: head/audio/Makefile ============================================================================== --- head/audio/Makefile Tue Nov 12 16:31:24 2013 (r333589) +++ head/audio/Makefile Tue Nov 12 16:50:12 2013 (r333590) @@ -344,6 +344,7 @@ SUBDIR += kaudiocreator SUBDIR += kexis SUBDIR += kid3-kde4 + SUBDIR += kid3-qt4 SUBDIR += kio-audiocd SUBDIR += kmix SUBDIR += kscd Modified: head/audio/kid3-kde4/Makefile ============================================================================== --- head/audio/kid3-kde4/Makefile Tue Nov 12 16:31:24 2013 (r333589) +++ head/audio/kid3-kde4/Makefile Tue Nov 12 16:50:12 2013 (r333590) @@ -1,22 +1,55 @@ # $FreeBSD$ PORTNAME= kid3 -PORTVERSION= 2.3 -PORTREVISION= 2 +PORTVERSION= 3.0.1 CATEGORIES= audio kde MASTER_SITES= SF MAINTAINER= makc@FreeBSD.org -COMMENT= MP3/Ogg/FLAC tag editor for KDE +COMMENT?= MP3/Ogg/FLAC tag editor for KDE LICENSE= GPLv2 -USE_KDE4= kdelibs kdeprefix kdehier automoc4 -USE_QT4= qmake_build moc_build rcc_build uic_build -USES= cmake gettext +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 \ + -DWITH_MANDIR=man +CXXFLAGS+= -I${LOCALBASE}/include -OPTIONS_DEFINE= FLAC ID3LIB MP4V2 VORBIS TAGLIB CHROMAPRINT +OPTIONS_DEFINE= CHROMAPRINT FLAC ID3LIB MP4V2 VORBIS TAGLIB \ + CLI OPTIONS_DEFAULT= ${OPTIONS_DEFINE} +OPTIONS_SUB= yes +NO_OPTIONS_SORT= yes + +.if defined(PKGNAMESUFFIX) +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 " + +OPTIONS_DEFINE+= PHONON +PHONON_DESC= Build with Phonon support +PHONON_CMAKE_OFF= -DWITH_PHONON=OFF +PHONON_USE= QT4=phonon +.else +CONFLICTS_INSTALL= kid3-qt4-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 @@ -46,11 +79,22 @@ 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 \ - -DWITH_FFMPEG=ON +CHROMAPRINT_CMAKE_ON= -DWITH_CHROMAPRINT=ON CHROMAPRINT_CMAKE_OFF= -DWITH_CHROMAPRINT=OFF +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MCLI} +KID3_CLI= CLI; +.endif + +.if ${PORT_OPTIONS:MFLAC} || ${PORT_OPTIONS:MVORBIS} +PLIST_SUB+= OGGFLAC="" +.else +PLIST_SUB+= OGGFLAC="@comment " +.endif + pre-configure: - ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/CMakeLists.txt + ${REINPLACE_CMD} 's,-lstdc++,,' ${WRKSRC}/src/app/qt/CMakeLists.txt .include <bsd.port.mk> Modified: head/audio/kid3-kde4/distinfo ============================================================================== --- head/audio/kid3-kde4/distinfo Tue Nov 12 16:31:24 2013 (r333589) +++ head/audio/kid3-kde4/distinfo Tue Nov 12 16:50:12 2013 (r333590) @@ -1,2 +1,2 @@ -SHA256 (kid3-2.3.tar.gz) = 8426b40b065f5a968796d1ff92da8d7a96d67cd963df837ce30ff1cf795ae301 -SIZE (kid3-2.3.tar.gz) = 1001634 +SHA256 (kid3-3.0.1.tar.gz) = ebbae8b277c14083f87d49bcde5a86295c1874c4004fc5db2d5764ff53f15d59 +SIZE (kid3-3.0.1.tar.gz) = 994466 Added: head/audio/kid3-kde4/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/kid3-kde4/files/patch-CMakeLists.txt Tue Nov 12 16:50:12 2013 (r333590) @@ -0,0 +1,13 @@ +--- ./CMakeLists.txt.orig 2013-10-29 17:19:33.000000000 +0000 ++++ ./CMakeLists.txt 2013-11-12 15:45:23.799504953 +0000 +@@ -110,8 +110,8 @@ + set(WITH_TRANSLATIONSDIR_DEFAULT "share/kid3-qt/translations") + endif (BUILD_KDE_APP OR BUILD_SHARED_LIBS) + set(WITH_BINDIR_DEFAULT "bin") +- set(WITH_LIBDIR_DEFAULT "lib${LIB_SUFFIX}/kid3") +- set(WITH_PLUGINSDIR_DEFAULT "${WITH_LIBDIR_DEFAULT}/plugins") ++ set(WITH_LIBDIR_DEFAULT "lib") ++ set(WITH_PLUGINSDIR_DEFAULT "lib/kid3") + endif (APPLE) + + set(WITH_DATAROOTDIR ${WITH_DATAROOTDIR_DEFAULT} CACHE STRING Modified: head/audio/kid3-kde4/pkg-plist ============================================================================== --- head/audio/kid3-kde4/pkg-plist Tue Nov 12 16:31:24 2013 (r333589) +++ head/audio/kid3-kde4/pkg-plist Tue Nov 12 16:50:12 2013 (r333590) @@ -1,33 +1,67 @@ -bin/kid3 -share/applications/kde4/kid3.desktop -share/apps/kid3/kid3ui.rc -share/dbus-1/interfaces/net.sourceforge.Kid3.xml -share/doc/HTML/de/kid3/common -share/doc/HTML/de/kid3/index.cache.bz2 -share/doc/HTML/de/kid3/index.docbook -share/doc/HTML/en/kid3/common -share/doc/HTML/en/kid3/index.cache.bz2 -share/doc/HTML/en/kid3/index.docbook -share/icons/hicolor/16x16/apps/kid3.png -share/icons/hicolor/32x32/apps/kid3.png -share/icons/hicolor/48x48/apps/kid3.png -share/icons/hicolor/scalable/apps/kid3.svgz -share/locale/cs/LC_MESSAGES/kid3.mo -share/locale/de/LC_MESSAGES/kid3.mo -share/locale/es/LC_MESSAGES/kid3.mo -share/locale/et/LC_MESSAGES/kid3.mo -share/locale/fi/LC_MESSAGES/kid3.mo -share/locale/fr/LC_MESSAGES/kid3.mo -share/locale/it/LC_MESSAGES/kid3.mo -share/locale/nl/LC_MESSAGES/kid3.mo -share/locale/pl/LC_MESSAGES/kid3.mo -share/locale/ru/LC_MESSAGES/kid3.mo -share/locale/sr/LC_MESSAGES/kid3.mo -share/locale/sr@ijekavian/LC_MESSAGES/kid3.mo -share/locale/sr@ijekavianlatin/LC_MESSAGES/kid3.mo -share/locale/sr@latin/LC_MESSAGES/kid3.mo -share/locale/tr/LC_MESSAGES/kid3.mo -share/locale/zh_TW/LC_MESSAGES/kid3.mo -@dirrm share/doc/HTML/en/kid3 -@dirrm share/doc/HTML/de/kid3 -@dirrm share/apps/kid3 +%%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%% +%%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 +%%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 +%%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/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/scalable/apps/kid3-qt.svg +%%KDE%%share/icons/hicolor/scalable/apps/kid3.svgz +%%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_TW.qm +@dirrm %%DATADIR%%/translations +@dirrm %%DATADIR%% +%%QT%%@dirrm share/doc/kid3-qt +%%KDE%%@dirrm share/doc/HTML/en/kid3 +%%KDE%%@dirrm share/doc/HTML/de/kid3 +%%KDE%%@dirrm share/apps/kid3 +@dirrmtry man/de/man1 +@dirrmtry man/de +@dirrm lib/kid3 Added: head/audio/kid3-qt4/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/kid3-qt4/Makefile Tue Nov 12 16:50:12 2013 (r333590) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -qt4 + +COMMENT= Qt 4 based MP3/Ogg/FLAC tag editor + +MASTERDIR= ${.CURDIR}/../kid3-kde4 +.include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311121650.rACGoC7l018433>