From owner-svn-ports-branches@freebsd.org Tue Jan 1 15:41:47 2019 Return-Path: Delivered-To: svn-ports-branches@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 C8FD5141E024; Tue, 1 Jan 2019 15:41:47 +0000 (UTC) (envelope-from tcberner@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 69AB073826; Tue, 1 Jan 2019 15:41:47 +0000 (UTC) (envelope-from tcberner@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 4288D24096; Tue, 1 Jan 2019 15:41:47 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x01Fflar090916; Tue, 1 Jan 2019 15:41:47 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x01Ffkbx090886; Tue, 1 Jan 2019 15:41:46 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201901011541.x01Ffkbx090886@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Tue, 1 Jan 2019 15:41:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r488913 - in branches/2019Q1/multimedia: phonon phonon-designerplugin phonon-gstreamer phonon-vlc phonon-xine X-SVN-Group: ports-branches X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in branches/2019Q1/multimedia: phonon phonon-designerplugin phonon-gstreamer phonon-vlc phonon-xine X-SVN-Commit-Revision: 488913 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 69AB073826 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.954,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-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jan 2019 15:41:48 -0000 Author: tcberner Date: Tue Jan 1 15:41:46 2019 New Revision: 488913 URL: https://svnweb.freebsd.org/changeset/ports/488913 Log: MFH: r488883 multimedia/phonon*@qt4: fix automoc4 depencency after r488807 Approved by: ports-secteam (miwi) Modified: branches/2019Q1/multimedia/phonon-designerplugin/Makefile branches/2019Q1/multimedia/phonon-gstreamer/Makefile branches/2019Q1/multimedia/phonon-vlc/Makefile branches/2019Q1/multimedia/phonon-xine/Makefile branches/2019Q1/multimedia/phonon/Makefile Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/multimedia/phonon-designerplugin/Makefile ============================================================================== --- branches/2019Q1/multimedia/phonon-designerplugin/Makefile Tue Jan 1 15:40:37 2019 (r488912) +++ branches/2019Q1/multimedia/phonon-designerplugin/Makefile Tue Jan 1 15:41:46 2019 (r488913) @@ -23,7 +23,7 @@ USES= cmake:insource tar:xz . if ${FLAVOR} == qt4 DEPRECATED= Qt4 has been EOL since december 2015 EXPIRATION_DATE=2019-03-15 -USES+= kde:4 qt:4 +USES+= qt:4 USE_QT= corelib designer gui phonon \ qmake_build moc_build rcc_build uic_build PLIST_FILES= ${QT_PLUGINDIR_REL}/designer/libphononwidgets.so Modified: branches/2019Q1/multimedia/phonon-gstreamer/Makefile ============================================================================== --- branches/2019Q1/multimedia/phonon-gstreamer/Makefile Tue Jan 1 15:40:37 2019 (r488912) +++ branches/2019Q1/multimedia/phonon-gstreamer/Makefile Tue Jan 1 15:41:46 2019 (r488913) @@ -31,8 +31,7 @@ USE_XORG= x11 . if ${FLAVOR} == qt4 DEPRECATED= Qt4 has been EOL since december 2015 EXPIRATION_DATE=2019-03-15 -USES+= kde:4 qt:4 -USE_KDE= automoc4 +USES+= qt:4 USE_QT= corelib gui opengl phonon \ qmake_build moc_build rcc_build uic_build . else Modified: branches/2019Q1/multimedia/phonon-vlc/Makefile ============================================================================== --- branches/2019Q1/multimedia/phonon-vlc/Makefile Tue Jan 1 15:40:37 2019 (r488912) +++ branches/2019Q1/multimedia/phonon-vlc/Makefile Tue Jan 1 15:41:46 2019 (r488913) @@ -18,6 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LIB FLAVORS= qt5 qt4 FLAVOR?= ${FLAVORS:[1]} +qt4_BUILD_DEPENDS= automoc4:devel/automoc4 qt4_LIB_DEPENDS= libvlc.so:multimedia/vlc-qt4 qt5_LIB_DEPENDS= libvlc.so:multimedia/vlc3 @@ -26,8 +27,7 @@ USES= cmake pkgconfig tar:xz . if ${FLAVOR} == qt4 DEPRECATED= Qt4 has been EOL since december 2015 EXPIRATION_DATE=2019-03-15 -USES+= kde:4 qt:4 -USE_KDE= automoc4 +USES+= qt:4 USE_QT= corelib gui phonon \ qmake_build moc_build rcc_build uic_build PLIST_FILES= lib/kde4/plugins/phonon_backend/phonon_vlc.so \ Modified: branches/2019Q1/multimedia/phonon-xine/Makefile ============================================================================== --- branches/2019Q1/multimedia/phonon-xine/Makefile Tue Jan 1 15:40:37 2019 (r488912) +++ branches/2019Q1/multimedia/phonon-xine/Makefile Tue Jan 1 15:41:46 2019 (r488913) @@ -16,10 +16,10 @@ COMMENT= The xine backend for Phonon DEPRECATED= Qt4 has been EOL since december 2015 EXPIRATION_DATE= 2019-03-15 +BUILD_DEPENDS= automoc4:devel/automoc4 LIB_DEPENDS= libxine.so:multimedia/libxine -USES= cmake kde:4 pkgconfig qt:4 tar:bzip2 -USE_KDE= automoc4 +USES= cmake pkgconfig qt:4 tar:bzip2 USE_QT= corelib dbus gui phonon \ qmake_build moc_build rcc_build uic_build USE_XORG= xcb Modified: branches/2019Q1/multimedia/phonon/Makefile ============================================================================== --- branches/2019Q1/multimedia/phonon/Makefile Tue Jan 1 15:40:37 2019 (r488912) +++ branches/2019Q1/multimedia/phonon/Makefile Tue Jan 1 15:41:46 2019 (r488913) @@ -17,6 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LIB FLAVORS= qt5 qt4 FLAVOR?= ${FLAVORS:[1]} +qt4_BUILD_DEPENDS= automoc4:devel/automoc4 qt4_LIB_DEPENDS= libqzeitgeist.so:sysutils/qzeitgeist qt4_PKGNAMESUFFIX= -qt4 qt5_PKGNAMESUFFIX= -qt5 @@ -32,7 +33,6 @@ USE_LDCONFIG= yes . if ${FLAVOR} == qt4 DEPRECATED= Qt4 has been EOL since december 2015 EXPIRATION_DATE=2019-03-15 -BUILD_DEPENDS+= automoc4:devel/automoc4 USES+= qt:4 USE_QT= corelib dbus declarative gui testlib \ qmake_build moc_build rcc_build uic_build