Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Nov 2019 07:55:16 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
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
Message-ID:  <201911250755.xAP7tGmt040991@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911250755.xAP7tGmt040991>