pkgsrc-WIP-changes archive

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

*qt5-qscintilla: get further



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Tue Nov 29 11:00:50 2022 +0100
Changeset:	22be345a687ea32e1557bec8878e52975d79e9bd

Modified Files:
	py-qt5-qscintilla/Makefile
	qt5-qscintilla/Makefile.common

Log Message:
*qt5-qscintilla: get further

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

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

diffstat:
 py-qt5-qscintilla/Makefile     | 8 ++++----
 qt5-qscintilla/Makefile.common | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs:
diff --git a/py-qt5-qscintilla/Makefile b/py-qt5-qscintilla/Makefile
index 5f414c33f8..ae33005c71 100644
--- a/py-qt5-qscintilla/Makefile
+++ b/py-qt5-qscintilla/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.16 2022/11/25 13:31:34 wiz Exp $
 
-.include "../../x11/qt5-qscintilla/Makefile.common"
+.include "../../wip/qt5-qscintilla/Makefile.common"
 
 PKGNAME=	${PYPKGPREFIX}-qt5-${DISTNAME:S/_src//:tl}
 COMMENT=	QScintilla -- Python bindings
@@ -18,14 +18,14 @@ pre-configure:
 	${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
 
 do-build:
-	cd ${WRKSRC} && sip-install
+	cd ${WRKSRC}/Python && ${CP} pyproject-qt5.toml pyproject.toml && sip-install
 
 DEPENDS+=       ${PYPKGPREFIX}-qt-builder-[0-9]*:../../x11/py-qt-builder
 
 .include "../../lang/python/wheel.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../x11/py-sip5/buildlink3.mk"
-.include "../../x11/py-qt5/buildlink3.mk"
+.include "../../wip/py-qt5/buildlink3.mk"
 BUILDLINK_API_DEPENDS.qt5-qscintilla+=	qt5-qscintilla>=${PKGVERSION_NOREV}
-.include "../../x11/qt5-qscintilla/buildlink3.mk"
+.include "../../wip/qt5-qscintilla/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/qt5-qscintilla/Makefile.common b/qt5-qscintilla/Makefile.common
index 5e1983fd60..090e79310c 100644
--- a/qt5-qscintilla/Makefile.common
+++ b/qt5-qscintilla/Makefile.common
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile.common,v 1.2 2020/06/29 13:25:57 adam Exp $
 #
-# used by x11/qt5-qscintilla/Makefile
-# used by x11/py-qt5-qscintilla/Makefile
+# used by wip/qt5-qscintilla/Makefile
+# used by wip/py-qt5-qscintilla/Makefile
 
 DISTNAME=	QScintilla_src-2.13.3
 CATEGORIES=	x11
@@ -14,8 +14,8 @@ LICENSE=	gnu-gpl-v3
 USE_LANGUAGES=	c++
 USE_LIBTOOL=	yes
 
-DISTINFO_FILE=	${.CURDIR}/../../x11/qt5-qscintilla/distinfo
-PATCHDIR=	${.CURDIR}/../../x11/qt5-qscintilla/patches
+DISTINFO_FILE=	${.CURDIR}/../../wip/qt5-qscintilla/distinfo
+PATCHDIR=	${.CURDIR}/../../wip/qt5-qscintilla/patches
 
 .include "../../mk/bsd.prefs.mk"
 


Home | Main Index | Thread Index | Old Index