pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qt5-webengine: clean up a bit.



Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Sat Jan 8 18:06:40 2022 +0100
Changeset:	c959558281afd041eb0a0ef7aa615c78d7b72b12

Modified Files:
	py-qt5-webengine/DESCR
	py-qt5-webengine/Makefile

Log Message:
qt5-webengine: clean up a bit.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c959558281afd041eb0a0ef7aa615c78d7b72b12

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-qt5-webengine/DESCR    |  1 +
 py-qt5-webengine/Makefile | 30 ++++++++++--------------------
 2 files changed, 11 insertions(+), 20 deletions(-)

diffs:
diff --git a/py-qt5-webengine/DESCR b/py-qt5-webengine/DESCR
index e69de29bb2..2d3f3a40c1 100644
--- a/py-qt5-webengine/DESCR
+++ b/py-qt5-webengine/DESCR
@@ -0,0 +1 @@
+Python bindings for Qt5 Web Engine.
diff --git a/py-qt5-webengine/Makefile b/py-qt5-webengine/Makefile
index 0d13159611..b1166a1daa 100644
--- a/py-qt5-webengine/Makefile
+++ b/py-qt5-webengine/Makefile
@@ -3,12 +3,9 @@
 DISTNAME=	PyQtWebEngine-${PKGVERSION_NOREV}
 PKGNAME=	${PYPKGPREFIX}-qt5-webengine-5.15.5
 CATEGORIES=	x11 python
-# MASTER_SITES=	${MASTER_SITE_PYPI:=p/PyQtWebEngine/}
-MASTER_SITES=	https://files.pythonhosted.org/packages/60/66/56e118abb4cddd8e4bea6f89bdec834069b52479fb991748f1b21950811e/
-# https://files.pythonhosted.org/packages/60/66/56e118abb4cddd8e4bea6f89bdec834069b52479fb991748f1b21950811e/PyQtWebEngine-5.15.5.tar.gz
+MASTER_SITES=	${MASTER_SITE_PYPI:=P/PyQtWebEngine/}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://pypi.org/project/PyQtWebEngine
 HOMEPAGE=	https://www.riverbankcomputing.com/software/pyqtwebengine/
 COMMENT=	Python module for QtWebEngine (Chromium-based)
 LICENSE=	gnu-gpl-v3
@@ -16,33 +13,26 @@ LICENSE=	gnu-gpl-v3
 .include "../../lang/python/pyversion.mk"
 
 USE_LANGUAGES=	c c++
-USE_LIBTOOL=            yes
-USE_TOOLS+=             gmake pkg-config
+USE_LIBTOOL=	yes
+USE_TOOLS+=	gmake pkg-config
 
-CONFIGURE_ARGS+=        -d ${PREFIX}/${PYSITELIB}/PyQt5
-CONFIGURE_ARGS+=        --pyqt-sipdir ${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5
-CONFIGURE_ARGS+=        -q ${QTDIR}/bin/qmake
-CONFIGURE_ARGS+=        --sip ${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX}
+CONFIGURE_ARGS+=	-d ${PREFIX}/${PYSITELIB}/PyQt5
+CONFIGURE_ARGS+=	--pyqt-sipdir ${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5
+CONFIGURE_ARGS+=	-q ${QTDIR}/bin/qmake
+CONFIGURE_ARGS+=	--sip ${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX}
 CONFIGURE_ARGS+=	--apidir ${PREFIX}/qt5/qsci${PYVERSSUFFIX}
-CONFIGURE_ARGS+=        --verbose
+CONFIGURE_ARGS+=	--verbose
 
 PY_PATCHPLIST=		yes
 
-INSTALL_ENV+=           INSTALL_ROOT=${DESTDIR}
+INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 
-.if ${_PYTHON_VERSION} == 27
-#DEPENDS+=	${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34
-.endif
-DEPENDS+=       ${PYPKGPREFIX}-sip-qt5>=4.19.23:../../x11/py-sip-qt5
+DEPENDS+=		${PYPKGPREFIX}-sip-qt5>=4.19.23:../../x11/py-sip-qt5
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
                 ${PYTHONBIN} configure.py ${CONFIGURE_ARGS}
 
-#TODO hopefully there is a configure parameter for this?
-#post-install:
-#	cd ${PREFIX}${DESTDIR}/${PYSITELIB} && mv QtWebEngine*so PyQt5/
-
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../lang/python/extension.mk"


Home | Main Index | Thread Index | Old Index