From owner-svn-ports-head@freebsd.org Mon Nov 25 07:55:17 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1872A1CBD3D; Mon, 25 Nov 2019 07:55:17 +0000 (UTC) (envelope-from tobik@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 47Lzpr6slNz46vS; Mon, 25 Nov 2019 07:55:16 +0000 (UTC) (envelope-from tobik@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 B61D99892; Mon, 25 Nov 2019 07:55:16 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAP7tGdS040993; Mon, 25 Nov 2019 07:55:16 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAP7tGmt040991; Mon, 25 Nov 2019 07:55:16 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201911250755.xAP7tGmt040991@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 25 Nov 2019 07:55:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518383 - in head: Mk/Uses devel/py-qt5 X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head: Mk/Uses devel/py-qt5 X-SVN-Commit-Revision: 518383 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Mon, 25 Nov 2019 07:55:17 -0000 Author: tobik Date: Mon Nov 25 07:55:16 2019 New Revision: 518383 URL: https://svnweb.freebsd.org/changeset/ports/518383 Log: devel/py-qt5: Canonicalize option names /!\ py36-qt5-5.13.1: Makefile warnings, please consider fixing /!\ These options name have characters outside of [-_A-Z0-9]: core dbus dbussupport demo designer designerplugin gui multimedia multimediawidgets network opengl printsupport qml qscintilla2 quickwidgets serialport sql svg test webchannel webengine webkit webkitwidgets widgets xml xmlpatterns - While here add missing options for py-sip and py-qt5-help Approved by: kde (tcberner) Differential Revision: https://reviews.freebsd.org/D22540 Modified: head/Mk/Uses/pyqt.mk head/devel/py-qt5/Makefile Modified: head/Mk/Uses/pyqt.mk ============================================================================== --- head/Mk/Uses/pyqt.mk Mon Nov 25 07:49:08 2019 (r518382) +++ head/Mk/Uses/pyqt.mk Mon Nov 25 07:55:16 2019 (r518383) @@ -184,6 +184,7 @@ py-phonon_DESC= Python bindings for Phonon module py-qscintilla2_DESC= Python bindings for QScintilla2 py-script_DESC= Python bindings for QtScript module py-scripttools_DESC= Python bindings for QtScriptTools module +py-sip_DESC= Python bindings generator for C and C++ libraries py-sql_DESC= Python bindings for QtSql module py-svg_DESC= Python bindings for QtSvg module py-test_DESC= Python bindings for QtTest module Modified: head/devel/py-qt5/Makefile ============================================================================== --- head/devel/py-qt5/Makefile Mon Nov 25 07:49:08 2019 (r518382) +++ head/devel/py-qt5/Makefile Mon Nov 25 07:55:16 2019 (r518383) @@ -2,6 +2,7 @@ PORTNAME= qt5 PORTVERSION= ${PYQT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,16 +13,17 @@ USES= metaport python pyqt:5 USE_PYTHON= concurrent flavors py3kplist # Keep these synchronized with _USE_PYQT_ALL / _USE_PYQT5_ONLY in Mk/Use/pyqt.mk -OPTIONS_DEFINE= core dbus dbussupport demo designer \ - designerplugin gui multimedia multimediawidgets \ - network opengl printsupport qml qscintilla2 quickwidgets \ - sql serialport svg test webchannel webengine webkit \ - webkitwidgets widgets xml xmlpatterns -OPTIONS_DEFAULT=${OPTIONS_DEFINE:Nwebengine} +# portedit merge -i -e "OPTIONS_DEFINE=$(make -V _USE_PYQT_ALL:tu -V _USE_PYQT5_ONLY:tu | tr '\n' ' ')" . +OPTIONS_DEFINE= CORE DBUS DBUSSUPPORT DEMO DESIGNER DESIGNERPLUGIN GUI \ + HELP MULTIMEDIA MULTIMEDIAWIDGETS NETWORK OPENGL \ + PRINTSUPPORT QML QSCINTILLA2 QUICKWIDGETS SERIALPORT \ + SIP SQL SVG TEST WEBCHANNEL WEBENGINE WEBKIT \ + WEBKITWIDGETS WIDGETS XML XMLPATTERNS +OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NWEBENGINE} .for opt in ${OPTIONS_DEFINE} -${opt}_USE= PYQT=${opt}_run -${opt}_DESC= ${py-${opt}_DESC} +${opt}_USE= PYQT=${opt:tl}_run +${opt}_DESC= ${py-${opt:tl}_DESC} .endfor .include