pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-qt5-qscintilla: finish package

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Wed Nov 30 14:14:29 2022 +0100
Changeset:	533f3ddc3c20132d4c4ef33e12640e4a55181024

Modified Files:
	py-qt5-qscintilla/Makefile
	py-qt5-qscintilla/PLIST
Removed Files:
	py-qt5-qscintilla/TODO
	py-qt5-qscintilla/buildlink3.mk

Log Message:
py-qt5-qscintilla: finish package

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

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

diffstat:
 py-qt5-qscintilla/Makefile      |  19 ++----
 py-qt5-qscintilla/PLIST         | 124 ++++++++++++++++++++--------------------
 py-qt5-qscintilla/TODO          |   4 --
 py-qt5-qscintilla/buildlink3.mk |  18 ------
 4 files changed, 68 insertions(+), 97 deletions(-)

diffs:
diff --git a/py-qt5-qscintilla/Makefile b/py-qt5-qscintilla/Makefile
index fdef6c5760..98b4362956 100644
--- a/py-qt5-qscintilla/Makefile
+++ b/py-qt5-qscintilla/Makefile
@@ -6,26 +6,19 @@ PKGNAME=	${PYPKGPREFIX}-qt5-${DISTNAME:S/_src//:tl}
 COMMENT=	QScintilla -- Python bindings
 
 TOOL_DEPENDS+=	${PYPKGPREFIX}-sip6-[0-9]*:../../wip/py-sip6
+TOOL_DEPENDS+=	${PYPKGPREFIX}-qt-builder-[0-9]*:../../wip/py-qt-builder
 
-BUILD_DIRS=	Python
-PY_PATCHPLIST=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME}/Python
 
-MAKE_FLAGS+=		TARGET=Qsci.la TARGETD=Qsci.la TARGETL=Qsci.la
-INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
-LIBS+=			-lqscintilla2
-MAKE_FLAGS+=		LDFLAGS=${LDFLAGS:Q}\ ${LIBS:Q}
+WHEEL_NAME=	${DISTNAME:S/_src//}
+
+post-extract:
+	cd ${WRKSRC} && ${CP} pyproject-qt5.toml pyproject.toml
 
-# Mumble, "USE_TOOLS+=qmake".
 pre-configure:
 	${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
 
-do-build:
-	cd ${WRKSRC}/Python && ${CP} pyproject-qt5.toml pyproject.toml && sip-install
-
-DEPENDS+=       ${PYPKGPREFIX}-qt-builder-[0-9]*:../../wip/py-qt-builder
-
 .include "../../lang/python/wheel.mk"
-.include "../../lang/python/pyversion.mk"
 .include "../../wip/py-qt5/buildlink3.mk"
 BUILDLINK_API_DEPENDS.qt5-qscintilla+=	qt5-qscintilla>=${PKGVERSION_NOREV}
 .include "../../wip/qt5-qscintilla/buildlink3.mk"
diff --git a/py-qt5-qscintilla/PLIST b/py-qt5-qscintilla/PLIST
index f21facd6d6..518a579f10 100644
--- a/py-qt5-qscintilla/PLIST
+++ b/py-qt5-qscintilla/PLIST
@@ -1,62 +1,62 @@
-@comment $NetBSD: PLIST,v 1.3 2020/01/26 12:53:34 rhialto Exp $
-${PYSITELIB}/PyQt5/Qsci.pyi
-${PYSITELIB}/PyQt5/Qsci.so
-${PYSITELIB}/QScintilla-${PKGVERSION}.dist-info/INSTALLER
-${PYSITELIB}/QScintilla-${PKGVERSION}.dist-info/METADATA
-${PYSITELIB}/QScintilla-${PKGVERSION}.dist-info/RECORD
-qt5/qsci${PYVERSSUFFIX}/api/python/QScintilla2.api
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciabstractapis.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciapis.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscicommand.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscicommandset.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscidocument.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexer.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexeravs.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerbash.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerbatch.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercmake.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercoffeescript.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercpp.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercsharp.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercss.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercustom.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerd.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerdiff.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexeredifact.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerfortran.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerfortran77.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerhtml.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexeridl.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerjava.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerjavascript.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerjson.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerlua.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexermakefile.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexermarkdown.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexermatlab.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexeroctave.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerpascal.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerperl.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerpo.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerpostscript.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerpov.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerproperties.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerpython.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerruby.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerspice.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexersql.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexertcl.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexertex.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerverilog.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexervhdl.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerxml.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexeryaml.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscimacro.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscimod4.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscimod5.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscimodcommon.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciprinter.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciscintilla.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciscintillabase.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscistyle.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscistyledtext.sip
+@comment $NetBSD$
+${PYSITELIB}/PyQt5/Qsci.abi3.so
+${PYSITELIB}/PyQt5/bindings/Qsci/Qsci.toml
+${PYSITELIB}/PyQt5/bindings/Qsci/qsciabstractapis.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qsciapis.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscicommand.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscicommandset.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscidocument.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexer.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexeravs.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerbash.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerbatch.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexercmake.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexercoffeescript.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexercpp.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexercsharp.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexercss.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexercustom.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerd.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerdiff.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerfortran.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerfortran77.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerhtml.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexeridl.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerjava.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerjavascript.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerjson.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerlua.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexermakefile.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexermarkdown.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexermatlab.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexeroctave.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerpascal.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerperl.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerpo.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerpostscript.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerpov.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerproperties.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerpython.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerruby.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerspice.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexersql.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexertcl.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexertex.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerverilog.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexervhdl.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerxml.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexeryaml.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscimacro.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscimod5.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscimodcommon.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qsciprinter.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qsciscintilla.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qsciscintillabase.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscistyle.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscistyledtext.sip
+${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/REQUESTED
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/direct_url.json
diff --git a/py-qt5-qscintilla/TODO b/py-qt5-qscintilla/TODO
deleted file mode 100644
index 57094b5286..0000000000
--- a/py-qt5-qscintilla/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-These bindings will be built: Qsci.
-Generating the Qsci bindings...
-sip-install: Unable to find file "QtCore/QtCoremod.sip"
-
diff --git a/py-qt5-qscintilla/buildlink3.mk b/py-qt5-qscintilla/buildlink3.mk
deleted file mode 100644
index 1d4a6d6061..0000000000
--- a/py-qt5-qscintilla/buildlink3.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.12 2022/11/23 16:19:12 adam Exp $
-
-BUILDLINK_TREE+=	py-qt5-qscintilla
-
-.if !defined(PY_QT5_QSCINTILLA_BUILDLINK3_MK)
-PY_QT5_QSCINTILLA_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.py-qt5-qscintilla+=	${PYPKGPREFIX}-qt5-qscintilla>=2.11.2
-BUILDLINK_ABI_DEPENDS.py-qt5-qscintilla+=	${PYPKGPREFIX}-qt5-qscintilla>=2.11.5nb6
-BUILDLINK_PKGSRCDIR.py-qt5-qscintilla?=		../../x11/py-qt5-qscintilla
-
-.include "../../x11/py-sip/buildlink3.mk"
-.include "../../x11/py-qt5/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qscintilla/buildlink3.mk"
-.endif	# PY_QT5_QSCINTILLA_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-py-qt5-qscintilla
Home | Main Index | Thread Index | Old Index