Fix qt5-qscintilla paths

[Adam Ciarciński <aciarcinski%teonite.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Fri Jun 26 13:51:58 2020 +0200
Changeset:	f02a87620af694466b6e61088863ec395cd3588a

Modified Files:
	py-qt5-qscintilla/Makefile
	py-qt5-qscintilla/buildlink3.mk
	qt5-qscintilla/Makefile.common
	qt5-qscintilla/buildlink3.mk
Removed Files:
	qt5-qscintilla/patches/patch-qsciapis.cpp
	qt5-qscintilla/patches/patch-qscintilla.pro

Log Message:
Fix qt5-qscintilla paths

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

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

diffstat:
 py-qt5-qscintilla/Makefile                  |  4 +--
 py-qt5-qscintilla/buildlink3.mk             |  6 ++--
 qt5-qscintilla/Makefile.common              |  8 ++---
 qt5-qscintilla/buildlink3.mk                |  4 +--
 qt5-qscintilla/patches/patch-qsciapis.cpp   | 47 -----------------------------
 qt5-qscintilla/patches/patch-qscintilla.pro | 17 -----------
 6 files changed, 11 insertions(+), 75 deletions(-)

diffs:
diff --git a/py-qt5-qscintilla/Makefile b/py-qt5-qscintilla/Makefile
index 54cd761986..6b3f1f51d8 100644
--- a/py-qt5-qscintilla/Makefile
+++ b/py-qt5-qscintilla/Makefile
@@ -24,8 +24,8 @@ do-configure:
 		--apidir=${QTDIR}/qsci${PYVERSSUFFIX}
 
 .include "../../lang/python/extension.mk"
-.include "../../wip/py-sip/buildlink3.mk"
-.include "../../wip/py-qt5/buildlink3.mk"
+.include "../../x11/py-sip/buildlink3.mk"
+.include "../../x11/py-qt5/buildlink3.mk"
 BUILDLINK_API_DEPENDS.qt5-qscintilla+=	qt5-qscintilla>=${PKGVERSION_NOREV}
 .include "../../wip/qt5-qscintilla/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-qt5-qscintilla/buildlink3.mk b/py-qt5-qscintilla/buildlink3.mk
index 00d3268436..64f8a13251 100644
--- a/py-qt5-qscintilla/buildlink3.mk
+++ b/py-qt5-qscintilla/buildlink3.mk
@@ -9,9 +9,9 @@ BUILDLINK_API_DEPENDS.py-qt5-qscintilla+=	${PYPKGPREFIX}-qt5-qscintilla>=2.11.2
 BUILDLINK_ABI_DEPENDS.py-qt5-qscintilla+=	${PYPKGPREFIX}-qt5-qscintilla>=2.11.2nb7
 BUILDLINK_PKGSRCDIR.py-qt5-qscintilla?=		../../wip/py-qt5-qscintilla
 
-.include "../../wip/py-sip/buildlink3.mk"
-.include "../../wip/py-qt5/buildlink3.mk"
-.include "../../wip/qt5-qtbase/buildlink3.mk"
+.include "../../x11/py-sip/buildlink3.mk"
+.include "../../x11/py-qt5/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../wip/qt5-qscintilla/buildlink3.mk"
 .endif	# PY_QT5_QSCINTILLA_BUILDLINK3_MK
 
diff --git a/qt5-qscintilla/Makefile.common b/qt5-qscintilla/Makefile.common
index 9d658c4ee7..1aff581c43 100644
--- a/qt5-qscintilla/Makefile.common
+++ b/qt5-qscintilla/Makefile.common
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile.common,v 1.1 2019/10/29 17:45:24 kamil 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-2.11.5
 CATEGORIES=	x11
@@ -20,6 +20,6 @@ PATCHDIR=	${.CURDIR}/../../wip/qt5-qscintilla/patches
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
-.include "../../wip/qt5-qtmacextras/buildlink3.mk"
+.include "../../x11/qt5-qtmacextras/buildlink3.mk"
 .endif
-.include "../../wip/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/qt5-qscintilla/buildlink3.mk b/qt5-qscintilla/buildlink3.mk
index 03045fd391..46b316495c 100644
--- a/qt5-qscintilla/buildlink3.mk
+++ b/qt5-qscintilla/buildlink3.mk
@@ -12,9 +12,9 @@ BUILDLINK_PKGSRCDIR.qt5-qscintilla?=	../../wip/qt5-qscintilla
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
-.include "../../wip/qt5-qtmacextras/buildlink3.mk"
+.include "../../x11/qt5-qtmacextras/buildlink3.mk"
 .endif
-.include "../../wip/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .endif	# QT5_QSCINTILLA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-qt5-qscintilla
diff --git a/qt5-qscintilla/patches/patch-qsciapis.cpp b/qt5-qscintilla/patches/patch-qsciapis.cpp
deleted file mode 100644
index 3a164d0616..0000000000
--- a/qt5-qscintilla/patches/patch-qsciapis.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-qsciapis.cpp,v 1.1 2020/01/26 12:54:15 rhialto Exp $
-
-Search in qt5/qsci*/api/.../*.api.
-
---- qsciapis.cpp.orig	2019-06-25 12:49:27.000000000 +0000
-+++ qsciapis.cpp
-@@ -982,6 +982,7 @@ QString QsciAPIs::prepName(const QString
- // Return installed API files.
- QStringList QsciAPIs::installedAPIFiles() const
- {
-+#if 0
-     QString qtdir = QLibraryInfo::location(QLibraryInfo::DataPath);
- 
-     QDir apidir = QDir(QString("%1/qsci/api/%2").arg(qtdir).arg(lexer()->lexer()));
-@@ -996,4 +997,32 @@ QStringList QsciAPIs::installedAPIFiles(
-         filenames << fi.absoluteFilePath();
- 
-     return filenames;
-+#endif
-+
-+    QString datapath = QLibraryInfo::location(QLibraryInfo::DataPath);
-+    QString lexerdir = lexer()->lexer();
-+
-+    QStringList filenames;
-+
-+    QStringList filters;
-+    filters << "*.api";
-+
-+    QStringList qscifilters;
-+    qscifilters << "qsci*";
-+
-+    // Find QTDIR/qsci*/api/LEXER/*.api
-+    QDir datadir = QDir(datapath);
-+    QFileInfoList dlist = datadir.entryInfoList(qscifilters, QDir::AllDirs, QDir::IgnoreCase);
-+
-+    foreach (QFileInfo di, dlist) {
-+	QString qscidir = di.absoluteFilePath();
-+	QDir apidir = QDir(QString("%1/api/%2").arg(qscidir).arg(lexerdir));
-+
-+	QFileInfoList flist = apidir.entryInfoList(filters, QDir::Files, QDir::IgnoreCase);
-+
-+	foreach (QFileInfo fi, flist)
-+	    filenames << fi.absoluteFilePath();
-+    }
-+
-+    return filenames;
- }
diff --git a/qt5-qscintilla/patches/patch-qscintilla.pro b/qt5-qscintilla/patches/patch-qscintilla.pro
deleted file mode 100644
index b32a8c5764..0000000000
--- a/qt5-qscintilla/patches/patch-qscintilla.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-qscintilla.pro,v 1.1 2020/03/08 20:55:17 brook Exp $
-
-Add full path to installed library names on Darwin.
-
---- qscintilla.pro.orig	2019-06-25 12:49:27.000000000 +0000
-+++ qscintilla.pro
-@@ -95,6 +95,10 @@ CONFIG(staticlib) {
- }
- INSTALLS += features
- 
-+mac {
-+    QMAKE_SONAME_PREFIX=$$target.path
-+}
-+
- HEADERS = \
- 	./Qsci/qsciglobal.h \
- 	./Qsci/qsciscintilla.h \