From owner-svn-ports-all@freebsd.org Mon Dec 31 18:20:51 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0065A143BF7A; Mon, 31 Dec 2018 18:20:51 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8E99E76CCF; Mon, 31 Dec 2018 18:20:50 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8136BE42E; Mon, 31 Dec 2018 18:20:50 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBVIKoTl007605; Mon, 31 Dec 2018 18:20:50 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBVIKoR7007603; Mon, 31 Dec 2018 18:20:50 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201812311820.wBVIKoR7007603@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Mon, 31 Dec 2018 18:20:50 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: in head/audio: kid3-kf5 kid3-qt5 X-SVN-Commit-Revision: 488810 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8E99E76CCF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.976,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.998,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2018 18:20:51 -0000 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