From 24fabd36ae2e20e7936d43193034ea4b1d8db333 Mon Sep 17 00:00:00 2001
From: Tobias Kortkamp <tobik@FreeBSD.org>
Date: Mon, 25 Nov 2019 07:55:16 +0000
Subject: [PATCH] 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
---
 Mk/Uses/pyqt.mk       |  1 +
 devel/py-qt5/Makefile | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index 5ad06b2a0106..4063c6d1d98b 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -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
diff --git a/devel/py-qt5/Makefile b/devel/py-qt5/Makefile
index c1827fd7f39f..82ad72e9afba 100644
--- a/devel/py-qt5/Makefile
+++ b/devel/py-qt5/Makefile
@@ -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>