Date: Mon, 31 Dec 2018 18:20:50 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488810 - in head/audio: kid3-kf5 kid3-qt5 Message-ID: <201812311820.wBVIKoR7007603@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Mon Dec 31 18:20:49 2018 New Revision: 488810 URL: https://svnweb.freebsd.org/changeset/ports/488810 Log: Update audio/kid3-qt5 to be the new master port for audio/kid3-kf5 and itself. Modified: head/audio/kid3-kf5/Makefile head/audio/kid3-qt5/Makefile Modified: head/audio/kid3-kf5/Makefile ============================================================================== --- head/audio/kid3-kf5/Makefile Mon Dec 31 18:19:25 2018 (r488809) +++ head/audio/kid3-kf5/Makefile Mon Dec 31 18:20:49 2018 (r488810) @@ -1,6 +1,6 @@ # $FreeBSD$ SLAVE= kf5 -MASTERDIR= ${.CURDIR}/../../audio/kid3-kde4 +MASTERDIR= ${.CURDIR}/../../audio/kid3-qt5 .include "${MASTERDIR}/Makefile" Modified: head/audio/kid3-qt5/Makefile ============================================================================== --- head/audio/kid3-qt5/Makefile Mon Dec 31 18:19:25 2018 (r488809) +++ head/audio/kid3-qt5/Makefile Mon Dec 31 18:20:49 2018 (r488810) @@ -28,45 +28,26 @@ CMAKE_ARGS= -DWITH_DOCBOOKDIR="${LOCALBASE}/share/xsl/ -DWITH_APPS="${KID3_APPS:S/ /;/gW}" PLIST_SUB+= SHLIB_VER=${PORTVERSION} -SLAVE?= kde4 -.if ${SLAVE} == qt4 || ${SLAVE} == qt5 -# Qt4 and Qt5 +SLAVE?= qt5 +.if ${SLAVE} == qt5 +# Qt5 USES+= desktop-file-utils -PLIST_SUB+= KDE="@comment " KDE4="@comment " KF5="@comment " QT="" QT_SUFX="-qt" +PLIST_SUB+= KDE="@comment " KF5="@comment " QT="" QT_SUFX="-qt" KID3_APPS+= QT .else -# KDE4 and KF5 +# KF5 PLIST_SUB+= KDE="" QT="@comment " QT_SUFX="" KID3_APPS+= KDE .endif -.if ${SLAVE} == kde4 || ${SLAVE} == qt4 -# KDE4 and Qt4 -DEPRECATED= Qt4 and KDE4 EOL upstream. Use audio/kid3-qt5 or audio/kid3-kf5 instead -EXPIRATION_DATE= 2018-12-31 - -USES+= qt:4 -USE_QT+= corelib dbus gui network xml \ - qmake_build moc_build rcc_build uic_build \ - linguisttools_build -CMAKE_ON+= WITH_QT4 -.else # KF5 and Qt5 USES+= compiler:c++11-lang qt:5 USE_QT+= core dbus gui multimedia network xml widgets \ buildtools_build linguisttools_build qmake_build CMAKE_ON+= WITH_QT5 OPTIONS_EXCLUDE+= PHONON -.endif -.if ${SLAVE} == kde4 -# KDE4 only -USES+= kde:4 -USE_KDE+= kdelibs automoc4 -USE_QT+= svg -PLIST_SUB+= KDE4="" KF5="@comment " -OPTIONS_SLAVE+= PHONON -.elif ${SLAVE} == kf5 +.if ${SLAVE} == kf5 # KF5 only USES+= desktop-file-utils kde:5 USE_KDE+= auth codecs config configwidgets coreaddons \ @@ -74,7 +55,7 @@ USE_KDE+= auth codecs config configwidgets coreaddons PLIST_SUB+= KDE4="@comment " KF5="" .endif -.for s in kde4 kf5 qt4 qt5 +.for s in kf5 qt5 . if ${SLAVE} != ${s} CONFLICTS_INSTALL+= kid3-${s} . endif @@ -109,12 +90,7 @@ TAGLIB_DESC= Various audio formats support via Taglib TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib TAGLIB_CMAKE_BOOL= WITH_TAGLIB -TEST_USE= LOCALE=en_US.UTF-8 -.if ${SLAVE} == qt4 || ${SLAVE} == kde4 -TEST_USE+= QT=qtestlib_build -.else -TEST_USE+= QT=testlib_build -.endif +TEST_USE= LOCALE=en_US.UTF-8 QT=testlib_build TEST_WRKSRC= ${BUILD_WRKSRC}/src/test TEST_VARS= KID3_APPS+=TEST
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812311820.wBVIKoR7007603>