From owner-svn-ports-head@freebsd.org Sun Mar 17 07:28:06 2019 Return-Path: Delivered-To: svn-ports-head@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 B29B8152A815; Sun, 17 Mar 2019 07:28:06 +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 542E46A2BC; Sun, 17 Mar 2019 07:28:06 +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 0B39068C8; Sun, 17 Mar 2019 07:28:06 +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 x2H7S5vG079566; Sun, 17 Mar 2019 07:28:05 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2H7S50s079565; Sun, 17 Mar 2019 07:28:05 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201903170728.x2H7S50s079565@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 17 Mar 2019 07:28:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496016 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 496016 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 542E46A2BC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Mar 2019 07:28:07 -0000 Author: tcberner Date: Sun Mar 17 07:28:05 2019 New Revision: 496016 URL: https://svnweb.freebsd.org/changeset/ports/496016 Log: pyqt.mk: Drop support for pyqt4. Modified: head/Mk/Uses/pyqt.mk Modified: head/Mk/Uses/pyqt.mk ============================================================================== --- head/Mk/Uses/pyqt.mk Sun Mar 17 07:26:58 2019 (r496015) +++ head/Mk/Uses/pyqt.mk Sun Mar 17 07:28:05 2019 (r496016) @@ -4,12 +4,12 @@ # # Feature: pyqt # Usage: USES=pyqt:ARGS -# Valid ARGS: 4,5 +# Valid ARGS: 5 # # MAINTAINER: kde@FreeBSD.org # # Internal Port variables for PyQt ports: -# PYQT_DIST - This port is part of PyQt4/5 itself. Variables and +# PYQT_DIST - This port is part of PyQt5 itself. Variables and # targets are then set assuming a certain tarball and # port layout. # USE_PYQT - List of PyQt components to depend on @@ -24,15 +24,15 @@ .if !defined(_INCLUDE_USES_PYQT_MK) _INCLUDE_USES_PYQT_MK= yes -# At the moment we support PyQt bindings versions 4 and 5, sip +# At the moment we support PyQt bindings versions 5, sip # option is for internal use by the py-sip ports. -_PYQT_SUPPORTED= 4 5 sip +_PYQT_SUPPORTED= 5 sip .if empty(pyqt_ARGS) IGNORE= pyqt needs a qt-version (${_PYQT_SUPPORTED}) .endif -# At the moment we support PyQt bindings versions 4 and 5 +# At the moment we support PyQt bindings versions 5 .for ver in ${_PYQT_SUPPORTED:O:u} . if ${pyqt_ARGS:M${ver}} . if empty(_PYQT_VERSION) @@ -45,6 +45,7 @@ IGNORE?= cannot be installed: different PYQT ve .if empty(_PYQT_VERSION) IGNORE?= USES=pyqt needs a version number (valid values: ${_PYQT_SUPPORTED}) +_PYQT_VERSION= 0 .endif PYQT_MAINTAINER= kde@FreeBSD.org @@ -53,8 +54,6 @@ MASTER_SITE_RIVERBANK= http://www.riverbankcomputing.c MASTER_SITES_SIP= SF/pyqt/sip/sip-${PORTVERSION} \ GENTOO -MASTER_SITES_PYQT4= SF/pyqt/PyQt4/PyQt-${PORTVERSION} \ - GENTOO MASTER_SITES_PYQT5= SF/pyqt/PyQt5/PyQt-${PORTVERSION} \ GENTOO MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \ @@ -62,26 +61,19 @@ MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${P SIP_VERSION= 4.19.13 QSCI2_VERSION= 2.10.8 -PYQT4_VERSION= 4.12.1 PYQT5_VERSION= 5.11.3 SIP_DISTNAME= sip-${SIP_VERSION} -PYQT4_DISTNAME= PyQt4_gpl_x11-${PYQT4_VERSION} -PYQT4_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo PYQT5_DISTNAME= PyQt5_gpl-${PYQT5_VERSION} PYQT5_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo QSCI2_DISTNAME= QScintilla_gpl-${QSCI2_VERSION} -PYQT4_LICENSE= GPLv3 PYQT5_LICENSE= GPLv3 -# Keep these synchronized with OPTIONS_DEFINE in devel/py-qt4 and devel/py-qt5 -# PyQt components split up into pyqt4/pyqt5/... +# Keep these synchronized with OPTIONS_DEFINE in devel/py-qt5 +# PyQt components split up into pyqt5/... _USE_PYQT_ALL= core dbus dbussupport demo designer designerplugin \ gui multimedia network opengl qscintilla2 \ sql svg test webkit xml xmlpatterns sip -# List of components only in pyqt4 -_USE_PYQT4_ONLY= assistant declarative doc \ - help phonon script scripttools # List of components only in pyqt5 _USE_PYQT5_ONLY= multimediawidgets printsupport qml quickwidgets \ serialport webchannel webengine webkitwidgets widgets