git: 01161f67d969 - 2026Q3 - cad/klayout: Update 0.28.17 => 0.30.9

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Fri, 24 Jul 2026 23:30:52 UTC
The branch 2026Q3 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=01161f67d96983180a87e6d8c704d8e02d853ba2

commit 01161f67d96983180a87e6d8c704d8e02d853ba2
Author:     Kevin Zheng <kevinz5000@gmail.com>
AuthorDate: 2026-07-24 23:21:53 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-07-24 23:30:47 +0000

    cad/klayout: Update 0.28.17 => 0.30.9
    
    Release Notes:
    https://www.klayout.de/development.html#0.30.9
    
    Changelog:
    https://github.com/KLayout/klayout/blob/v0.30.9/Changelog
    
    Improve port:
    - Install everything to $PREFIX/klayout per the upstream project,
      instead of trying to hack into hier. This is too much maintenance
      burden and requires too many local patches. This also lets us get rid
      of the library linking hacks.
    - Get rid of a ton of qmake patches by setting both INSTALL_ROOT and
      INSTALLROOT.
    - Switch from Qt5 to Qt6.
    - Switch from generated by github tarball to prepared by upstream.
    - Update WWW to use https.
    - Switch from custon do-configure to HAS_CONFIGURE.
    - Replace PORTVERSION with DISTVERSION.
    - Exclude from extract unnecessary files.
    - Fix warnings from portclippy.
    - Parametrize "klayout" with "${PORTNAME}".
    - Strip cython libraries.
    
    PR:             296681
    Sponsored by:   UNIS Labs
    Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
    MFH:            2026Q3
    
    (cherry picked from commit 0df877bdd97bc73d55b248086d1b9b9d9bd4121a)
---
 cad/klayout/Makefile                               | 101 ++--
 cad/klayout/distinfo                               |   6 +-
 cad/klayout/files/patch-build.sh                   |  10 +
 cad/klayout/files/patch-src-ant-ant-ant.pro        |  19 -
 .../files/patch-src-ant-unit_tests-unit_tests.pro  |   9 -
 cad/klayout/files/patch-src-app.pri                |   9 -
 cad/klayout/files/patch-src-buddies-src-bd-bd.pro  |  32 --
 .../files/patch-src-buddies-src-buddy_app.pri      |  40 --
 .../patch-src-buddies-unit_tests-unit_tests.pro    |  12 -
 cad/klayout/files/patch-src-db-db-db.pro           |   9 -
 .../files/patch-src-db-unit_tests-unit_tests.pro   |   9 -
 cad/klayout/files/patch-src-drc-drc-drc.pro        |   9 -
 .../files/patch-src-drc-unit_tests-unit_tests.pro  |   8 -
 cad/klayout/files/patch-src-edt-edt-edt.pro        |  19 -
 .../files/patch-src-edt-unit_tests-unit_tests.pro  |   9 -
 cad/klayout/files/patch-src-gsi-gsi-gsi.pro        |   9 -
 .../files/patch-src-gsi-gsi_test-gsi_test.pro      |   8 -
 .../files/patch-src-gsi-unit_tests-unit_tests.pro  |   9 -
 .../files/patch-src-gsiqt-qt4-QtCore-QtCore.pro    |  11 -
 .../patch-src-gsiqt-qt4-QtDesigner-QtDesigner.pro  |  11 -
 .../files/patch-src-gsiqt-qt4-QtGui-QtGui.pro      |  17 -
 .../patch-src-gsiqt-qt4-QtNetwork-QtNetwork.pro    |  15 -
 .../files/patch-src-gsiqt-qt4-QtSql-QtSql.pro      |  15 -
 .../patch-src-gsiqt-qt4-QtUiTools-QtUiTools.pro    |  11 -
 .../files/patch-src-gsiqt-qt4-QtXml-QtXml.pro      |  11 -
 .../files/patch-src-gsiqt-qt5-QtCore-QtCore.pro    |  11 -
 .../patch-src-gsiqt-qt5-QtDesigner-QtDesigner.pro  |  11 -
 .../files/patch-src-gsiqt-qt5-QtGui-QtGui.pro      |  21 -
 ...tch-src-gsiqt-qt5-QtMultimedia-QtMultimedia.pro |  19 -
 .../patch-src-gsiqt-qt5-QtNetwork-QtNetwork.pro    |  15 -
 ...src-gsiqt-qt5-QtPrintSupport-QtPrintSupport.pro |  23 -
 .../files/patch-src-gsiqt-qt5-QtSql-QtSql.pro      |  15 -
 .../files/patch-src-gsiqt-qt5-QtSvg-QtSvg.pro      |  23 -
 .../patch-src-gsiqt-qt5-QtUiTools-QtUiTools.pro    |  11 -
 .../patch-src-gsiqt-qt5-QtWidgets-QtWidgets.pro    |  19 -
 .../files/patch-src-gsiqt-qt5-QtXml-QtXml.pro      |  11 -
 ...h-src-gsiqt-qt5-QtXmlPatterns-QtXmlPatterns.pro |  15 -
 .../files/patch-src-gsiqt-qtbasic-qtbasic.pro      |  11 -
 cad/klayout/files/patch-src-img-img-img.pro        |  19 -
 .../files/patch-src-img-unit_tests-unit_tests.pro  |   9 -
 cad/klayout/files/patch-src-klayout.pri            |  12 -
 ...-src-klayout_main-klayout_main-klayout_main.pro |  70 ---
 .../files/patch-src-klayout_main-tests-tests.pro   |   9 -
 cad/klayout/files/patch-src-lay-lay-lay.pro        |  47 --
 .../files/patch-src-lay-lay-laySystemPaths.cc      |  19 -
 .../files/patch-src-lay-unit_tests-unit_tests.pro  |   9 -
 .../files/patch-src-laybasic-laybasic-laybasic.pro |  22 -
 .../patch-src-laybasic-unit_tests-unit_tests.pro   |   9 -
 .../files/patch-src-lib-unit_tests-unit_tests.pro  |   9 -
 cad/klayout/files/patch-src-lib.pri                |  11 -
 cad/klayout/files/patch-src-lvs-lvs-lvs.pro        |   9 -
 .../files/patch-src-lvs-unit_tests-unit_tests.pro  |   9 -
 cad/klayout/files/patch-src-lym-lym-lym.pro        |  30 -
 .../files/patch-src-lym-unit_tests-unit_tests.pro  |  25 -
 cad/klayout/files/patch-src-plugins-db_plugin.pri  |  27 -
 cad/klayout/files/patch-src-plugins-lay_plugin.pri |  29 -
 cad/klayout/files/patch-src-plugins-plugins.pro    |  10 -
 ...plugins-streamers-cif-lay_plugin-lay_plugin.pro |  11 -
 ...plugins-streamers-cif-unit_tests-unit_tests.pro |  14 -
 ...plugins-streamers-dxf-lay_plugin-lay_plugin.pro |  11 -
 ...plugins-streamers-dxf-unit_tests-unit_tests.pro |  14 -
 ...lugins-streamers-gds2-lay_plugin-lay_plugin.pro |  11 -
 ...lugins-streamers-gds2-unit_tests-unit_tests.pro |  14 -
 ...gins-streamers-lefdef-lay_plugin-lay_plugin.pro |  11 -
 ...gins-streamers-lefdef-unit_tests-unit_tests.pro |  14 -
 ...ugins-streamers-magic-lay_plugin-lay_plugin.pro |  11 -
 ...ugins-streamers-magic-unit_tests-unit_tests.pro |  14 -
 ...ugins-streamers-oasis-lay_plugin-lay_plugin.pro |  11 -
 ...ugins-streamers-oasis-unit_tests-unit_tests.pro |  14 -
 ...plugins-streamers-pcb-lay_plugin-lay_plugin.pro |  11 -
 ...plugins-streamers-pcb-unit_tests-unit_tests.pro |  14 -
 ...rc-plugins-tools-diff-lay_plugin-lay_plugin.pro |  11 -
 ...gins-tools-net_tracer-lay_plugin-lay_plugin.pro |  11 -
 ...gins-tools-net_tracer-unit_tests-unit_tests.pro |  15 -
 ...lugins-tools-view_25d-lay_plugin-lay_plugin.pro |  18 -
 ...lugins-tools-view_25d-unit_tests-unit_tests.pro |  14 -
 ...src-plugins-tools-xor-lay_plugin-lay_plugin.pro |  11 -
 cad/klayout/files/patch-src-pya-pya-pya.pro        |  11 -
 .../files/patch-src-pya-unit_tests-unit_tests.pro  |   9 -
 cad/klayout/files/patch-src-pyastub-pyastub.pro    |  11 -
 .../files/patch-src-pymod-QtCore-QtCore.pro        |  13 -
 .../patch-src-pymod-QtDesigner-QtDesigner.pro      |   8 -
 cad/klayout/files/patch-src-pymod-QtGui-QtGui.pro  |  14 -
 .../patch-src-pymod-QtMultimedia-QtMultimedia.pro  |   8 -
 .../files/patch-src-pymod-QtNetwork-QtNetwork.pro  |   8 -
 ...tch-src-pymod-QtPrintSupport-QtPrintSupport.pro |   8 -
 cad/klayout/files/patch-src-pymod-QtSql-QtSql.pro  |   8 -
 cad/klayout/files/patch-src-pymod-QtSvg-QtSvg.pro  |   8 -
 .../files/patch-src-pymod-QtUiTools-QtUiTools.pro  |  11 -
 .../files/patch-src-pymod-QtWidgets-QtWidgets.pro  |   8 -
 cad/klayout/files/patch-src-pymod-QtXml-QtXml.pro  |  17 -
 ...patch-src-pymod-QtXmlPatterns-QtXmlPatterns.pro |   8 -
 ...patch-src-pymod-bridge_sample-bridge_sample.pro |  17 -
 cad/klayout/files/patch-src-pymod-db-db.pro        |   9 -
 cad/klayout/files/patch-src-pymod-lay-lay.pro      |  20 -
 cad/klayout/files/patch-src-pymod-lib-lib.pro      |   9 -
 cad/klayout/files/patch-src-pymod-pymod.pri        |  45 --
 cad/klayout/files/patch-src-pymod-rdb-rdb.pro      |   8 -
 cad/klayout/files/patch-src-pymod-tl-tl.pro        |  35 --
 .../patch-src-pymod-unit_tests-unit_tests.pro      |   8 -
 cad/klayout/files/patch-src-rba-rba-rba.pro        |   9 -
 .../files/patch-src-rba-unit_tests-unit_tests.pro  |  11 -
 cad/klayout/files/patch-src-rbastub-rbastub.pro    |   9 -
 cad/klayout/files/patch-src-rdb-rdb-rdb.pro        |   9 -
 .../files/patch-src-rdb-unit_tests-unit_tests.pro  |   9 -
 .../files/patch-src-tl-unit_tests-unit_tests.pro   |   9 -
 .../files/patch-src-unit_tests-unit_tests.pro      |  37 --
 cad/klayout/files/patch-src-with_all_libs.pri      |  49 --
 cad/klayout/files/patch-src_tl_tl_tlTimer.cc       |  11 +
 cad/klayout/pkg-plist                              | 613 ++++++++++-----------
 110 files changed, 340 insertions(+), 1989 deletions(-)

diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile
index 05005e50f073..eafa14f6416f 100644
--- a/cad/klayout/Makefile
+++ b/cad/klayout/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	klayout
-PORTVERSION=	0.28.17
-DISTVERSIONPREFIX=	v
+DISTVERSION=	0.30.9
 CATEGORIES=	cad
+MASTER_SITES=	https://www.klayout.org/downloads/source/
 
 MAINTAINER=	kevinz5000@gmail.com
 COMMENT=	Qt-based chip mask layout viewing and editing tool
-WWW=		http://www.klayout.de/index.html
+WWW=		https://www.klayout.de/
 
 LICENSE=	GPLv2
 
@@ -14,73 +14,42 @@ BROKEN_powerpc=	type 'hash<long long>' does not provide a call operator
 
 BUILD_DEPENDS=	bash:shells/bash
 
-USES=		compiler:c++0x gmake gl python ruby qt:5
-USE_GITHUB=	yes
-GH_ACCOUNT=	KLayout
-USE_GL=		gl
-USE_QT=		core buildtools designer gui multimedia network printsupport \
-		qmake sql svg testlib uitools widgets xml xmlpatterns
-USE_LDCONFIG=	yes
+USES=		compiler:c++0x gmake gl python ruby qt:6 shebangfix tar:bz2
+USE_GL=		opengl
+USE_QT=		5compat base multimedia svg tools
+SHEBANG_FILES=	build.sh
+
+HAS_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	build.sh
+CONFIGURE_ARGS=		-qmake qmake6 \
+			-with-qtbinding \
+			-prefix '${PREFIX}/${PORTNAME}' \
+			-python ${PYTHON_CMD} \
+			-ruby ${RUBY} \
+			-nolibgit2 \
+			-dry-run
+# need both due to project quirk
+MAKE_ARGS=		INSTALL_ROOT=${STAGEDIR} \
+			INSTALLROOT=${STAGEDIR}
+
+EXTRACT_AFTER_ARGS=	--exclude .git* \
+			--exclude Jenkinsfile* \
+			--exclude *mac.py \
+			--exclude macbuild \
+			--exclude ci-scripts \
+			--exclude dropbox-deployment.yml \
+			--exclude scripts \
+			--exclude src/gsiqt/qt4 \
+			--exclude src/gsiqt/qt5 \
+			--exclude travis-build.sh \
+			--no-same-owner --no-same-permissions
 
-CXXFLAGS+=	-fdeclspec -fPIC -I${LOCALBASE}/include/qt5 \
-		${QT5MODULES:S,^,-I${LOCALBASE}/include/qt5/Qt,}
-LDFLAGS+=	${LIBS} ${QT5MODULES:S,^,-lQt5,} \
-		-L${LOCALBASE}/lib/qt5 -lpthread
-QT5MODULES=	Core Designer Gui Multimedia MultimediaWidgets \
-		Network PrintSupport Sql Svg Test Widgets Xml XmlPatterns
-MAKE_ENV=	INSTALLROOT=${STAGEDIR} \
-		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
 BUILD_WRKSRC=	${WRKSRC}/build-release
 INSTALL_WRKSRC=	${WRKSRC}/build-release
-TEST_WRKSRC=	${WRKSRC}/build-release
-PLIST_SUB=	PORTVERSION=${PORTVERSION} PORTVERSION_R=${PORTVERSION:R}
-
-CONFIGURE_SHELL=	${LOCALBASE}/bin/bash
-
-do-configure:
-	cd ${WRKSRC} && \
-	    ${SETENV} ${MAKE_ENV} ${CONFIGURE_SHELL} build.sh \
-		-with-qtbinding \
-		-rpath "${PREFIX}/lib/klayout" \
-		-prefix "${PREFIX}" \
-		-python ${PYTHON_CMD} \
-		-ruby ${RUBY} \
-		-nolibgit2 \
-		-dry-run
-
-post-configure:
-	${ECHO_CMD} "#define PLUGINS_BASEDIR \"${PREFIX}/lib/klayout\"" \
-	    > ${WRKSRC}/src/lay/lay/laySystemPathsDefaults.h
-
-pre-install:
-	for D in lib db tl rdb pya; do \
-	    ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/klayout/$${D}; \
-	done
-	for D in db_plugins lay_plugins; do \
-	    ${MKDIR} ${STAGEDIR}${PREFIX}/lib/klayout/$${D}; \
-	done
+PLIST_SUB=	DISTVERSION=${DISTVERSION} DISTVERSION_R=${DISTVERSION:R}
 
 post-install:
-	cd ${INSTALL_WRKSRC} && \
-	    ${STRIP_CMD} `${FIND} libklayout*so* -type f` && \
-	    ${MV} libklayout*so* ${STAGEDIR}${PREFIX}/lib/klayout
-.for D in db_plugins lay_plugins
-	cd ${INSTALL_WRKSRC}/$D && \
-	    ${STRIP_CMD} `${FIND} *so* -type f` && \
-	    ${MV} *so* ${STAGEDIR}${PREFIX}/lib/klayout/$D
-.endfor
-	cd ${INSTALL_WRKSRC}/pymod && \
-	    ${STRIP_CMD} `${FIND} lib*so* -type f` && \
-	    ${MV} lib*so* ${STAGEDIR}${PREFIX}/lib/klayout
-	cd ${STAGEDIR}${PYTHON_SITELIBDIR}/klayout && \
-	    ${STRIP_CMD} `${FIND} *.so -type f`
-	cd ${INSTALL_WRKSRC} && \
-	    ${INSTALL_PROGRAM} klayout strm* ${STAGEDIR}${PREFIX}/bin
-
-do-test:
-	cd ${TEST_WRKSRC} && \
-	    ${SETENV} QT_QPA_PLATFORM=offscreen TESTTMP=testtmp TESTSRC=.. \
-	    LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib/klayout/db_plugins:${STAGEDIR}${PREFIX}/lib/klayout/lay_plugins \
-	    ./ut_runner
+	${RLN} ${STAGEDIR}${PREFIX}/${PORTNAME}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PORTNAME}/pymod/${PORTNAME}/*${PYTHON_TAG}.so
 
 .include <bsd.port.mk>
diff --git a/cad/klayout/distinfo b/cad/klayout/distinfo
index 9f4ee7d83159..4763bb0fd619 100644
--- a/cad/klayout/distinfo
+++ b/cad/klayout/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740272300
-SHA256 (KLayout-klayout-v0.28.17_GH0.tar.gz) = 1cf2c46823e56c134b2936aa4536dbe3f0dccc95f117f0bd7a7d5b4ff4b619ec
-SIZE (KLayout-klayout-v0.28.17_GH0.tar.gz) = 89415525
+TIMESTAMP = 1784444444
+SHA256 (klayout-0.30.9.tar.bz2) = 0c86b4669e6f8c3ac870f89373441753ec39888f890000fe35bdf3eb3c7af605
+SIZE (klayout-0.30.9.tar.bz2) = 93523255
diff --git a/cad/klayout/files/patch-build.sh b/cad/klayout/files/patch-build.sh
new file mode 100644
index 000000000000..f3191c277917
--- /dev/null
+++ b/cad/klayout/files/patch-build.sh
@@ -0,0 +1,10 @@
+--- build.sh.orig	2026-05-27 21:47:09 UTC
++++ build.sh
+@@ -612,7 +612,6 @@ if [ "$IS_MAC" = "no" ]; then
+ #   OSX does not have `readlink -f` command. Use equivalent Perl script.
+ if [ "$IS_MAC" = "no" ]; then
+   BUILD=`readlink -f $BUILD`
+-  BIN=`readlink -f $BIN`
+ else
+   BUILD=`perl -MCwd -le 'print Cwd::abs_path(shift)' $BUILD`
+   BIN=`perl -MCwd -le 'print Cwd::abs_path(shift)' $BIN`
diff --git a/cad/klayout/files/patch-src-ant-ant-ant.pro b/cad/klayout/files/patch-src-ant-ant-ant.pro
deleted file mode 100644
index efea9a87dbc9..000000000000
--- a/cad/klayout/files/patch-src-ant-ant-ant.pro
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/ant/ant/ant.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/ant/ant/ant.pro
-@@ -49,14 +49,14 @@ SOURCES += \
- 
- INCLUDEPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAYVIEW_INC $$DB_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAYVIEW_INC $$DB_INC
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_layview -lklayout_db
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_laybasic.so $$DESTDIR/libklayout_layview.so $$DESTDIR/libklayout_db.so
- 
- !equals(HAVE_QT, "0") {
- 
-   INCLUDEPATH += $$LAYUI_INC
-   DEPENDPATH += $$LAYUI_INC
- 
--  LIBS += -lklayout_layui
-+  LIBS += $$DESTDIR/libklayout_layui.so
- 
- }
- 
diff --git a/cad/klayout/files/patch-src-ant-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-ant-unit_tests-unit_tests.pro
deleted file mode 100644
index dc522ea67561..000000000000
--- a/cad/klayout/files/patch-src-ant-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/ant/unit_tests/unit_tests.pro.orig	2021-08-28 17:19:11 UTC
-+++ src/ant/unit_tests/unit_tests.pro
-@@ -12,5 +12,5 @@ SOURCES = \
- INCLUDEPATH += $$ANT_INC $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC
- DEPENDPATH += $$ANT_INC $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC
- 
--LIBS += -L$$DESTDIR_UT -lklayout_ant -lklayout_laybasic -lklayout_db -lklayout_tl -lklayout_gsi
-+LIBS += $$DESTDIR_UT/libklayout_ant.so $$DESTDIR_UT/libklayout_laybasic.so $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so
- 
diff --git a/cad/klayout/files/patch-src-app.pri b/cad/klayout/files/patch-src-app.pri
deleted file mode 100644
index 47203de7360c..000000000000
--- a/cad/klayout/files/patch-src-app.pri
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/app.pri.orig	2021-08-27 07:30:18 UTC
-+++ src/app.pri
-@@ -1,5 +1,5 @@
- 
- TEMPLATE = app
- 
--target.path = $$PREFIX
-+target.path = $$shell_path($(INSTALLROOT)$$PREFIX/bin)
- INSTALLS += target
diff --git a/cad/klayout/files/patch-src-buddies-src-bd-bd.pro b/cad/klayout/files/patch-src-buddies-src-bd-bd.pro
deleted file mode 100644
index 26d2620e8a3a..000000000000
--- a/cad/klayout/files/patch-src-buddies-src-bd-bd.pro
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/buddies/src/bd/bd.pro.orig	2021-08-28 16:26:18 UTC
-+++ src/buddies/src/bd/bd.pro
-@@ -34,24 +34,24 @@ RESOURCES = \
- 
- INCLUDEPATH += $$TL_INC $$GSI_INC $$VERSION_INC $$DB_INC $$LIB_INC $$RDB_INC $$LYM_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$VERSION_INC $$DB_INC $$LIB_INC $$RDB_INC $$LYM_INC
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_lib -lklayout_rdb -lklayout_lym
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_lib.so $$DESTDIR/libklayout_rdb.so $$DESTDIR/libklayout_lym.so
- 
- INCLUDEPATH += $$RBA_INC
- DEPENDPATH += $$RBA_INC
- 
- equals(HAVE_RUBY, "1") {
--  LIBS += -lklayout_rba
-+  LIBS += $$DESTDIR/libklayout_rba.so
- } else {
--  LIBS += -lklayout_rbastub
-+  LIBS += $$DESTDIR/libklayout_rbastub.so
- }
- 
- INCLUDEPATH += $$PYA_INC
- DEPENDPATH += $$PYA_INC
- 
- equals(HAVE_PYTHON, "1") {
--  LIBS += -lklayout_pya
-+  LIBS += $$DESTDIR/libklayout_pya.so
- } else {
--  LIBS += -lklayout_pyastub
-+  LIBS += $$DESTDIR/libklayout_pyastub.so
- }
- 
- 
diff --git a/cad/klayout/files/patch-src-buddies-src-buddy_app.pri b/cad/klayout/files/patch-src-buddies-src-buddy_app.pri
deleted file mode 100644
index c307d494d17d..000000000000
--- a/cad/klayout/files/patch-src-buddies-src-buddy_app.pri
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/buddies/src/buddy_app.pri.orig	2021-07-23 08:00:26 UTC
-+++ src/buddies/src/buddy_app.pri
-@@ -19,31 +19,31 @@ SOURCES = $$PWD/bd/main.cc
- 
- INCLUDEPATH += $$BD_INC $$TL_INC $$GSI_INC
- DEPENDPATH += $$BD_INC $$TL_INC $$GSI_INC
--LIBS += -L$$DESTDIR -lklayout_bd -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_lib -lklayout_rdb -lklayout_lym
-+LIBS += $$DESTDIR/libklayout_bd.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_lib.so $$DESTDIR/libklayout_rdb.so $$DESTDIR/libklayout_lym.so
- 
- INCLUDEPATH += $$RBA_INC
- DEPENDPATH += $$RBA_INC
- 
- equals(HAVE_RUBY, "1") {
--  LIBS += -lklayout_rba
-+  LIBS += $$DESTDIR/libklayout_rba.so
- } else {
--  LIBS += -lklayout_rbastub
-+  LIBS += $$DESTDIR/libklayout_rbastub.so
- }
- 
- INCLUDEPATH += $$PYA_INC
- DEPENDPATH += $$PYA_INC
- 
- equals(HAVE_PYTHON, "1") {
--  LIBS += -lklayout_pya
-+  LIBS += $$DESTDIR/libklayout_pya.so
- } else {
--  LIBS += -lklayout_pyastub
-+  LIBS += $$DESTDIR/libklayout_pyastub.so
- }
- 
- DEFINES += BD_TARGET=$$TARGET
- 
- LIBS += $$RUBYLIBFILE
- 
--if(mac|linux*) {
-+if(mac|linux*|*bsd*) {
-   LIBS += -ldl
- }
- 
diff --git a/cad/klayout/files/patch-src-buddies-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-buddies-unit_tests-unit_tests.pro
deleted file mode 100644
index 570721cd013f..000000000000
--- a/cad/klayout/files/patch-src-buddies-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/buddies/unit_tests/unit_tests.pro.orig	2021-07-23 08:00:26 UTC
-+++ src/buddies/unit_tests/unit_tests.pro
-@@ -27,4 +27,8 @@ SOURCES += \
- INCLUDEPATH += $$BD_INC $$DB_INC $$TL_INC $$GSI_INC $$RBA_INC
- DEPENDPATH += $$BD_INC $$DB_INC $$TL_INC $$GSI_INC $$RBA_INC
- 
--LIBS += -L$$DESTDIR_UT -lklayout_bd -lklayout_db -lklayout_tl -lklayout_gsi -l$$RBA_LIB
-+LIBS += $$DESTDIR_UT/libklayout_bd.so $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so
-+
-+!isEmpty(RBA_LIB) {
-+  LIBS += $$DESTDIR_UT/lib$${RBA_LIB}.so
-+}
diff --git a/cad/klayout/files/patch-src-db-db-db.pro b/cad/klayout/files/patch-src-db-db-db.pro
deleted file mode 100644
index d8f8cb9bafda..000000000000
--- a/cad/klayout/files/patch-src-db-db-db.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/db/db/db.pro.orig	2022-04-24 08:12:38 UTC
-+++ src/db/db/db.pro
-@@ -403,5 +403,5 @@ HEADERS = \
- 
- INCLUDEPATH += $$TL_INC $$GSI_INC
- DEPENDPATH += $$TL_INC $$GSI_INC
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so
- 
diff --git a/cad/klayout/files/patch-src-db-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-db-unit_tests-unit_tests.pro
deleted file mode 100644
index 4179a0463d6e..000000000000
--- a/cad/klayout/files/patch-src-db-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/db/unit_tests/unit_tests.pro.orig	2021-08-28 17:26:04 UTC
-+++ src/db/unit_tests/unit_tests.pro
-@@ -87,5 +87,5 @@ SOURCES = \
- INCLUDEPATH += $$TL_INC $$DB_INC $$GSI_INC
- DEPENDPATH += $$TL_INC $$DB_INC $$GSI_INC
- 
--LIBS += -L$$DESTDIR_UT -lklayout_db -lklayout_tl -lklayout_gsi
-+LIBS += $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so
- 
diff --git a/cad/klayout/files/patch-src-drc-drc-drc.pro b/cad/klayout/files/patch-src-drc-drc-drc.pro
deleted file mode 100644
index 8aff66474378..000000000000
--- a/cad/klayout/files/patch-src-drc-drc-drc.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/drc/drc/drc.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/drc/drc/drc.pro
-@@ -20,5 +20,5 @@ HEADERS = \
- 
- INCLUDEPATH += $$TL_INC $$DB_INC $$GSI_INC $$LYM_INC $$RDB_INC
- DEPENDPATH += $$TL_INC $$DB_INC $$GSI_INC $$LYM_INC $$RDB_INC
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_lym -lklayout_rdb
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_lym.so $$DESTDIR/libklayout_rdb.so
- 
diff --git a/cad/klayout/files/patch-src-drc-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-drc-unit_tests-unit_tests.pro
deleted file mode 100644
index 2b53df079016..000000000000
--- a/cad/klayout/files/patch-src-drc-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/drc/unit_tests/unit_tests.pro.orig	2021-08-28 17:02:21 UTC
-+++ src/drc/unit_tests/unit_tests.pro
-@@ -15,4 +15,4 @@ SOURCES = \
- INCLUDEPATH += $$DRC_INC $$TL_INC $$RDB_INC $$DB_INC $$GSI_INC $$LYM_INC
- DEPENDPATH += $$DRC_INC $$TL_INC $$RDB_INC $$DB_INC $$GSI_INC $$LYM_INC
- 
--LIBS += -L$$DESTDIR_UT -lklayout_drc -lklayout_rdb -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_lym
-+LIBS += $$DESTDIR_UT/libklayout_drc.so $$DESTDIR_UT/libklayout_rdb.so $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so $$DESTDIR_UT/libklayout_lym.so
diff --git a/cad/klayout/files/patch-src-edt-edt-edt.pro b/cad/klayout/files/patch-src-edt-edt-edt.pro
deleted file mode 100644
index 9fafc8e01046..000000000000
--- a/cad/klayout/files/patch-src-edt-edt-edt.pro
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/edt/edt/edt.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/edt/edt/edt.pro
-@@ -81,14 +81,14 @@ SOURCES += \
- INCLUDEPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAYVIEW_INC $$DB_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAYVIEW_INC $$DB_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_layview -lklayout_db
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_laybasic.so $$DESTDIR/libklayout_layview.so $$DESTDIR/libklayout_db.so
- 
- !equals(HAVE_QT, "0") {
- 
-   INCLUDEPATH += $$LAYUI_INC
-   DEPENDPATH += $$LAYUI_INC
- 
--  LIBS += -lklayout_layui
-+  LIBS += $$DESTDIR/libklayout_layui.so
- 
- }
- 
diff --git a/cad/klayout/files/patch-src-edt-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-edt-unit_tests-unit_tests.pro
deleted file mode 100644
index 4118adc1ad39..000000000000
--- a/cad/klayout/files/patch-src-edt-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/edt/unit_tests/unit_tests.pro.orig	2021-08-28 16:59:05 UTC
-+++ src/edt/unit_tests/unit_tests.pro
-@@ -13,5 +13,5 @@ SOURCES = \
- INCLUDEPATH += $$EDT_INC $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC
- DEPENDPATH += $$EDT_INC $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC
- 
--LIBS += -L$$DESTDIR_UT -lklayout_edt -lklayout_laybasic -lklayout_db -lklayout_tl -lklayout_gsi
-+LIBS += $$DESTDIR_UT/libklayout_edt.so $$DESTDIR_UT/libklayout_laybasic.so $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so
- 
diff --git a/cad/klayout/files/patch-src-gsi-gsi-gsi.pro b/cad/klayout/files/patch-src-gsi-gsi-gsi.pro
deleted file mode 100644
index 77c8a9a86b2f..000000000000
--- a/cad/klayout/files/patch-src-gsi-gsi-gsi.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/gsi/gsi/gsi.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/gsi/gsi/gsi.pro
-@@ -53,5 +53,5 @@ SOURCES += \
- 
- INCLUDEPATH += $$TL_INC
- DEPENDPATH += $$TL_INC
--LIBS += -L$$DESTDIR -lklayout_tl
-+LIBS += $$DESTDIR/libklayout_tl.so
- 
diff --git a/cad/klayout/files/patch-src-gsi-gsi_test-gsi_test.pro b/cad/klayout/files/patch-src-gsi-gsi_test-gsi_test.pro
deleted file mode 100644
index 85e056ef931c..000000000000
--- a/cad/klayout/files/patch-src-gsi-gsi_test-gsi_test.pro
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/gsi/gsi_test/gsi_test.pro.orig	2021-08-28 17:03:04 UTC
-+++ src/gsi/gsi_test/gsi_test.pro
-@@ -18,4 +18,4 @@ HEADERS = \
- 
- INCLUDEPATH += $$TL_INC $$GSI_INC
- DEPENDPATH += $$TL_INC $$GSI_INC
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so
diff --git a/cad/klayout/files/patch-src-gsi-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-gsi-unit_tests-unit_tests.pro
deleted file mode 100644
index cc11f32e7264..000000000000
--- a/cad/klayout/files/patch-src-gsi-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/gsi/unit_tests/unit_tests.pro.orig	2021-08-28 17:03:32 UTC
-+++ src/gsi/unit_tests/unit_tests.pro
-@@ -14,5 +14,5 @@ HEADERS += \
- INCLUDEPATH += $$TL_INC $$GSI_INC
- DEPENDPATH += $$TL_INC $$GSI_INC
- 
--LIBS += -L$$DESTDIR_UT -lklayout_tl -lklayout_gsi
-+LIBS += $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so
- 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt4-QtCore-QtCore.pro b/cad/klayout/files/patch-src-gsiqt-qt4-QtCore-QtCore.pro
deleted file mode 100644
index 02d5670274aa..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt4-QtCore-QtCore.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gsiqt/qt4/QtCore/QtCore.pro.orig	2021-08-28 16:41:29 UTC
-+++ src/gsiqt/qt4/QtCore/QtCore.pro
-@@ -11,7 +11,7 @@ DEFINES += MAKE_GSI_QTCORE_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- SOURCES += \
-   gsiDeclQtCoreAdd.cc
diff --git a/cad/klayout/files/patch-src-gsiqt-qt4-QtDesigner-QtDesigner.pro b/cad/klayout/files/patch-src-gsiqt-qt4-QtDesigner-QtDesigner.pro
deleted file mode 100644
index 806822847a15..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt4-QtDesigner-QtDesigner.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gsiqt/qt4/QtDesigner/QtDesigner.pro.orig	2021-08-28 16:41:02 UTC
-+++ src/gsiqt/qt4/QtDesigner/QtDesigner.pro
-@@ -10,7 +10,7 @@ DEFINES += MAKE_GSI_QTDESIGNER_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- SOURCES += \
- 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt4-QtGui-QtGui.pro b/cad/klayout/files/patch-src-gsiqt-qt4-QtGui-QtGui.pro
deleted file mode 100644
index 2dfebd8b9d5f..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt4-QtGui-QtGui.pro
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/gsiqt/qt4/QtGui/QtGui.pro.orig	2021-08-28 16:43:12 UTC
-+++ src/gsiqt/qt4/QtGui/QtGui.pro
-@@ -10,12 +10,12 @@ DEFINES += MAKE_GSI_QTGUI_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- # there are some bridges between db and Qt, hence this:
- INCLUDEPATH += $$DB_INC
- DEPENDPATH += $$DB_INC
--LIBS += -lklayout_db
-+LIBS += $$DESTDIR/libklayout_db.so
- 
- SOURCES += \
-   gsiDeclQtGuiAdd.cc
diff --git a/cad/klayout/files/patch-src-gsiqt-qt4-QtNetwork-QtNetwork.pro b/cad/klayout/files/patch-src-gsiqt-qt4-QtNetwork-QtNetwork.pro
deleted file mode 100644
index 9f7ba4d261e8..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt4-QtNetwork-QtNetwork.pro
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/gsiqt/qt4/QtNetwork/QtNetwork.pro.orig	2021-08-28 16:42:40 UTC
-+++ src/gsiqt/qt4/QtNetwork/QtNetwork.pro
-@@ -10,10 +10,10 @@ DEFINES += MAKE_GSI_QTNETWORK_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- # because QQbject is used as base class for many classes, we need this:
--LIBS += -lklayout_QtCore
-+LIBS += $$DESTDIR/libklayout_QtCore.so
- 
- SOURCES += \
-   gsiDeclQtNetworkAdd.cc
diff --git a/cad/klayout/files/patch-src-gsiqt-qt4-QtSql-QtSql.pro b/cad/klayout/files/patch-src-gsiqt-qt4-QtSql-QtSql.pro
deleted file mode 100644
index edcf6c64f6a3..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt4-QtSql-QtSql.pro
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/gsiqt/qt4/QtSql/QtSql.pro.orig	2021-08-28 16:41:59 UTC
-+++ src/gsiqt/qt4/QtSql/QtSql.pro
-@@ -10,10 +10,10 @@ DEFINES += MAKE_GSI_QTSQL_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- # because QAsbtractTableModel is used as base class, we need this:
--LIBS += -lklayout_QtCore
-+LIBS += $$DESTDIR/libklayout_QtCore.so
- 
- SOURCES += \
- 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt4-QtUiTools-QtUiTools.pro b/cad/klayout/files/patch-src-gsiqt-qt4-QtUiTools-QtUiTools.pro
deleted file mode 100644
index 4457acda9d11..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt4-QtUiTools-QtUiTools.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gsiqt/qt4/QtUiTools/QtUiTools.pro.orig	2021-08-28 16:40:31 UTC
-+++ src/gsiqt/qt4/QtUiTools/QtUiTools.pro
-@@ -10,7 +10,7 @@ DEFINES += MAKE_GSI_QTUITOOLS_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- SOURCES += \
- 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt4-QtXml-QtXml.pro b/cad/klayout/files/patch-src-gsiqt-qt4-QtXml-QtXml.pro
deleted file mode 100644
index 49591e14c41b..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt4-QtXml-QtXml.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gsiqt/qt4/QtXml/QtXml.pro.orig	2021-08-28 16:39:58 UTC
-+++ src/gsiqt/qt4/QtXml/QtXml.pro
-@@ -10,7 +10,7 @@ DEFINES += MAKE_GSI_QTXML_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- SOURCES += \
- 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtCore-QtCore.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtCore-QtCore.pro
deleted file mode 100644
index 53184bdf2d51..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt5-QtCore-QtCore.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gsiqt/qt5/QtCore/QtCore.pro.orig	2021-08-28 16:29:54 UTC
-+++ src/gsiqt/qt5/QtCore/QtCore.pro
-@@ -11,7 +11,7 @@ DEFINES += MAKE_GSI_QTCORE_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- SOURCES += \
-   gsiDeclQtCoreAdd.cc
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtDesigner-QtDesigner.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtDesigner-QtDesigner.pro
deleted file mode 100644
index ba456452cee8..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt5-QtDesigner-QtDesigner.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gsiqt/qt5/QtDesigner/QtDesigner.pro.orig	2021-08-28 17:27:01 UTC
-+++ src/gsiqt/qt5/QtDesigner/QtDesigner.pro
-@@ -10,7 +10,7 @@ DEFINES += MAKE_GSI_QTDESIGNER_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- SOURCES += \
- 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtGui-QtGui.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtGui-QtGui.pro
deleted file mode 100644
index b7cf76160e64..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt5-QtGui-QtGui.pro
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/gsiqt/qt5/QtGui/QtGui.pro.orig	2021-08-28 16:33:45 UTC
-+++ src/gsiqt/qt5/QtGui/QtGui.pro
-@@ -10,15 +10,15 @@ DEFINES += MAKE_GSI_QTGUI_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- # there are some bridges between db and Qt, hence this:
- INCLUDEPATH += $$DB_INC
- DEPENDPATH += $$DB_INC
--LIBS += -lklayout_db
-+LIBS += $$DESTDIR/libklayout_db.so
- 
- # because QQbject is used as base class for many classes, we need this:
--LIBS += -lklayout_QtCore
-+LIBS += $$DESTDIR/libklayout_QtCore.so
- 
- SOURCES += \
-   gsiDeclQtGuiAdd.cc
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtMultimedia-QtMultimedia.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtMultimedia-QtMultimedia.pro
deleted file mode 100644
index c0b0db205b7e..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt5-QtMultimedia-QtMultimedia.pro
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/gsiqt/qt5/QtMultimedia/QtMultimedia.pro.orig	2021-08-28 16:38:53 UTC
-+++ src/gsiqt/qt5/QtMultimedia/QtMultimedia.pro
-@@ -10,13 +10,13 @@ DEFINES += MAKE_GSI_QTMULTIMEDIA_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- # because QQbject is used as base class for many classes, we need this:
--LIBS += -lklayout_QtCore
-+LIBS += $$DESTDIR/libklayout_QtCore.so
- 
- # because QWidget is used for some UI stuff, we need this:
--LIBS += -lklayout_QtWidgets
-+LIBS += $$DESTDIR/libklayout_QtWidgets.so
- 
- SOURCES += \
- 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtNetwork-QtNetwork.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtNetwork-QtNetwork.pro
deleted file mode 100644
index 4336d7be56a7..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt5-QtNetwork-QtNetwork.pro
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/gsiqt/qt5/QtNetwork/QtNetwork.pro.orig	2021-08-28 16:32:44 UTC
-+++ src/gsiqt/qt5/QtNetwork/QtNetwork.pro
-@@ -10,10 +10,10 @@ DEFINES += MAKE_GSI_QTNETWORK_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- # because QQbject is used as base class for many classes, we need this:
--LIBS += -lklayout_QtCore
-+LIBS += $$DESTDIR/libklayout_QtCore.so
- 
- SOURCES += \
-   gsiDeclQtNetworkAdd.cc
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtPrintSupport-QtPrintSupport.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtPrintSupport-QtPrintSupport.pro
deleted file mode 100644
index b48e11482537..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt5-QtPrintSupport-QtPrintSupport.pro
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/gsiqt/qt5/QtPrintSupport/QtPrintSupport.pro.orig	2021-08-28 16:37:50 UTC
-+++ src/gsiqt/qt5/QtPrintSupport/QtPrintSupport.pro
-@@ -10,16 +10,16 @@ DEFINES += MAKE_GSI_QTPRINTSUPPORT_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- # because QQbject is used as base class for many classes, we need this:
--LIBS += -lklayout_QtCore
-+LIBS += $$DESTDIR/libklayout_QtCore.so
- 
- # because QWidget is used for some UI stuff, we need this:
--LIBS += -lklayout_QtWidgets
-+LIBS += $$DESTDIR/libklayout_QtWidgets.so
- 
- # because QPagedPaintDevice is used, we need this:
--LIBS += -lklayout_QtGui
-+LIBS += $$DESTDIR/libklayout_QtGui.so
- 
- SOURCES += \
- 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtSql-QtSql.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtSql-QtSql.pro
deleted file mode 100644
index 0cf8a811697f..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt5-QtSql-QtSql.pro
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/gsiqt/qt5/QtSql/QtSql.pro.orig	2021-08-28 16:32:05 UTC
-+++ src/gsiqt/qt5/QtSql/QtSql.pro
-@@ -10,10 +10,10 @@ DEFINES += MAKE_GSI_QTSQL_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- # because QQbject is used as base class for many classes, we need this:
--LIBS += -lklayout_QtCore
-+LIBS += $$DESTDIR/libklayout_QtCore.so
- 
- SOURCES += \
- 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtSvg-QtSvg.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtSvg-QtSvg.pro
deleted file mode 100644
index d69db02c6b64..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt5-QtSvg-QtSvg.pro
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/gsiqt/qt5/QtSvg/QtSvg.pro.orig	2021-08-28 16:36:01 UTC
-+++ src/gsiqt/qt5/QtSvg/QtSvg.pro
-@@ -10,16 +10,16 @@ DEFINES += MAKE_GSI_QTSVG_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- # because QQbject is used as base class for many classes, we need this:
--LIBS += -lklayout_QtCore
-+LIBS += $$DESTDIR/libklayout_QtCore.so
- 
- # because QWidget is used for some UI stuff, we need this:
--LIBS += -lklayout_QtWidgets
-+LIBS += $$DESTDIR/libklayout_QtWidgets.so
- 
- # because QPaintDevice is used, we need this:
--LIBS += -lklayout_QtGui
-+LIBS += $$DESTDIR/libklayout_QtGui.so
- 
- SOURCES += \
- 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtUiTools-QtUiTools.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtUiTools-QtUiTools.pro
deleted file mode 100644
index 96dbe2ea6ae1..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt5-QtUiTools-QtUiTools.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gsiqt/qt5/QtUiTools/QtUiTools.pro.orig	2021-08-28 16:35:24 UTC
-+++ src/gsiqt/qt5/QtUiTools/QtUiTools.pro
-@@ -10,7 +10,7 @@ DEFINES += MAKE_GSI_QTUITOOLS_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic -lklayout_QtCore
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so $$DESTDIR/libklayout_QtCore.so
- 
- SOURCES += \
- 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtWidgets-QtWidgets.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtWidgets-QtWidgets.pro
deleted file mode 100644
index 8784044ab1e9..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt5-QtWidgets-QtWidgets.pro
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/gsiqt/qt5/QtWidgets/QtWidgets.pro.orig	2021-08-28 16:30:52 UTC
-+++ src/gsiqt/qt5/QtWidgets/QtWidgets.pro
-@@ -10,13 +10,13 @@ DEFINES += MAKE_GSI_QTWIDGETS_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- # because QPainter is used as base class for QStylePainter, we need this:
--LIBS += -lklayout_QtGui
-+LIBS += $$DESTDIR/libklayout_QtGui.so
- 
- # because QObject is the base class of some classes we need this
--LIBS += -lklayout_QtCore
-+LIBS += $$DESTDIR/libklayout_QtCore.so
- 
- SOURCES += \
-   gsiDeclQtWidgetsAdd.cc
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtXml-QtXml.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtXml-QtXml.pro
deleted file mode 100644
index 59a24b1919f9..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt5-QtXml-QtXml.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gsiqt/qt5/QtXml/QtXml.pro.orig	2021-08-28 16:34:41 UTC
-+++ src/gsiqt/qt5/QtXml/QtXml.pro
-@@ -10,7 +10,7 @@ DEFINES += MAKE_GSI_QTXML_LIBRARY
- INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_qtbasic.so
- 
- SOURCES += \
- 
diff --git a/cad/klayout/files/patch-src-gsiqt-qt5-QtXmlPatterns-QtXmlPatterns.pro b/cad/klayout/files/patch-src-gsiqt-qt5-QtXmlPatterns-QtXmlPatterns.pro
deleted file mode 100644
*** 2174 LINES SKIPPED ***