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
author: Kevin Zheng <kevinz5000@gmail.com> 2026-07-24 23:21:53 +0000
committer: Vladimir Druzenko <vvd@FreeBSD.org> 2026-07-24 23:21:53 +0000
commit: 0df877bdd97bc73d55b248086d1b9b9d9bd4121a (patch)
tree: ae09c81aeaa4c34fc6484ca181bedf25c964339b
parent: a907ef593f153461bd30f958815555cf2325a79c (diff)
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
 
-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
+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}
 
-post-configure:
-	${ECHO_CMD} "#define PLUGINS_BASEDIR \"${PREFIX}/lib/klayout\"" \
-	    > ${WRKSRC}/src/lay/lay/laySystemPathsDefaults.h
+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
 
-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
+BUILD_WRKSRC=	${WRKSRC}/build-release
+INSTALL_WRKSRC=	${WRKSRC}/build-release
+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
index 7c44137fa217..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qt5-QtXmlPatterns-QtXmlPatterns.pro
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/gsiqt/qt5/QtXmlPatterns/QtXmlPatterns.pro.orig	2021-08-28 16:36:55 UTC
-+++ src/gsiqt/qt5/QtXmlPatterns/QtXmlPatterns.pro
-@@ -10,10 +10,10 @@ DEFINES += MAKE_GSI_QTXMLPATTERNS_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-qtbasic-qtbasic.pro b/cad/klayout/files/patch-src-gsiqt-qtbasic-qtbasic.pro
deleted file mode 100644
index 5a5b9126bba2..000000000000
--- a/cad/klayout/files/patch-src-gsiqt-qtbasic-qtbasic.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gsiqt/qtbasic/qtbasic.pro.orig	2021-08-28 16:43:44 UTC
-+++ src/gsiqt/qtbasic/qtbasic.pro
-@@ -10,7 +10,7 @@ DEFINES += MAKE_GSI_QTBASIC_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_db
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_db.so
- 
- SOURCES += \
-   gsiQt.cc \
diff --git a/cad/klayout/files/patch-src-img-img-img.pro b/cad/klayout/files/patch-src-img-img-img.pro
deleted file mode 100644
index 5b6aa2a34b22..000000000000
--- a/cad/klayout/files/patch-src-img-img-img.pro
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/img/img/img.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/img/img/img.pro
-@@ -49,13 +49,13 @@ SOURCES += \
- 
- INCLUDEPATH += $$TL_INC $$DB_INC $$GSI_INC $$LAYBASIC_INC $$LAYVIEW_INC $$DB_INC
- DEPENDPATH += $$TL_INC $$DB_INC $$GSI_INC $$LAYBASIC_INC $$LAYVIEW_INC $$DB_INC
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_laybasic -lklayout_layview -lklayout_db
--
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_db.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-img-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-img-unit_tests-unit_tests.pro
deleted file mode 100644
index 129fe1c98c4b..000000000000
--- a/cad/klayout/files/patch-src-img-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/img/unit_tests/unit_tests.pro.orig	2021-08-28 16:51:37 UTC
-+++ src/img/unit_tests/unit_tests.pro
-@@ -13,5 +13,5 @@ SOURCES = \
- INCLUDEPATH += $$IMG_INC $$DB_INC $$TL_INC $$LAYBASIC_INC $$GSI_INC
- DEPENDPATH += $$IMG_INC $$DB_INC $$TL_INC $$LAYBASIC_INC $$GSI_INC
- 
--LIBS += -L$$DESTDIR_UT -lklayout_img -lklayout_laybasic -lklayout_db -lklayout_tl -lklayout_gsi
-+LIBS += $$DESTDIR_UT/libklayout_img.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-klayout.pri b/cad/klayout/files/patch-src-klayout.pri
deleted file mode 100644
index 78a86e4b2ab5..000000000000
--- a/cad/klayout/files/patch-src-klayout.pri
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/klayout.pri.orig	2022-12-22 22:17:08 UTC
-+++ src/klayout.pri
-@@ -113,7 +113,9 @@ equals(HAVE_RUBY, "1") {
- }
- 
- !isEmpty(RPATH) {
-+  !equals($$basename(_PRO_FILE_), "unit_tests.pro") {
-   QMAKE_RPATHDIR += $$RPATH
-+  }
- }
- 
- !isEmpty(BITS_PATH) {
diff --git a/cad/klayout/files/patch-src-klayout_main-klayout_main-klayout_main.pro b/cad/klayout/files/patch-src-klayout_main-klayout_main-klayout_main.pro
deleted file mode 100644
index 996140da86d3..000000000000
--- a/cad/klayout/files/patch-src-klayout_main-klayout_main-klayout_main.pro
+++ /dev/null
@@ -1,70 +0,0 @@
---- src/klayout_main/klayout_main/klayout_main.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/klayout_main/klayout_main/klayout_main.pro
-@@ -24,52 +24,52 @@ win32 {
- INCLUDEPATH += $$DOC_INC $$ICONS_INC $$QTBASIC_INC
- DEPENDPATH += $$DOC_INC $$ICONS_INC $$QTBASIC_INC
- 
--LIBS += -lklayout_doc -lklayout_icons
-+LIBS += $$DESTDIR/libklayout_doc.so $$DESTDIR/libklayout_icons.so
- 
- equals(HAVE_QTBINDINGS, "1") {
- 
--  LIBS += -lklayout_qtbasic -lklayout_QtGui
-+  LIBS += $$DESTDIR/libklayout_qtbasic.so $$DESTDIR/libklayout_QtGui.so
- 
-   !equals(HAVE_QT_XML, "0") {
--    LIBS += -lklayout_QtXml
-+    LIBS += $$DESTDIR/libklayout_QtXml.so
-   }
-   !equals(HAVE_QT_NETWORK, "0") {
--    LIBS += -lklayout_QtNetwork
-+    LIBS += $$DESTDIR/libklayout_QtNetwork.so
-   }
-   !equals(HAVE_QT_SQL, "0") {
--    LIBS += -lklayout_QtSql
-+    LIBS += $$DESTDIR/libklayout_QtSql.so
-   }
-   !equals(HAVE_QT_DESIGNER, "0") {
--    LIBS += -lklayout_QtDesigner
-+    LIBS += $$DESTDIR/libklayout_QtDesigner.so
-   }
-   !equals(HAVE_QT_UITOOLS, "0") {
--    LIBS += -lklayout_QtUiTools
-+    LIBS += $$DESTDIR/libklayout_QtUiTools.so
-   }
- 
-   greaterThan(QT_MAJOR_VERSION, 4) {
- 
--    LIBS += -lklayout_QtWidgets
-+    LIBS += $$DESTDIR/libklayout_QtWidgets.so
- 
-     !equals(HAVE_QT_MULTIMEDIA, "0") {
--      LIBS += -lklayout_QtMultimedia
-+      LIBS += $$DESTDIR/libklayout_QtMultimedia.so
-     }
-     !equals(HAVE_QT_PRINTSUPPORT, "0") {
--      LIBS += -lklayout_QtPrintSupport
-+      LIBS += $$DESTDIR/libklayout_QtPrintSupport.so
-     }
-     !equals(HAVE_QT_SVG, "0") {
--      LIBS += -lklayout_QtSvg
-+      LIBS += $$DESTDIR/libklayout_QtSvg.so
-     }
-     !equals(HAVE_QT_XML, "0") {
--      LIBS += -lklayout_QtXmlPatterns
-+      LIBS += $$DESTDIR/libklayout_QtXmlPatterns.so
-     }
- 
-   }
- 
-   greaterThan(QT_MAJOR_VERSION, 5) {
- 
--    LIBS += -lklayout_QtCore5Compat
--    LIBS -= -lklayout_QtXmlPatterns
--    LIBS -= -lklayout_QtDesigner
-+    LIBS += $$DESTDIR/libklayout_QtCore5Compat.so
-+    LIBS -= $$DESTDIR/libklayout_QtXmlPatterns.so
-+    LIBS -= $$DESTDIR/libklayout_QtDesigner.so
- 
-   }
- 
diff --git a/cad/klayout/files/patch-src-klayout_main-tests-tests.pro b/cad/klayout/files/patch-src-klayout_main-tests-tests.pro
deleted file mode 100644
index bad59c1d08a7..000000000000
--- a/cad/klayout/files/patch-src-klayout_main-tests-tests.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/klayout_main/tests/tests.pro.orig	2021-08-28 16:12:22 UTC
-+++ src/klayout_main/tests/tests.pro
-@@ -12,5 +12,5 @@ SOURCES = \
- INCLUDEPATH += $$RBA_INC $$TL_INC $$DB_INC $$GSI_INC
- DEPENDPATH += $$RBA_INC $$TL_INC $$DB_INC $$GSI_INC
- 
--LIBS += -L$$DESTDIR_UT -lklayout_rba -lklayout_tl -lklayout_db -lklayout_gsi
-+LIBS += $$DESTDIR_UT/libklayout_rba.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_gsi.so
- 
diff --git a/cad/klayout/files/patch-src-lay-lay-lay.pro b/cad/klayout/files/patch-src-lay-lay-lay.pro
deleted file mode 100644
index 58308d2b11ed..000000000000
--- a/cad/klayout/files/patch-src-lay-lay-lay.pro
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/lay/lay/lay.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/lay/lay/lay.pro
-@@ -182,18 +182,18 @@ RESOURCES = layBuildInMacros.qrc \
- 
- INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$LAYUI_INC $$LAYVIEW_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$LAYUI_INC $$LAYVIEW_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_lym -lklayout_laybasic -lklayout_layview -lklayout_layui -lklayout_ant -lklayout_img -lklayout_edt
--
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_rdb.so $$DESTDIR/libklayout_lym.so $$DESTDIR/libklayout_laybasic.so $$DESTDIR/libklayout_layview.so $$DESTDIR/libklayout_layui.so $$DESTDIR/libklayout_ant.so $$DESTDIR/libklayout_img.so $$DESTDIR/libklayout_edt.so
-+ 
- INCLUDEPATH += $$QTBASIC_INC
- DEPENDPATH += $$QTBASIC_INC
- 
- equals(HAVE_QTBINDINGS, "1") {
--  LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtCore
-+  LIBS += $$DESTDIR/libklayout_qtbasic.so $$DESTDIR/libklayout_QtGui.so $$DESTDIR/libklayout_QtCore.so
-   !equals(HAVE_QT_XML, "0") {
--    LIBS += -lklayout_QtXml
-+    LIBS += $$DESTDIR/libklayout_QtXml.so
-   }
-   greaterThan(QT_MAJOR_VERSION, 4) {
--    LIBS += -lklayout_QtWidgets
-+    LIBS += $$DESTDIR/libklayout_QtWidgets.so
-   }
- }
- 
-@@ -201,16 +201,16 @@ 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-lay-lay-laySystemPaths.cc b/cad/klayout/files/patch-src-lay-lay-laySystemPaths.cc
deleted file mode 100644
index 34e2fca71057..000000000000
--- a/cad/klayout/files/patch-src-lay-lay-laySystemPaths.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/lay/lay/laySystemPaths.cc.orig	2022-12-22 22:17:08 UTC
-+++ src/lay/lay/laySystemPaths.cc
-@@ -26,6 +26,8 @@
- #include "tlString.h"
- #include "tlEnv.h"
- 
-+#include "laySystemPathsDefaults.h"
-+
- #include <QDir>
- #include <QFileInfo>
- #include <QCoreApplication>
-@@ -121,6 +123,7 @@ get_klayout_path ()
-     } else {
-       klayout_path.push_back (tl::get_inst_path ());
-     }
-+    split_path (PLUGINS_BASEDIR, klayout_path);
- 
-     return klayout_path;
- 
diff --git a/cad/klayout/files/patch-src-lay-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-lay-unit_tests-unit_tests.pro
deleted file mode 100644
index 988c88e89e16..000000000000
--- a/cad/klayout/files/patch-src-lay-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/lay/unit_tests/unit_tests.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/lay/unit_tests/unit_tests.pro
-@@ -14,5 +14,5 @@ SOURCES = \
- INCLUDEPATH += $$LAY_INC $$TL_INC $$LAYBASIC_INC $$LAYUI_INC $$LAYVIEW_INC $$DB_INC $$GSI_INC $$ANT_INC $$IMG_INC $$RDB_INC
- DEPENDPATH += $$LAY_INC $$TL_INC $$LAYBASIC_INC $$LAYUI_INC $$LAYVIEW_INC $$DB_INC $$GSI_INC $$ANT_INC $$IMG_INC $$RDB_INC
- 
--LIBS += -L$$DESTDIR_UT -lklayout_lay -lklayout_laybasic -lklayout_layui -lklayout_layview -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_ant -lklayout_img -lklayout_rdb
-+LIBS += $$DESTDIR_UT/libklayout_lay.so $$DESTDIR_UT/libklayout_laybasic.so $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so $$DESTDIR_UT/libklayout_ant.so $$DESTDIR_UT/libklayout_img.so $$DESTDIR_UT/libklayout_rdb.so
- 
diff --git a/cad/klayout/files/patch-src-laybasic-laybasic-laybasic.pro b/cad/klayout/files/patch-src-laybasic-laybasic-laybasic.pro
deleted file mode 100644
index 30cc128d4d8d..000000000000
--- a/cad/klayout/files/patch-src-laybasic-laybasic-laybasic.pro
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/laybasic/laybasic/laybasic.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/laybasic/laybasic/laybasic.pro
-@@ -139,15 +139,15 @@ HEADERS += \
- 
- INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb 
--
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_rdb.so
-+ 
- INCLUDEPATH += $$QTBASIC_INC
- DEPENDPATH += $$QTBASIC_INC
- 
- equals(HAVE_QTBINDINGS, "1") {
--  LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtCore
-+  LIBS += $$DESTDIR/libklayout_qtbasic.so $$DESTDIR/libklayout_QtGui.so $$DESTDIR/libklayout_QtCore.so
-   greaterThan(QT_MAJOR_VERSION, 4) {
--    LIBS += -lklayout_QtWidgets
-+    LIBS += $$DESTDIR/libklayout_QtWidgets.so
-   }
- }
- 
diff --git a/cad/klayout/files/patch-src-laybasic-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-laybasic-unit_tests-unit_tests.pro
deleted file mode 100644
index 506160007f2f..000000000000
--- a/cad/klayout/files/patch-src-laybasic-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/laybasic/unit_tests/unit_tests.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/laybasic/unit_tests/unit_tests.pro
-@@ -19,5 +19,5 @@ SOURCES = \
- INCLUDEPATH += $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC $$OUT_PWD/../laybasic
- DEPENDPATH += $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC $$OUT_PWD/../laybasic
- 
--LIBS += -L$$DESTDIR_UT -lklayout_laybasic -lklayout_db -lklayout_tl -lklayout_gsi
-+LIBS += $$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-lib-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-lib-unit_tests-unit_tests.pro
deleted file mode 100644
index bf4347112220..000000000000
--- a/cad/klayout/files/patch-src-lib-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/lib/unit_tests/unit_tests.pro.orig	2021-08-28 17:04:53 UTC
-+++ src/lib/unit_tests/unit_tests.pro
-@@ -12,5 +12,5 @@ SOURCES = \
- INCLUDEPATH += $$LIB_INC $$TL_INC $$DB_INC $$GSI_INC
- DEPENDPATH += $$LIB_INC $$TL_INC $$DB_INC $$GSI_INC
- 
--LIBS += -L$$DESTDIR_UT -lklayout_lib -lklayout_db -lklayout_tl -lklayout_gsi
-+LIBS += $$DESTDIR_UT/libklayout_lib.so $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so
- 
diff --git a/cad/klayout/files/patch-src-lib.pri b/cad/klayout/files/patch-src-lib.pri
deleted file mode 100644
index 51aa1a1acfb9..000000000000
--- a/cad/klayout/files/patch-src-lib.pri
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib.pri.orig	2021-08-27 07:30:53 UTC
-+++ src/lib.pri
-@@ -14,7 +14,7 @@ win32 {
- 
- } else {
- 
--  target.path = $$PREFIX
-+  target.path = $$shell_path($(INSTALLROOT)$$PREFIX/lib/klayout)
-   INSTALLS += target
- 
- }
diff --git a/cad/klayout/files/patch-src-lvs-lvs-lvs.pro b/cad/klayout/files/patch-src-lvs-lvs-lvs.pro
deleted file mode 100644
index d3f2bf95b795..000000000000
--- a/cad/klayout/files/patch-src-lvs-lvs-lvs.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/lvs/lvs/lvs.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/lvs/lvs/lvs.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 -lklayout_drc
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_lym.so $$DESTDIR/libklayout_rdb.so $$DESTDIR/libklayout_drc.so
- 
diff --git a/cad/klayout/files/patch-src-lvs-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-lvs-unit_tests-unit_tests.pro
deleted file mode 100644
index bf1a2f6c9da9..000000000000
--- a/cad/klayout/files/patch-src-lvs-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/lvs/unit_tests/unit_tests.pro.orig	2021-08-28 16:53:25 UTC
-+++ src/lvs/unit_tests/unit_tests.pro
-@@ -14,4 +14,5 @@ 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_lvs -lklayout_drc -lklayout_rdb -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_lym
-+LIBS += $$DESTDIR_UT/libklayout_lvs.so $$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-lym-lym-lym.pro b/cad/klayout/files/patch-src-lym-lym-lym.pro
deleted file mode 100644
index ee39fcb108b0..000000000000
--- a/cad/klayout/files/patch-src-lym-lym-lym.pro
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/lym/lym/lym.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/lym/lym/lym.pro
-@@ -23,22 +23,22 @@ 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
- 
- 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-lym-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-lym-unit_tests-unit_tests.pro
deleted file mode 100644
index 641526ad49b9..000000000000
--- a/cad/klayout/files/patch-src-lym-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/lym/unit_tests/unit_tests.pro.orig	2021-08-28 16:47:48 UTC
-+++ src/lym/unit_tests/unit_tests.pro
-@@ -12,17 +12,17 @@ SOURCES = \
- INCLUDEPATH += $$RBA_INC $$PYA_INC $$LYM_INC $$TL_INC $$GSI_INC
- DEPENDPATH += $$RBA_INC $$PYA_INC $$LYM_INC $$TL_INC $$GSI_INC
- 
--LIBS += -L$$DESTDIR_UT -lklayout_lym -lklayout_tl -lklayout_gsi
-+LIBS += $$DESTDIR_UT/libklayout_lym.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so
- 
- equals(HAVE_RUBY, "1") {
--  LIBS += -lklayout_rba
-+  LIBS += $$DESTDIR_UT/libklayout_rba.so
- } else {
--  LIBS += -lklayout_rbastub
-+  LIBS += $$DESTDIR_UT/libklayout_rbastub.so
- }
- 
- equals(HAVE_PYTHON, "1") {
--  LIBS += -lklayout_pya
-+  LIBS += $$DESTDIR_UT/libklayout_pya.so
- } else {
--  LIBS += -lklayout_pyastub
-+  LIBS += $$DESTDIR_UT/libklayout_pyastub.so
- }
- 
diff --git a/cad/klayout/files/patch-src-plugins-db_plugin.pri b/cad/klayout/files/patch-src-plugins-db_plugin.pri
deleted file mode 100644
index 2ff9d850c3bd..000000000000
--- a/cad/klayout/files/patch-src-plugins-db_plugin.pri
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/plugins/db_plugin.pri.orig	2021-07-23 08:00:26 UTC
-+++ src/plugins/db_plugin.pri
-@@ -5,7 +5,7 @@ TEMPLATE = lib
- 
- INCLUDEPATH += $$DB_INC $$TL_INC $$GSI_INC $$PWD/common
- DEPENDPATH += $$DB_INC $$TL_INC $$GSI_INC $$PWD/common
--LIBS += -L$$DESTDIR/.. -lklayout_db -lklayout_tl -lklayout_gsi
-+LIBS += $$DESTDIR/../libklayout_db.so $$DESTDIR/../libklayout_tl.so $$DESTDIR/../libklayout_gsi.so
- 
- DEFINES += MAKE_DB_PLUGIN_LIBRARY
- 
-@@ -14,13 +14,13 @@ win32 {
-   dlltarget.path = $$PREFIX/db_plugins
-   INSTALLS += dlltarget
- 
--  # to avoid the major version being appended to the dll name - in this case -lxyz won't link it again
-+  # to avoid the major version being appended to the dll name - in this case $$DESTDIR/../libxyz won't link it again
-   # because the library is called xyx0.dll.
-   CONFIG += skip_target_version_ext
- 
- } else {
- 
--  target.path = $$PREFIX/db_plugins
-+  target.path = $$shell_path($(INSTALLROOT)$$PREFIX/lib/klayout/db_plugins)
-   INSTALLS += target
- 
- }
diff --git a/cad/klayout/files/patch-src-plugins-lay_plugin.pri b/cad/klayout/files/patch-src-plugins-lay_plugin.pri
deleted file mode 100644
index e9163f2f525f..000000000000
--- a/cad/klayout/files/patch-src-plugins-lay_plugin.pri
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/plugins/lay_plugin.pri.orig	2022-12-22 22:17:08 UTC
-+++ src/plugins/lay_plugin.pri
-@@ -5,8 +5,9 @@ TEMPLATE = lib
- 
- INCLUDEPATH += $$DB_INC $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAYUI_INC $$LAYVIEW_INC $$LAYUI_INC $$LAY_INC $$PWD/common
- DEPENDPATH += $$DB_INC $$TL_INC $$GSI_INC $$LAYBASIC_INC $$LAYUI_INC $$LAYVIEW_INC $$LAYUI_INC $$LAY_INC $$PWD/common
--LIBS += -L$$DESTDIR/.. -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_layui -lklayout_layview -lklayout_lay -lklayout_lay
- 
-+LIBS += $$DESTDIR/../libklayout_db.so $$DESTDIR/../libklayout_tl.so $$DESTDIR/../libklayout_gsi.so $$DESTDIR/../libklayout_laybasic.so $$DESTDIR/../libklayout_layui.so $$DESTDIR/../libklayout_layview.so $$DESTDIR/../libklayout_lay.so
-+ 
- DEFINES += MAKE_LAY_PLUGIN_LIBRARY
- 
- win32 {
-@@ -14,13 +15,13 @@ win32 {
-   dlltarget.path = $$PREFIX/lay_plugins
-   INSTALLS += dlltarget
- 
--  # to avoid the major version being appended to the dll name - in this case -lxyz won't link it again
-+  # to avoid the major version being appended to the dll name - in this case $$DESTDIR/../libxyz won't link it again
-   # because the library is called xyx0.dll.
-   CONFIG += skip_target_version_ext
- 
- } else {
- 
--  target.path = $$PREFIX/lay_plugins
-+  target.path = $(INSTALLROOT)$$PREFIX/lay_plugins
-   INSTALLS += target
- 
- }
diff --git a/cad/klayout/files/patch-src-plugins-plugins.pro b/cad/klayout/files/patch-src-plugins-plugins.pro
deleted file mode 100644
index 60cb2ec65676..000000000000
--- a/cad/klayout/files/patch-src-plugins-plugins.pro
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/plugins/plugins.pro.orig	2021-08-27 22:02:52 UTC
-+++ src/plugins/plugins.pro
-@@ -2,6 +2,7 @@ TEMPLATE = subdirs
- 
- # Automatically include all sub-folders, but not the .pro file
- SUBDIR_LIST = $$files($$PWD/*)
-+SUBDIR_LIST -= $$files($$PWD/*.orig)
- SUBDIR_LIST -= $$PWD/plugins.pro
- SUBDIR_LIST -= $$PWD/db_plugin.pri
- SUBDIR_LIST -= $$PWD/lay_plugin.pri
diff --git a/cad/klayout/files/patch-src-plugins-streamers-cif-lay_plugin-lay_plugin.pro b/cad/klayout/files/patch-src-plugins-streamers-cif-lay_plugin-lay_plugin.pro
deleted file mode 100644
index 163266f7bd37..000000000000
--- a/cad/klayout/files/patch-src-plugins-streamers-cif-lay_plugin-lay_plugin.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/streamers/cif/lay_plugin/lay_plugin.pro.orig	2021-08-28 17:30:42 UTC
-+++ src/plugins/streamers/cif/lay_plugin/lay_plugin.pro
-@@ -6,7 +6,7 @@ include($$PWD/../../../lay_plugin.pri)
- 
- INCLUDEPATH += $$PWD/../db_plugin
- DEPENDPATH += $$PWD/../db_plugin
--LIBS += -L$$DESTDIR/../db_plugins -lcif
-+LIBS += $$DESTDIR/../db_plugins/libcif.so
- 
- !isEmpty(RPATH) {
-   QMAKE_RPATHDIR += $$RPATH/db_plugins
diff --git a/cad/klayout/files/patch-src-plugins-streamers-cif-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-plugins-streamers-cif-unit_tests-unit_tests.pro
deleted file mode 100644
index 785da94d2160..000000000000
--- a/cad/klayout/files/patch-src-plugins-streamers-cif-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/plugins/streamers/cif/unit_tests/unit_tests.pro.orig	2021-08-28 17:09:50 UTC
-+++ src/plugins/streamers/cif/unit_tests/unit_tests.pro
-@@ -11,9 +11,9 @@ SOURCES = \
- INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- 
--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
- 
- PLUGINPATH = $$OUT_PWD/../../../../db_plugins
- QMAKE_RPATHDIR += $$PLUGINPATH
- 
--LIBS += -L$$PLUGINPATH -lcif
-+LIBS += $$PLUGINPATH/libcif.so
diff --git a/cad/klayout/files/patch-src-plugins-streamers-dxf-lay_plugin-lay_plugin.pro b/cad/klayout/files/patch-src-plugins-streamers-dxf-lay_plugin-lay_plugin.pro
deleted file mode 100644
index ca778ecbf919..000000000000
--- a/cad/klayout/files/patch-src-plugins-streamers-dxf-lay_plugin-lay_plugin.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/streamers/dxf/lay_plugin/lay_plugin.pro.orig	2021-08-28 17:32:49 UTC
-+++ src/plugins/streamers/dxf/lay_plugin/lay_plugin.pro
-@@ -6,7 +6,7 @@ include($$PWD/../../../lay_plugin.pri)
- 
- INCLUDEPATH += $$PWD/../db_plugin
- DEPENDPATH += $$PWD/../db_plugin
--LIBS += -L$$DESTDIR/../db_plugins -ldxf
-+LIBS += $$DESTDIR/../db_plugins/libdxf.so
- 
- !isEmpty(RPATH) {
-   QMAKE_RPATHDIR += $$RPATH/db_plugins
diff --git a/cad/klayout/files/patch-src-plugins-streamers-dxf-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-plugins-streamers-dxf-unit_tests-unit_tests.pro
deleted file mode 100644
index 58e618acedfc..000000000000
--- a/cad/klayout/files/patch-src-plugins-streamers-dxf-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/plugins/streamers/dxf/unit_tests/unit_tests.pro.orig	2022-04-24 08:12:38 UTC
-+++ src/plugins/streamers/dxf/unit_tests/unit_tests.pro
-@@ -12,9 +12,9 @@ SOURCES = \
- INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- 
--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
- 
- PLUGINPATH = $$OUT_PWD/../../../../db_plugins
- QMAKE_RPATHDIR += $$PLUGINPATH
- 
--LIBS += -L$$PLUGINPATH -ldxf
-+LIBS += $$PLUGINPATH/libdxf.so
diff --git a/cad/klayout/files/patch-src-plugins-streamers-gds2-lay_plugin-lay_plugin.pro b/cad/klayout/files/patch-src-plugins-streamers-gds2-lay_plugin-lay_plugin.pro
deleted file mode 100644
index ac3cee9abc20..000000000000
--- a/cad/klayout/files/patch-src-plugins-streamers-gds2-lay_plugin-lay_plugin.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/streamers/gds2/lay_plugin/lay_plugin.pro.orig	2021-08-28 17:33:25 UTC
-+++ src/plugins/streamers/gds2/lay_plugin/lay_plugin.pro
-@@ -6,7 +6,7 @@ include($$PWD/../../../lay_plugin.pri)
- 
- INCLUDEPATH += $$PWD/../db_plugin
- DEPENDPATH += $$PWD/../db_plugin
--LIBS += -L$$DESTDIR/../db_plugins -lgds2
-+LIBS += $$DESTDIR/../db_plugins/libgds2.so
- 
- !isEmpty(RPATH) {
-   QMAKE_RPATHDIR += $$RPATH/db_plugins
diff --git a/cad/klayout/files/patch-src-plugins-streamers-gds2-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-plugins-streamers-gds2-unit_tests-unit_tests.pro
deleted file mode 100644
index 46448c5e3c31..000000000000
--- a/cad/klayout/files/patch-src-plugins-streamers-gds2-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/plugins/streamers/gds2/unit_tests/unit_tests.pro.orig	2021-08-28 17:12:08 UTC
-+++ src/plugins/streamers/gds2/unit_tests/unit_tests.pro
-@@ -12,9 +12,9 @@ SOURCES = \
- INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- 
--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
- 
- PLUGINPATH = $$OUT_PWD/../../../../db_plugins
- QMAKE_RPATHDIR += $$PLUGINPATH
- 
--LIBS += -L$$PLUGINPATH -lgds2
-+LIBS += $$PLUGINPATH/libgds2.so
diff --git a/cad/klayout/files/patch-src-plugins-streamers-lefdef-lay_plugin-lay_plugin.pro b/cad/klayout/files/patch-src-plugins-streamers-lefdef-lay_plugin-lay_plugin.pro
deleted file mode 100644
index 7c7509ab28fa..000000000000
--- a/cad/klayout/files/patch-src-plugins-streamers-lefdef-lay_plugin-lay_plugin.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/streamers/lefdef/lay_plugin/lay_plugin.pro.orig	2021-08-28 17:34:08 UTC
-+++ src/plugins/streamers/lefdef/lay_plugin/lay_plugin.pro
-@@ -6,7 +6,7 @@ include($$PWD/../../../lay_plugin.pri)
- 
- INCLUDEPATH += $$PWD/../db_plugin
- DEPENDPATH += $$PWD/../db_plugin
--LIBS += -L$$DESTDIR/../db_plugins -llefdef
-+LIBS += $$DESTDIR/../db_plugins/liblefdef.so
- 
- !isEmpty(RPATH) {
-   QMAKE_RPATHDIR += $$RPATH/db_plugins
diff --git a/cad/klayout/files/patch-src-plugins-streamers-lefdef-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-plugins-streamers-lefdef-unit_tests-unit_tests.pro
deleted file mode 100644
index f4311200b91a..000000000000
--- a/cad/klayout/files/patch-src-plugins-streamers-lefdef-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/plugins/streamers/lefdef/unit_tests/unit_tests.pro.orig	2021-08-28 17:11:17 UTC
-+++ src/plugins/streamers/lefdef/unit_tests/unit_tests.pro
-@@ -12,9 +12,9 @@ SOURCES = \
- INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- 
--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
- 
- PLUGINPATH = $$OUT_PWD/../../../../db_plugins
- QMAKE_RPATHDIR += $$PLUGINPATH
- 
--LIBS += -L$$PLUGINPATH -llefdef
-+LIBS += $$PLUGINPATH/liblefdef.so
diff --git a/cad/klayout/files/patch-src-plugins-streamers-magic-lay_plugin-lay_plugin.pro b/cad/klayout/files/patch-src-plugins-streamers-magic-lay_plugin-lay_plugin.pro
deleted file mode 100644
index f9e5b2e0ea31..000000000000
--- a/cad/klayout/files/patch-src-plugins-streamers-magic-lay_plugin-lay_plugin.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/streamers/magic/lay_plugin/lay_plugin.pro.orig	2021-08-28 17:34:34 UTC
-+++ src/plugins/streamers/magic/lay_plugin/lay_plugin.pro
-@@ -6,7 +6,7 @@ include($$PWD/../../../lay_plugin.pri)
- 
- INCLUDEPATH += $$PWD/../db_plugin
- DEPENDPATH += $$PWD/../db_plugin
--LIBS += -L$$DESTDIR/../db_plugins -lmag
-+LIBS += $$DESTDIR/../db_plugins/libmag.so
- 
- !isEmpty(RPATH) {
-   QMAKE_RPATHDIR += $$RPATH/db_plugins
diff --git a/cad/klayout/files/patch-src-plugins-streamers-magic-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-plugins-streamers-magic-unit_tests-unit_tests.pro
deleted file mode 100644
index d625a2f81652..000000000000
--- a/cad/klayout/files/patch-src-plugins-streamers-magic-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/plugins/streamers/magic/unit_tests/unit_tests.pro.orig	2021-08-28 17:05:43 UTC
-+++ src/plugins/streamers/magic/unit_tests/unit_tests.pro
-@@ -11,9 +11,9 @@ SOURCES = \
- INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- 
--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
- 
- PLUGINPATH = $$OUT_PWD/../../../../db_plugins
- QMAKE_RPATHDIR += $$PLUGINPATH
- 
--LIBS += -L$$PLUGINPATH -lmag
-+LIBS += $$PLUGINPATH/libmag.so
diff --git a/cad/klayout/files/patch-src-plugins-streamers-oasis-lay_plugin-lay_plugin.pro b/cad/klayout/files/patch-src-plugins-streamers-oasis-lay_plugin-lay_plugin.pro
deleted file mode 100644
index ac53f3928bf0..000000000000
--- a/cad/klayout/files/patch-src-plugins-streamers-oasis-lay_plugin-lay_plugin.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/streamers/oasis/lay_plugin/lay_plugin.pro.orig	2021-08-28 17:35:02 UTC
-+++ src/plugins/streamers/oasis/lay_plugin/lay_plugin.pro
-@@ -6,7 +6,7 @@ include($$PWD/../../../lay_plugin.pri)
- 
- INCLUDEPATH += $$PWD/../db_plugin
- DEPENDPATH += $$PWD/../db_plugin
--LIBS += -L$$DESTDIR/../db_plugins -loasis
-+LIBS += $$DESTDIR/../db_plugins/liboasis.so
- 
- !isEmpty(RPATH) {
-   QMAKE_RPATHDIR += $$RPATH/db_plugins
diff --git a/cad/klayout/files/patch-src-plugins-streamers-oasis-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-plugins-streamers-oasis-unit_tests-unit_tests.pro
deleted file mode 100644
index 01305a7a6dd1..000000000000
--- a/cad/klayout/files/patch-src-plugins-streamers-oasis-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/plugins/streamers/oasis/unit_tests/unit_tests.pro.orig	2021-08-28 17:08:56 UTC
-+++ src/plugins/streamers/oasis/unit_tests/unit_tests.pro
-@@ -13,9 +13,9 @@ SOURCES = \
- INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- 
--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
- 
- PLUGINPATH = $$OUT_PWD/../../../../db_plugins
- QMAKE_RPATHDIR += $$PLUGINPATH
- 
--LIBS += -L$$PLUGINPATH -loasis
-+LIBS += $$PLUGINPATH/liboasis.so
diff --git a/cad/klayout/files/patch-src-plugins-streamers-pcb-lay_plugin-lay_plugin.pro b/cad/klayout/files/patch-src-plugins-streamers-pcb-lay_plugin-lay_plugin.pro
deleted file mode 100644
index e0444edc803b..000000000000
--- a/cad/klayout/files/patch-src-plugins-streamers-pcb-lay_plugin-lay_plugin.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/streamers/pcb/lay_plugin/lay_plugin.pro.orig	2021-08-28 17:35:38 UTC
-+++ src/plugins/streamers/pcb/lay_plugin/lay_plugin.pro
-@@ -6,7 +6,7 @@ include($$PWD/../../../lay_plugin.pri)
- 
- INCLUDEPATH += $$PWD/../db_plugin
- DEPENDPATH += $$PWD/../db_plugin
--LIBS += -L$$DESTDIR/../db_plugins -lpcb
-+LIBS += $$DESTDIR/../db_plugins/libpcb.so
- 
- !isEmpty(RPATH) {
-   QMAKE_RPATHDIR += $$RPATH/db_plugins
diff --git a/cad/klayout/files/patch-src-plugins-streamers-pcb-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-plugins-streamers-pcb-unit_tests-unit_tests.pro
deleted file mode 100644
index 2bf6f93430c6..000000000000
--- a/cad/klayout/files/patch-src-plugins-streamers-pcb-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/plugins/streamers/pcb/unit_tests/unit_tests.pro.orig	2021-08-28 17:10:35 UTC
-+++ src/plugins/streamers/pcb/unit_tests/unit_tests.pro
-@@ -11,9 +11,9 @@ SOURCES = \
- INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- 
--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
- 
- PLUGINPATH = $$OUT_PWD/../../../../db_plugins
- QMAKE_RPATHDIR += $$PLUGINPATH
- 
--LIBS += -L$$PLUGINPATH -lpcb
-+LIBS += $$PLUGINPATH/libpcb.so
diff --git a/cad/klayout/files/patch-src-plugins-tools-diff-lay_plugin-lay_plugin.pro b/cad/klayout/files/patch-src-plugins-tools-diff-lay_plugin-lay_plugin.pro
deleted file mode 100644
index 47fef30b315b..000000000000
--- a/cad/klayout/files/patch-src-plugins-tools-diff-lay_plugin-lay_plugin.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/tools/diff/lay_plugin/lay_plugin.pro.orig	2021-07-23 08:00:26 UTC
-+++ src/plugins/tools/diff/lay_plugin/lay_plugin.pro
-@@ -6,7 +6,7 @@ include($$PWD/../../../lay_plugin.pri)
- 
- INCLUDEPATH += $$RDB_INC $$ANT_INC
- DEPENDPATH += $$RDB_INC $$ANT_INC
--LIBS += -L$$DESTDIR/.. -lklayout_rdb -lklayout_ant
-+LIBS += $$DESTDIR/../libklayout_rdb.so $$DESTDIR/../libklayout_ant.so
- 
- HEADERS = \
-   layDiffToolDialog.h
diff --git a/cad/klayout/files/patch-src-plugins-tools-net_tracer-lay_plugin-lay_plugin.pro b/cad/klayout/files/patch-src-plugins-tools-net_tracer-lay_plugin-lay_plugin.pro
deleted file mode 100644
index 10aa9e06e115..000000000000
--- a/cad/klayout/files/patch-src-plugins-tools-net_tracer-lay_plugin-lay_plugin.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/tools/net_tracer/lay_plugin/lay_plugin.pro.orig	2021-08-28 17:36:21 UTC
-+++ src/plugins/tools/net_tracer/lay_plugin/lay_plugin.pro
-@@ -6,7 +6,7 @@ include($$PWD/../../../lay_plugin.pri)
- 
- INCLUDEPATH += $$PWD/../db_plugin
- DEPENDPATH += $$PWD/../db_plugin
--LIBS += -L$$DESTDIR/../db_plugins -lnet_tracer
-+LIBS += $$DESTDIR/../db_plugins/libnet_tracer.so
- 
- !isEmpty(RPATH) {
-   QMAKE_RPATHDIR += $$RPATH/db_plugins
diff --git a/cad/klayout/files/patch-src-plugins-tools-net_tracer-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-plugins-tools-net_tracer-unit_tests-unit_tests.pro
deleted file mode 100644
index d16b0c359103..000000000000
--- a/cad/klayout/files/patch-src-plugins-tools-net_tracer-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/plugins/tools/net_tracer/unit_tests/unit_tests.pro.orig	2021-08-28 17:13:55 UTC
-+++ src/plugins/tools/net_tracer/unit_tests/unit_tests.pro
-@@ -12,10 +12,10 @@ SOURCES = \
- INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common
- 
--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
- 
- # This makes the test pull the mebes library for testing (not installed)
- PLUGINPATH = $$OUT_PWD/../../../../db_plugins
- QMAKE_RPATHDIR += $$PLUGINPATH
- 
--LIBS += -L$$PLUGINPATH -lnet_tracer
-+LIBS += $$PLUGINPATH/libnet_tracer.so
diff --git a/cad/klayout/files/patch-src-plugins-tools-view_25d-lay_plugin-lay_plugin.pro b/cad/klayout/files/patch-src-plugins-tools-view_25d-lay_plugin-lay_plugin.pro
deleted file mode 100644
index fccb22be48e1..000000000000
--- a/cad/klayout/files/patch-src-plugins-tools-view_25d-lay_plugin-lay_plugin.pro
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/plugins/tools/view_25d/lay_plugin/lay_plugin.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/plugins/tools/view_25d/lay_plugin/lay_plugin.pro
-@@ -7,11 +7,12 @@ include($$PWD/../../../lay_plugin.pri)
- INCLUDEPATH += $$RDB_INC $$ANT_INC $$QTBASIC_INC
- DEPENDPATH += $$RDB_INC $$ANT_INC $$QTBASIC_INC
- 
--LIBS += -L$$DESTDIR/.. -lklayout_rdb -lklayout_ant
-+LIBS += $$DESTDIR/../libklayout_rdb.so $$DESTDIR/../libklayout_ant.so
-+
- equals(HAVE_QTBINDINGS, "1") {
--  LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtCore
-+  LIBS += $$DESTDIR/../libklayout_qtbasic.so $$DESTDIR/../libklayout_QtGui.so $$DESTDIR/../libklayout_QtCore.so
-   greaterThan(QT_MAJOR_VERSION, 4) {
--    LIBS += -lklayout_QtWidgets
-+    LIBS += $$DESTDIR/../libklayout_QtWidgets.so
-   }
- }
- 
diff --git a/cad/klayout/files/patch-src-plugins-tools-view_25d-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-plugins-tools-view_25d-unit_tests-unit_tests.pro
deleted file mode 100644
index 9961390079b6..000000000000
--- a/cad/klayout/files/patch-src-plugins-tools-view_25d-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/plugins/tools/view_25d/unit_tests/unit_tests.pro.orig	2021-08-28 17:15:44 UTC
-+++ src/plugins/tools/view_25d/unit_tests/unit_tests.pro
-@@ -13,9 +13,9 @@ SOURCES = \
- INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../lay_plugin $$PWD/../../../common
- DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../lay_plugin $$PWD/../../../common
- 
--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
- 
- PLUGINPATH = $$OUT_PWD/../../../../lay_plugins
- QMAKE_RPATHDIR += $$PLUGINPATH
- 
--LIBS += -L$$PLUGINPATH -ld25_ui
-+LIBS += $$PLUGINPATH/libd25_ui.so
diff --git a/cad/klayout/files/patch-src-plugins-tools-xor-lay_plugin-lay_plugin.pro b/cad/klayout/files/patch-src-plugins-tools-xor-lay_plugin-lay_plugin.pro
deleted file mode 100644
index d8bcd08d88ca..000000000000
--- a/cad/klayout/files/patch-src-plugins-tools-xor-lay_plugin-lay_plugin.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/tools/xor/lay_plugin/lay_plugin.pro.orig	2021-08-28 17:14:52 UTC
-+++ src/plugins/tools/xor/lay_plugin/lay_plugin.pro
-@@ -6,7 +6,7 @@ include($$PWD/../../../lay_plugin.pri)
- 
- INCLUDEPATH += $$RDB_INC $$ANT_INC
- DEPENDPATH += $$RDB_INC $$ANT_INC
--LIBS += -L$$DESTDIR/.. -lklayout_rdb -lklayout_ant
-+LIBS += $$DESTDIR/../libklayout_rdb.so $$DESTDIR/../libklayout_ant.so
- 
- HEADERS = \
-   layXORToolDialog.h \
diff --git a/cad/klayout/files/patch-src-pya-pya-pya.pro b/cad/klayout/files/patch-src-pya-pya-pya.pro
deleted file mode 100644
index 32dc8fdd5ba0..000000000000
--- a/cad/klayout/files/patch-src-pya-pya-pya.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pya/pya/pya.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/pya/pya/pya.pro
-@@ -40,7 +40,7 @@ HEADERS += \
- 
- INCLUDEPATH += "$$PYTHONINCLUDE" $$TL_INC $$GSI_INC
- DEPENDPATH += "$$PYTHONINCLUDE" $$TL_INC $$GSI_INC
--LIBS += "$$PYTHONLIBFILE" -L$$DESTDIR -lklayout_tl -lklayout_gsi
-+LIBS += "$$PYTHONLIBFILE" $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so
- 
- !msvc {
-   # Python is somewhat sloppy and relies on the compiler initializing fields
diff --git a/cad/klayout/files/patch-src-pya-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-pya-unit_tests-unit_tests.pro
deleted file mode 100644
index a89e5f29b919..000000000000
--- a/cad/klayout/files/patch-src-pya-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/pya/unit_tests/unit_tests.pro.orig	2021-08-28 17:00:21 UTC
-+++ src/pya/unit_tests/unit_tests.pro
-@@ -12,5 +12,5 @@ SOURCES = \
- INCLUDEPATH += $$PYA_INC $$DB_INC $$TL_INC $$GSI_INC
- DEPENDPATH += $$PYA_INC $$DB_INC $$TL_INC $$GSI_INC
- 
--LIBS += -L$$DESTDIR_UT -lklayout_pya -lklayout_db -lklayout_tl -lklayout_gsi
-+LIBS += $$DESTDIR_UT/libklayout_pya.so $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so
- 
diff --git a/cad/klayout/files/patch-src-pyastub-pyastub.pro b/cad/klayout/files/patch-src-pyastub-pyastub.pro
deleted file mode 100644
index aaa46834b199..000000000000
--- a/cad/klayout/files/patch-src-pyastub-pyastub.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pyastub/pyastub.pro.orig	2021-08-28 16:58:33 UTC
-+++ src/pyastub/pyastub.pro
-@@ -10,7 +10,7 @@ SOURCES = pya.cc 
- 
- 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
- 
- HEADERS += \
-     pyaCommon.h \
diff --git a/cad/klayout/files/patch-src-pymod-QtCore-QtCore.pro b/cad/klayout/files/patch-src-pymod-QtCore-QtCore.pro
deleted file mode 100644
index d9dbfe21086d..000000000000
--- a/cad/klayout/files/patch-src-pymod-QtCore-QtCore.pro
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/pymod/QtCore/QtCore.pro.orig	2022-04-24 08:12:38 UTC
-+++ src/pymod/QtCore/QtCore.pro
-@@ -8,8 +8,8 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_QtCore -lklayout_QtGui
-+LIBS += $$DESTDIR/../libklayout_QtCore.so $$DESTDIR/../libklayout_QtGui.so
- 
- greaterThan(QT_MAJOR_VERSION, 4) {
--  LIBS += -lklayout_QtWidgets
-+  LIBS += $$DESTDIR/../libklayout_QtWidgets.so
- }
diff --git a/cad/klayout/files/patch-src-pymod-QtDesigner-QtDesigner.pro b/cad/klayout/files/patch-src-pymod-QtDesigner-QtDesigner.pro
deleted file mode 100644
index 1dd0df4f8d8b..000000000000
--- a/cad/klayout/files/patch-src-pymod-QtDesigner-QtDesigner.pro
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/pymod/QtDesigner/QtDesigner.pro.orig	2021-08-28 19:56:24 UTC
-+++ src/pymod/QtDesigner/QtDesigner.pro
-@@ -8,4 +8,4 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_QtDesigner
-+LIBS += $$LIBDIR/libklayout_QtDesigner.so
diff --git a/cad/klayout/files/patch-src-pymod-QtGui-QtGui.pro b/cad/klayout/files/patch-src-pymod-QtGui-QtGui.pro
deleted file mode 100644
index 2a6daa1cb126..000000000000
--- a/cad/klayout/files/patch-src-pymod-QtGui-QtGui.pro
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/pymod/QtGui/QtGui.pro.orig	2022-04-24 08:12:38 UTC
-+++ src/pymod/QtGui/QtGui.pro
-@@ -8,9 +8,9 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_QtGui -lklayout_QtCore
-+LIBS += $$DESTDIR/../libklayout_QtGui.so $$DESTDIR/../libklayout_QtCore.so
- 
- greaterThan(QT_MAJOR_VERSION, 4) {
--  LIBS += -lklayout_QtWidgets
-+  LIBS += $$DESTDIR/../libklayout_QtWidgets.so
- }
- 
diff --git a/cad/klayout/files/patch-src-pymod-QtMultimedia-QtMultimedia.pro b/cad/klayout/files/patch-src-pymod-QtMultimedia-QtMultimedia.pro
deleted file mode 100644
index 3dd77faff448..000000000000
--- a/cad/klayout/files/patch-src-pymod-QtMultimedia-QtMultimedia.pro
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/pymod/QtMultimedia/QtMultimedia.pro.orig	2021-08-28 19:57:41 UTC
-+++ src/pymod/QtMultimedia/QtMultimedia.pro
-@@ -8,4 +8,4 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_QtMultimedia -lklayout_QtNetwork
-+LIBS += $$LIBDIR/libklayout_QtMultimedia.so $$LIBDIR/libklayout_QtNetwork.so
diff --git a/cad/klayout/files/patch-src-pymod-QtNetwork-QtNetwork.pro b/cad/klayout/files/patch-src-pymod-QtNetwork-QtNetwork.pro
deleted file mode 100644
index 570ad21d8f88..000000000000
--- a/cad/klayout/files/patch-src-pymod-QtNetwork-QtNetwork.pro
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/pymod/QtNetwork/QtNetwork.pro.orig	2021-08-28 19:58:14 UTC
-+++ src/pymod/QtNetwork/QtNetwork.pro
-@@ -8,4 +8,4 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_QtNetwork
-+LIBS += $$LIBDIR/libklayout_QtNetwork.so
diff --git a/cad/klayout/files/patch-src-pymod-QtPrintSupport-QtPrintSupport.pro b/cad/klayout/files/patch-src-pymod-QtPrintSupport-QtPrintSupport.pro
deleted file mode 100644
index 5bfabd2c33d3..000000000000
--- a/cad/klayout/files/patch-src-pymod-QtPrintSupport-QtPrintSupport.pro
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/pymod/QtPrintSupport/QtPrintSupport.pro.orig	2021-08-28 19:59:00 UTC
-+++ src/pymod/QtPrintSupport/QtPrintSupport.pro
-@@ -8,4 +8,4 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_QtPrintSupport
-+LIBS += $$LIBDIR/libklayout_QtPrintSupport.so
diff --git a/cad/klayout/files/patch-src-pymod-QtSql-QtSql.pro b/cad/klayout/files/patch-src-pymod-QtSql-QtSql.pro
deleted file mode 100644
index 99b21d612b4d..000000000000
--- a/cad/klayout/files/patch-src-pymod-QtSql-QtSql.pro
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/pymod/QtSql/QtSql.pro.orig	2021-08-28 19:58:35 UTC
-+++ src/pymod/QtSql/QtSql.pro
-@@ -8,4 +8,4 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_QtSql
-+LIBS += $$LIBDIR/libklayout_QtSql.so
diff --git a/cad/klayout/files/patch-src-pymod-QtSvg-QtSvg.pro b/cad/klayout/files/patch-src-pymod-QtSvg-QtSvg.pro
deleted file mode 100644
index fef9db258e60..000000000000
--- a/cad/klayout/files/patch-src-pymod-QtSvg-QtSvg.pro
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/pymod/QtSvg/QtSvg.pro.orig	2021-08-28 19:59:24 UTC
-+++ src/pymod/QtSvg/QtSvg.pro
-@@ -8,4 +8,4 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_QtSvg
-+LIBS += $$LIBDIR/libklayout_QtSvg.so
diff --git a/cad/klayout/files/patch-src-pymod-QtUiTools-QtUiTools.pro b/cad/klayout/files/patch-src-pymod-QtUiTools-QtUiTools.pro
deleted file mode 100644
index 6e2fff6af033..000000000000
--- a/cad/klayout/files/patch-src-pymod-QtUiTools-QtUiTools.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pymod/QtUiTools/QtUiTools.pro.orig	2021-08-28 19:59:47 UTC
-+++ src/pymod/QtUiTools/QtUiTools.pro
-@@ -8,6 +8,6 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_QtUiTools
--LIBS += -lklayout_QtCore
-+LIBS += $$LIBDIR/libklayout_QtUiTools.so
-+LIBS += $$LIBDIR/libklayout_QtCore.so
- 
diff --git a/cad/klayout/files/patch-src-pymod-QtWidgets-QtWidgets.pro b/cad/klayout/files/patch-src-pymod-QtWidgets-QtWidgets.pro
deleted file mode 100644
index 5fc6e368d396..000000000000
--- a/cad/klayout/files/patch-src-pymod-QtWidgets-QtWidgets.pro
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/pymod/QtWidgets/QtWidgets.pro.orig	2021-08-28 20:00:23 UTC
-+++ src/pymod/QtWidgets/QtWidgets.pro
-@@ -8,4 +8,4 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_QtWidgets
-+LIBS += $$LIBDIR/libklayout_QtWidgets.so
diff --git a/cad/klayout/files/patch-src-pymod-QtXml-QtXml.pro b/cad/klayout/files/patch-src-pymod-QtXml-QtXml.pro
deleted file mode 100644
index f1672caeddf1..000000000000
--- a/cad/klayout/files/patch-src-pymod-QtXml-QtXml.pro
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/pymod/QtXml/QtXml.pro.orig	2022-04-24 08:12:38 UTC
-+++ src/pymod/QtXml/QtXml.pro
-@@ -8,11 +8,11 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_QtCore -lklayout_QtXml
-+LIBS += $$DESTDIR/../libklayout_QtCore.so $$DESTDIR/../libklayout_QtXml.so
- 
- # Because of stupid dependency of QtCore on QtGui and this on QtWidgets:
--LIBS += -lklayout_QtGui
-+LIBS += $$DESTDIR/../libklayout_QtGui.so
- 
- greaterThan(QT_MAJOR_VERSION, 4) {
--  LIBS += -lklayout_QtWidgets
-+  LIBS += $$DESTDIR/../libklayout_QtWidgets.so
- }
diff --git a/cad/klayout/files/patch-src-pymod-QtXmlPatterns-QtXmlPatterns.pro b/cad/klayout/files/patch-src-pymod-QtXmlPatterns-QtXmlPatterns.pro
deleted file mode 100644
index 91dbb660b561..000000000000
--- a/cad/klayout/files/patch-src-pymod-QtXmlPatterns-QtXmlPatterns.pro
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/pymod/QtXmlPatterns/QtXmlPatterns.pro.orig	2021-08-28 20:01:33 UTC
-+++ src/pymod/QtXmlPatterns/QtXmlPatterns.pro
-@@ -8,4 +8,4 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_QtXmlPatterns -lklayout_QtNetwork
-+LIBS += $$LIBDIR/libklayout_QtXmlPatterns.so $$LIBDIR/libklayout_QtNetwork.so
diff --git a/cad/klayout/files/patch-src-pymod-bridge_sample-bridge_sample.pro b/cad/klayout/files/patch-src-pymod-bridge_sample-bridge_sample.pro
deleted file mode 100644
index 037cfe3bb8ad..000000000000
--- a/cad/klayout/files/patch-src-pymod-bridge_sample-bridge_sample.pro
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/pymod/bridge_sample/bridge_sample.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/pymod/bridge_sample/bridge_sample.pro
-@@ -65,12 +65,12 @@ equals(HAVE_QT, "0") {
- }
- INCLUDEPATH += "$$PYTHONINCLUDE" $$INC/tl/tl $$INC/pya/pya $$INC/gsi/gsi
- DEPENDPATH += "$$PYTHONINCLUDE" $$INC/tl/tl $$INC/pya/pya $$INC/gsi/gsi
--LIBS += "$$PYTHONLIBFILE" -L$$LIBDIR -lklayout_tl -lklayout_pya -lklayout_gsi
-+LIBS += "$$PYTHONLIBFILE" $$LIBDIR/libklayout_tl.so $$LIBDIR/libklayout_pya.so $$LIBDIR/libklayout_gsi.so
- 
- # Also include DB as this is our sample
- INCLUDEPATH += $$INC/db/db
- DEPENDPATH += $$INC/db/db
--LIBS += -L$$LIBDIR -lklayout_db
-+LIBS += $$LIBDIR/libklayout_db.so
- 
- # Pull in RPATH
- !isEmpty(RPATH) {
diff --git a/cad/klayout/files/patch-src-pymod-db-db.pro b/cad/klayout/files/patch-src-pymod-db-db.pro
deleted file mode 100644
index 77bdce27a758..000000000000
--- a/cad/klayout/files/patch-src-pymod-db-db.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/pymod/db/db.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/pymod/db/db.pro
-@@ -10,5 +10,5 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_db
-+LIBS += $$LIBDIR/libklayout_db.so
- 
diff --git a/cad/klayout/files/patch-src-pymod-lay-lay.pro b/cad/klayout/files/patch-src-pymod-lay-lay.pro
deleted file mode 100644
index d5a7541602c6..000000000000
--- a/cad/klayout/files/patch-src-pymod-lay-lay.pro
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/pymod/lay/lay.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/pymod/lay/lay.pro
-@@ -10,13 +10,13 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_layview
-+LIBS += $$LIBDIR/libklayout_layview.so
- 
- !equals(HAVE_QT, "0") {
--  LIBS += -lklayout_layui
--  LIBS += -lklayout_lay
-+  LIBS += $$LIBDIR/libklayout_layui.so
-+  LIBS += $$LIBDIR/libklayout_lay.so
- }
- 
- # hard linked as they contribute GSI classes to "lay" module:
--LIBS += -lklayout_laybasic -lklayout_img -lklayout_edt -lklayout_ant -lklayout_lym
-+LIBS += $$LIBDIR/libklayout_laybasic.so $$LIBDIR/libklayout_img.so $$LIBDIR/libklayout_edt.so $$LIBDIR/libklayout_ant.so $$LIBDIR/libklayout_lym.so
- 
diff --git a/cad/klayout/files/patch-src-pymod-lib-lib.pro b/cad/klayout/files/patch-src-pymod-lib-lib.pro
deleted file mode 100644
index 6b4bb479906b..000000000000
--- a/cad/klayout/files/patch-src-pymod-lib-lib.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/pymod/lib/lib.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/pymod/lib/lib.pro
-@@ -10,5 +10,5 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_lib
-+LIBS += $$DESTDIR/../libklayout_lib.so
- 
diff --git a/cad/klayout/files/patch-src-pymod-pymod.pri b/cad/klayout/files/patch-src-pymod-pymod.pri
deleted file mode 100644
index 210250c01440..000000000000
--- a/cad/klayout/files/patch-src-pymod-pymod.pri
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/pymod/pymod.pri.orig	2022-12-22 22:17:08 UTC
-+++ src/pymod/pymod.pri
-@@ -9,7 +9,7 @@ include($$PWD/../klayout.pri)
- 
- INCLUDEPATH += "$$PYTHONINCLUDE" $$TL_INC $$GSI_INC $$PYA_INC
- DEPENDPATH += "$$PYTHONINCLUDE" $$TL_INC $$GSI_INC $$PYA_INC
--LIBS += "$$PYTHONLIBFILE" -L$$LIBDIR -lklayout_tl -lklayout_gsi -lklayout_pya
-+LIBS += "$$PYTHONLIBFILE" $$LIBDIR/libklayout_tl.so $$LIBDIR/libklayout_gsi.so $$LIBDIR/libklayout_pya.so
- 
- !msvc {
-   # Python is somewhat sloppy and relies on the compiler initializing fields
-@@ -38,14 +38,14 @@ win32 {
- 
- }
- 
--lib_target.path = $$PREFIX/pymod/klayout
-+lib_target.path = $$shell_path($(INSTALLROOT)$(PYTHON_SITELIBDIR)/klayout)
- # This would be nice:
- #   lib_target.files += $$DESTDIR_PYMOD/$${TARGET}$${PYTHONEXTSUFFIX}
- # but some Qt versions need this explicitly:
- msvc {
-   lib_target.extra = $(INSTALL_PROGRAM) $$shell_path($$DESTDIR_PYMOD/$${TARGET}$${PYTHONEXTSUFFIX}) $$shell_path($(INSTALLROOT)$$PREFIX/pymod/klayout)
- } else {
--  lib_target.extra = $(INSTALL_PROGRAM) $$DESTDIR_PYMOD/$${TARGET}$${PYTHONEXTSUFFIX} $(INSTALLROOT)$$PREFIX/pymod/klayout
-+  lib_target.extra = $(INSTALL_PROGRAM) $$DESTDIR_PYMOD/$${TARGET}$${PYTHONEXTSUFFIX} $$shell_path($(INSTALLROOT)$(PYTHON_SITELIBDIR)/klayout)
- }
- INSTALLS = lib_target
- 
-@@ -70,14 +70,14 @@ INSTALLS = lib_target
-   }
- 
-   # INSTALLS needs to be inside a lib or app templates.
--  modsrc_target.path = $$PREFIX/pymod/klayout/$$REALMODULE
-+  modsrc_target.path = $$shell_path($(INSTALLROOT)$(PYTHON_SITELIBDIR)/klayout/$$REALMODULE)
-   # This would be nice:
-   #   init_target.files += $$DESTDIR_PYMOD/$$REALMODULE/*
-   # but some Qt versions need this explicitly:
-   msvc {
-     modsrc_target.extra = $(INSTALL_PROGRAM) $$shell_path($$DESTDIR_PYMOD/$$REALMODULE/*.py) $$shell_path($(INSTALLROOT)$$PREFIX/pymod/klayout/$$REALMODULE)
-   } else {
--    modsrc_target.extra = $(INSTALL_PROGRAM) $$DESTDIR_PYMOD/$$REALMODULE/*.py $(INSTALLROOT)$$PREFIX/pymod/klayout/$$REALMODULE
-+    modsrc_target.extra = $(INSTALL_PROGRAM) $$DESTDIR_PYMOD/$$REALMODULE/*.py $$shell_path($(INSTALLROOT)$(PYTHON_SITELIBDIR)/klayout/$$REALMODULE)
-   }
-   INSTALLS += modsrc_target
- 
diff --git a/cad/klayout/files/patch-src-pymod-rdb-rdb.pro b/cad/klayout/files/patch-src-pymod-rdb-rdb.pro
deleted file mode 100644
index c3dcb7086998..000000000000
--- a/cad/klayout/files/patch-src-pymod-rdb-rdb.pro
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/pymod/rdb/rdb.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/pymod/rdb/rdb.pro
-@@ -10,4 +10,4 @@ SOURCES = \
- 
- HEADERS += \
- 
--LIBS += -lklayout_rdb
-+LIBS += $$LIBDIR/libklayout_rdb.so
diff --git a/cad/klayout/files/patch-src-pymod-tl-tl.pro b/cad/klayout/files/patch-src-pymod-tl-tl.pro
deleted file mode 100644
index 8c77a4bc95b8..000000000000
--- a/cad/klayout/files/patch-src-pymod-tl-tl.pro
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/pymod/tl/tl.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/pymod/tl/tl.pro
-@@ -33,14 +33,14 @@ msvc {
- }
- 
- # INSTALLS needs to be inside a lib or app templates.
--init_target.path = $$PREFIX/pymod/klayout
-+init_target.path = $$shell_path($(INSTALLROOT)$(PYTHON_SITELIBDIR)/klayout)
- # This would be nice:
- #   init_target.files += $$DESTDIR_PYMOD/__init__.py
- # but some Qt versions need this explicitly:
- msvc {
-   init_target.extra = $(INSTALL_PROGRAM) $$shell_path($$DESTDIR_PYMOD/__init__.py) $$shell_path($(INSTALLROOT)$$PREFIX/pymod/klayout)
- } else {
--  init_target.extra = $(INSTALL_PROGRAM) $$DESTDIR_PYMOD/__init__.py $(INSTALLROOT)$$PREFIX/pymod/klayout
-+  init_target.extra = $(INSTALL_PROGRAM) $$DESTDIR_PYMOD/__init__.py $$shell_path($(INSTALLROOT)$(PYTHON_SITELIBDIR)/klayout)
- }
- INSTALLS += init_target
- 
-@@ -53,13 +53,13 @@ msvc {
- }
- 
- # INSTALLS needs to be inside a lib or app templates.
--modpyasrc_target.path = $$PREFIX/pymod/pya
-+modpyasrc_target.path = $$shell_path($(INSTALLROOT)$(PYTHON_SITELIBDIR)/klayout/pya)
- # This would be nice:
- #   init_target.files += $$DESTDIR_PYMOD/pya/*
- # but some Qt versions need this explicitly:
- msvc {
-   modpyasrc_target.extra = $(INSTALL_PROGRAM) $$shell_path($$DESTDIR_PYMOD/../pya/*.py) $$shell_path($(INSTALLROOT)$$PREFIX/pymod/pya)
- } else {
--  modpyasrc_target.extra = $(INSTALL_PROGRAM) $$DESTDIR_PYMOD/../pya/*.py $(INSTALLROOT)$$PREFIX/pymod/pya
-+  modpyasrc_target.extra = $(INSTALL_PROGRAM) $$DESTDIR_PYMOD/../pya/*.py $$shell_path($(INSTALLROOT)$(PYTHON_SITELIBDIR)/klayout/pya)
- }
- INSTALLS += modpyasrc_target
diff --git a/cad/klayout/files/patch-src-pymod-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-pymod-unit_tests-unit_tests.pro
deleted file mode 100644
index 8b547d4b9596..000000000000
--- a/cad/klayout/files/patch-src-pymod-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/pymod/unit_tests/unit_tests.pro.orig	2021-08-28 20:05:32 UTC
-+++ src/pymod/unit_tests/unit_tests.pro
-@@ -34,4 +34,4 @@ msvc {
- INCLUDEPATH += $$DB_INC $$TL_INC $$GSI_INC
- DEPENDPATH += $$DB_INC $$TL_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-rba-rba-rba.pro b/cad/klayout/files/patch-src-rba-rba-rba.pro
deleted file mode 100644
index d44dd3168004..000000000000
--- a/cad/klayout/files/patch-src-rba-rba-rba.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/rba/rba/rba.pro.orig	2021-08-28 16:13:08 UTC
-+++ src/rba/rba/rba.pro
-@@ -25,5 +25,5 @@ HEADERS += \
- # NOTE: ../common needs to be before RUBYINCLUDE since there is a config.h too.
- INCLUDEPATH += ../common "$$RUBYINCLUDE" "$$RUBYINCLUDE2" $$TL_INC $$GSI_INC
- DEPENDPATH += ../common "$$RUBYINCLUDE" "$$RUBYINCLUDE2" $$TL_INC $$GSI_INC
--LIBS += "$$RUBYLIBFILE" -L$$DESTDIR -lklayout_tl -lklayout_gsi
-+LIBS += "$$RUBYLIBFILE" $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so
-   
diff --git a/cad/klayout/files/patch-src-rba-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-rba-unit_tests-unit_tests.pro
deleted file mode 100644
index 3ae9cfb26859..000000000000
--- a/cad/klayout/files/patch-src-rba-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/rba/unit_tests/unit_tests.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/rba/unit_tests/unit_tests.pro
-@@ -12,7 +12,7 @@ SOURCES = \
- INCLUDEPATH += $$RBA_INC $$TL_INC $$DB_INC $$GSI_INC
- DEPENDPATH += $$RBA_INC $$TL_INC $$DB_INC $$GSI_INC
- 
--LIBS += -L$$DESTDIR_UT -lklayout_rba -lklayout_tl -lklayout_db -lklayout_gsi
-+LIBS += $$DESTDIR_UT/libklayout_rba.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_gsi.so
- 
- !equals(HAVE_QT, "0") || !equals(HAVE_PYTHON, "0") {
-   RESOURCES = \
diff --git a/cad/klayout/files/patch-src-rbastub-rbastub.pro b/cad/klayout/files/patch-src-rbastub-rbastub.pro
deleted file mode 100644
index cb1eeef49fe1..000000000000
--- a/cad/klayout/files/patch-src-rbastub-rbastub.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/rbastub/rbastub.pro.orig	2021-08-28 16:09:14 UTC
-+++ src/rbastub/rbastub.pro
-@@ -12,5 +12,5 @@ SOURCES = rba.cc
- 
- 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-rdb-rdb-rdb.pro b/cad/klayout/files/patch-src-rdb-rdb-rdb.pro
deleted file mode 100644
index e50233d4822e..000000000000
--- a/cad/klayout/files/patch-src-rdb-rdb-rdb.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/rdb/rdb/rdb.pro.orig	2021-08-28 16:07:29 UTC
-+++ src/rdb/rdb/rdb.pro
-@@ -30,5 +30,5 @@ HEADERS = \
- 
- INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC
- DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC
--LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db
-+LIBS += $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_db.so
- 
diff --git a/cad/klayout/files/patch-src-rdb-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-rdb-unit_tests-unit_tests.pro
deleted file mode 100644
index dae99b0952bc..000000000000
--- a/cad/klayout/files/patch-src-rdb-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/rdb/unit_tests/unit_tests.pro.orig	2021-08-28 16:08:37 UTC
-+++ src/rdb/unit_tests/unit_tests.pro
-@@ -13,5 +13,5 @@ SOURCES = \
- INCLUDEPATH += $$RDB_INC $$TL_INC $$DB_INC $$GSI_INC
- DEPENDPATH += $$RDB_INC $$TL_INC $$DB_INC $$GSI_INC
- 
--LIBS += -L$$DESTDIR_UT -lklayout_rdb -lklayout_db -lklayout_tl -lklayout_gsi
-+LIBS += $$DESTDIR_UT/libklayout_rdb.so $$DESTDIR_UT/libklayout_db.so $$DESTDIR_UT/libklayout_tl.so $$DESTDIR_UT/libklayout_gsi.so
- 
diff --git a/cad/klayout/files/patch-src-tl-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-tl-unit_tests-unit_tests.pro
deleted file mode 100644
index 7ff4636baba6..000000000000
--- a/cad/klayout/files/patch-src-tl-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/tl/unit_tests/unit_tests.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/tl/unit_tests/unit_tests.pro
-@@ -58,5 +58,5 @@ SOURCES = \
- INCLUDEPATH += $$TL_INC
- DEPENDPATH += $$TL_INC
- 
--LIBS += -L$$DESTDIR_UT -lklayout_tl
-+LIBS += $$DESTDIR_UT/libklayout_tl.so
- 
diff --git a/cad/klayout/files/patch-src-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-unit_tests-unit_tests.pro
deleted file mode 100644
index d16363b53b12..000000000000
--- a/cad/klayout/files/patch-src-unit_tests-unit_tests.pro
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/unit_tests/unit_tests.pro.orig	2022-12-22 22:17:08 UTC
-+++ src/unit_tests/unit_tests.pro
-@@ -11,7 +11,7 @@ include($$PWD/../with_all_libs.pri)
-   INCLUDEPATH += $$DOC_INC $$ICONS_INC
-   DEPENDPATH += $$DOC_INC $$ICONS_INC
- 
--  LIBS += -lklayout_doc -lklayout_icons
-+  LIBS += $$DESTDIR/libklayout_doc.so $$DESTDIR/libklayout_icons.so
- 
- }
- 
-@@ -34,10 +34,10 @@ HEADERS += \
- !win32 {
-   LIBS += -ldl
- } else {
--  LIBS += -lshell32
-+  LIBS += $$DESTDIR/libshell32.so
- }
- 
--LIBS += -lklayout_gsi_test
-+LIBS += $$DESTDIR/libklayout_gsi_test.so
- 
- !equals(HAVE_QT, "0") {
- 
-@@ -46,10 +46,10 @@ LIBS += -lklayout_gsi_test
- 
-   equals(HAVE_QTBINDINGS, "1") {
-     !equals(HAVE_QT_XML, "0") {
--      LIBS += -lklayout_QtXml
-+      LIBS += $$DESTDIR/libklayout_QtXml.so
-     }
-     greaterThan(QT_MAJOR_VERSION, 4) {
--      LIBS += -lklayout_QtWidgets
-+      LIBS += $$DESTDIR/libklayout_QtWidgets.so
-     }
-   }
- 
diff --git a/cad/klayout/files/patch-src-with_all_libs.pri b/cad/klayout/files/patch-src-with_all_libs.pri
deleted file mode 100644
index b7ae27de1cf6..000000000000
--- a/cad/klayout/files/patch-src-with_all_libs.pri
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/with_all_libs.pri.orig	2022-12-22 22:17:08 UTC
-+++ src/with_all_libs.pri
-@@ -2,38 +2,38 @@
- INCLUDEPATH += $$RBA_INC $$PYA_INC $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LYM_INC $$LAYBASIC_INC $$LAYVIEW_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LIB_INC $$VERSION_INC
- DEPENDPATH += $$RBA_INC $$PYA_INC $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LYM_INC $$LAYBASIC_INC $$LAYVIEW_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LIB_INC $$VERSION_INC
- 
--LIBS += "$$PYTHONLIBFILE" "$$RUBYLIBFILE" -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_lym -lklayout_laybasic -lklayout_layview -lklayout_ant -lklayout_img -lklayout_edt -lklayout_lib
-+LIBS += "$$PYTHONLIBFILE" "$$RUBYLIBFILE" $$DESTDIR/libklayout_tl.so $$DESTDIR/libklayout_gsi.so $$DESTDIR/libklayout_db.so $$DESTDIR/libklayout_rdb.so $$DESTDIR/libklayout_lym.so $$DESTDIR/libklayout_laybasic.so $$DESTDIR/libklayout_layview.so $$DESTDIR/libklayout_ant.so $$DESTDIR/libklayout_img.so $$DESTDIR/libklayout_edt.so $$DESTDIR/libklayout_lib.so
- 
- !equals(HAVE_QT, "0") {
- 
-   INCLUDEPATH += $$LAYUI_INC $$LAY_INC
-   DEPENDPATH += $$LAYUI_INC $$LAY_INC
- 
--  LIBS += -L$$DESTDIR -lklayout_layui -lklayout_lay
-+  LIBS += $$DESTDIR/libklayout_layui.so $$DESTDIR/libklayout_lay.so
- 
-   equals(HAVE_QTBINDINGS, "1") {
--    LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtCore
-+    LIBS += $$DESTDIR/libklayout_qtbasic.so $$DESTDIR/libklayout_QtGui.so $$DESTDIR/libklayout_QtCore.so
-   }
- 
- }
- 
- equals(HAVE_RUBY, "1") {
--  LIBS += -lklayout_rba
-+  LIBS += $$DESTDIR/libklayout_rba.so
- } else {
--  LIBS += -lklayout_rbastub
-+  LIBS += $$DESTDIR/libklayout_rbastub.so
- }
- 
- equals(HAVE_PYTHON, "1") {
--  LIBS += -lklayout_pya
-+  LIBS += $$DESTDIR/libklayout_pya.so
- } else {
--  LIBS += -lklayout_pyastub
-+  LIBS += $$DESTDIR/libklayout_pyastub.so
- }
- 
- equals(HAVE_RUBY, "1") {
-   # DRC is only available with Ruby
-   INCLUDEPATH += $$DRC_INC $$LVS_INC
-   DEPENDPATH += $$DRC_INC $$LVS_INC
--  LIBS += -lklayout_drc -lklayout_lvs
-+  LIBS += $$DESTDIR/libklayout_drc.so $$DESTDIR/libklayout_lvs.so
- }
- 
- msvc {
diff --git a/cad/klayout/files/patch-src_tl_tl_tlTimer.cc b/cad/klayout/files/patch-src_tl_tl_tlTimer.cc
new file mode 100644
index 000000000000..44fae9dfb1a4
--- /dev/null
+++ b/cad/klayout/files/patch-src_tl_tl_tlTimer.cc
@@ -0,0 +1,11 @@
+--- src/tl/tl/tlTimer.cc.orig	2026-07-10 21:21:50 UTC
++++ src/tl/tl/tlTimer.cc
+@@ -274,7 +274,7 @@ Timer::memory_size ()
+   return size_t (memsize) * size_t (getpagesize ());
+ 
+ #else
+-#  error Unsupported platform
++  return 0;
+ #endif
+ }
+ 
diff --git a/cad/klayout/pkg-plist b/cad/klayout/pkg-plist
index 5197a94dc930..84b8e6d9db58 100644
--- a/cad/klayout/pkg-plist
+++ b/cad/klayout/pkg-plist
@@ -1,333 +1,282 @@
 bin/klayout
-bin/strm2cif
-bin/strm2dxf
-bin/strm2gds
-bin/strm2gdstxt
-bin/strm2mag
-bin/strm2oas
-bin/strm2txt
-bin/strmclip
-bin/strmcmp
-bin/strmrun
-bin/strmxor
-lib/klayout/db_plugins/libcif.so
-lib/klayout/db_plugins/libcif.so.0
-lib/klayout/db_plugins/libcif.so.%%PORTVERSION_R%%
-lib/klayout/db_plugins/libcif.so.%%PORTVERSION%%
-lib/klayout/db_plugins/libdxf.so
-lib/klayout/db_plugins/libdxf.so.0
-lib/klayout/db_plugins/libdxf.so.%%PORTVERSION_R%%
-lib/klayout/db_plugins/libdxf.so.%%PORTVERSION%%
-lib/klayout/db_plugins/libgds2.so
-lib/klayout/db_plugins/libgds2.so.0
-lib/klayout/db_plugins/libgds2.so.%%PORTVERSION_R%%
-lib/klayout/db_plugins/libgds2.so.%%PORTVERSION%%
-lib/klayout/db_plugins/liblefdef.so
-lib/klayout/db_plugins/liblefdef.so.0
-lib/klayout/db_plugins/liblefdef.so.%%PORTVERSION_R%%
-lib/klayout/db_plugins/liblefdef.so.%%PORTVERSION%%
-lib/klayout/db_plugins/libmag.so
-lib/klayout/db_plugins/libmag.so.0
-lib/klayout/db_plugins/libmag.so.%%PORTVERSION_R%%
-lib/klayout/db_plugins/libmag.so.%%PORTVERSION%%
-lib/klayout/db_plugins/libnet_tracer.so
-lib/klayout/db_plugins/libnet_tracer.so.0
-lib/klayout/db_plugins/libnet_tracer.so.%%PORTVERSION_R%%
-lib/klayout/db_plugins/libnet_tracer.so.%%PORTVERSION%%
-lib/klayout/db_plugins/liboasis.so
-lib/klayout/db_plugins/liboasis.so.0
-lib/klayout/db_plugins/liboasis.so.%%PORTVERSION_R%%
-lib/klayout/db_plugins/liboasis.so.%%PORTVERSION%%
-lib/klayout/db_plugins/libpcb.so
-lib/klayout/db_plugins/libpcb.so.0
-lib/klayout/db_plugins/libpcb.so.%%PORTVERSION_R%%
-lib/klayout/db_plugins/libpcb.so.%%PORTVERSION%%
-lib/klayout/lay_plugins/libbool_ui.so
-lib/klayout/lay_plugins/libbool_ui.so.0
-lib/klayout/lay_plugins/libbool_ui.so.%%PORTVERSION_R%%
-lib/klayout/lay_plugins/libbool_ui.so.%%PORTVERSION%%
-lib/klayout/lay_plugins/libcif_ui.so
-lib/klayout/lay_plugins/libcif_ui.so.0
-lib/klayout/lay_plugins/libcif_ui.so.%%PORTVERSION_R%%
-lib/klayout/lay_plugins/libcif_ui.so.%%PORTVERSION%%
-lib/klayout/lay_plugins/libcommon_ui.so
-lib/klayout/lay_plugins/libcommon_ui.so.0
-lib/klayout/lay_plugins/libcommon_ui.so.%%PORTVERSION_R%%
-lib/klayout/lay_plugins/libcommon_ui.so.%%PORTVERSION%%
-lib/klayout/lay_plugins/libd25_ui.so
-lib/klayout/lay_plugins/libd25_ui.so.0
-lib/klayout/lay_plugins/libd25_ui.so.%%PORTVERSION_R%%
-lib/klayout/lay_plugins/libd25_ui.so.%%PORTVERSION%%
-lib/klayout/lay_plugins/libdiff_ui.so
-lib/klayout/lay_plugins/libdiff_ui.so.0
-lib/klayout/lay_plugins/libdiff_ui.so.%%PORTVERSION_R%%
-lib/klayout/lay_plugins/libdiff_ui.so.%%PORTVERSION%%
-lib/klayout/lay_plugins/libdxf_ui.so
-lib/klayout/lay_plugins/libdxf_ui.so.0
-lib/klayout/lay_plugins/libdxf_ui.so.%%PORTVERSION_R%%
-lib/klayout/lay_plugins/libdxf_ui.so.%%PORTVERSION%%
-lib/klayout/lay_plugins/libgds2_ui.so
-lib/klayout/lay_plugins/libgds2_ui.so.0
-lib/klayout/lay_plugins/libgds2_ui.so.%%PORTVERSION_R%%
-lib/klayout/lay_plugins/libgds2_ui.so.%%PORTVERSION%%
-lib/klayout/lay_plugins/libimport_ui.so
-lib/klayout/lay_plugins/libimport_ui.so.0
-lib/klayout/lay_plugins/libimport_ui.so.%%PORTVERSION_R%%
-lib/klayout/lay_plugins/libimport_ui.so.%%PORTVERSION%%
-lib/klayout/lay_plugins/liblefdef_ui.so
-lib/klayout/lay_plugins/liblefdef_ui.so.0
-lib/klayout/lay_plugins/liblefdef_ui.so.%%PORTVERSION_R%%
-lib/klayout/lay_plugins/liblefdef_ui.so.%%PORTVERSION%%
-lib/klayout/lay_plugins/libmag_ui.so
-lib/klayout/lay_plugins/libmag_ui.so.0
-lib/klayout/lay_plugins/libmag_ui.so.%%PORTVERSION_R%%
-lib/klayout/lay_plugins/libmag_ui.so.%%PORTVERSION%%
-lib/klayout/lay_plugins/libnet_tracer_ui.so
-lib/klayout/lay_plugins/libnet_tracer_ui.so.0
-lib/klayout/lay_plugins/libnet_tracer_ui.so.%%PORTVERSION_R%%
-lib/klayout/lay_plugins/libnet_tracer_ui.so.%%PORTVERSION%%
-lib/klayout/lay_plugins/liboasis_ui.so
-lib/klayout/lay_plugins/liboasis_ui.so.0
-lib/klayout/lay_plugins/liboasis_ui.so.%%PORTVERSION_R%%
-lib/klayout/lay_plugins/liboasis_ui.so.%%PORTVERSION%%
-lib/klayout/lay_plugins/libpcb_ui.so
-lib/klayout/lay_plugins/libpcb_ui.so.0
-lib/klayout/lay_plugins/libpcb_ui.so.%%PORTVERSION_R%%
-lib/klayout/lay_plugins/libpcb_ui.so.%%PORTVERSION%%
-lib/klayout/lay_plugins/libxor_ui.so
-lib/klayout/lay_plugins/libxor_ui.so.0
-lib/klayout/lay_plugins/libxor_ui.so.%%PORTVERSION_R%%
-lib/klayout/lay_plugins/libxor_ui.so.%%PORTVERSION%%
-lib/klayout/libQtCore.so
-lib/klayout/libQtCore.so.0
-lib/klayout/libQtCore.so.%%PORTVERSION_R%%
-lib/klayout/libQtCore.so.%%PORTVERSION%%
-lib/klayout/libQtDesigner.so
-lib/klayout/libQtDesigner.so.0
-lib/klayout/libQtDesigner.so.%%PORTVERSION_R%%
-lib/klayout/libQtDesigner.so.%%PORTVERSION%%
-lib/klayout/libQtGui.so
-lib/klayout/libQtGui.so.0
-lib/klayout/libQtGui.so.%%PORTVERSION_R%%
-lib/klayout/libQtGui.so.%%PORTVERSION%%
-lib/klayout/libQtMultimedia.so
-lib/klayout/libQtMultimedia.so.0
-lib/klayout/libQtMultimedia.so.%%PORTVERSION_R%%
-lib/klayout/libQtMultimedia.so.%%PORTVERSION%%
-lib/klayout/libQtNetwork.so
-lib/klayout/libQtNetwork.so.0
-lib/klayout/libQtNetwork.so.%%PORTVERSION_R%%
-lib/klayout/libQtNetwork.so.%%PORTVERSION%%
-lib/klayout/libQtPrintSupport.so
-lib/klayout/libQtPrintSupport.so.0
-lib/klayout/libQtPrintSupport.so.%%PORTVERSION_R%%
-lib/klayout/libQtPrintSupport.so.%%PORTVERSION%%
-lib/klayout/libQtSql.so
-lib/klayout/libQtSql.so.0
-lib/klayout/libQtSql.so.%%PORTVERSION_R%%
-lib/klayout/libQtSql.so.%%PORTVERSION%%
-lib/klayout/libQtSvg.so
-lib/klayout/libQtSvg.so.0
-lib/klayout/libQtSvg.so.%%PORTVERSION_R%%
-lib/klayout/libQtSvg.so.%%PORTVERSION%%
-lib/klayout/libQtUiTools.so
-lib/klayout/libQtUiTools.so.0
-lib/klayout/libQtUiTools.so.%%PORTVERSION_R%%
-lib/klayout/libQtUiTools.so.%%PORTVERSION%%
-lib/klayout/libQtWidgets.so
-lib/klayout/libQtWidgets.so.0
-lib/klayout/libQtWidgets.so.%%PORTVERSION_R%%
-lib/klayout/libQtWidgets.so.%%PORTVERSION%%
-lib/klayout/libQtXml.so
-lib/klayout/libQtXml.so.0
-lib/klayout/libQtXml.so.%%PORTVERSION_R%%
-lib/klayout/libQtXml.so.%%PORTVERSION%%
-lib/klayout/libQtXmlPatterns.so
-lib/klayout/libQtXmlPatterns.so.0
-lib/klayout/libQtXmlPatterns.so.%%PORTVERSION_R%%
-lib/klayout/libQtXmlPatterns.so.%%PORTVERSION%%
-lib/klayout/libbridge_mod.so
-lib/klayout/libbridge_mod.so.1
-lib/klayout/libbridge_mod.so.1.0
-lib/klayout/libbridge_mod.so.1.0.0
-lib/klayout/libdbcore.so
-lib/klayout/libdbcore.so.0
-lib/klayout/libdbcore.so.%%PORTVERSION_R%%
-lib/klayout/libdbcore.so.%%PORTVERSION%%
-lib/klayout/libklayout_QtCore.so
-lib/klayout/libklayout_QtCore.so.0
-lib/klayout/libklayout_QtCore.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_QtCore.so.%%PORTVERSION%%
-lib/klayout/libklayout_QtDesigner.so
-lib/klayout/libklayout_QtDesigner.so.0
-lib/klayout/libklayout_QtDesigner.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_QtDesigner.so.%%PORTVERSION%%
-lib/klayout/libklayout_QtGui.so
-lib/klayout/libklayout_QtGui.so.0
-lib/klayout/libklayout_QtGui.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_QtGui.so.%%PORTVERSION%%
-lib/klayout/libklayout_QtMultimedia.so
-lib/klayout/libklayout_QtMultimedia.so.0
-lib/klayout/libklayout_QtMultimedia.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_QtMultimedia.so.%%PORTVERSION%%
-lib/klayout/libklayout_QtNetwork.so
-lib/klayout/libklayout_QtNetwork.so.0
-lib/klayout/libklayout_QtNetwork.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_QtNetwork.so.%%PORTVERSION%%
-lib/klayout/libklayout_QtPrintSupport.so
-lib/klayout/libklayout_QtPrintSupport.so.0
-lib/klayout/libklayout_QtPrintSupport.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_QtPrintSupport.so.%%PORTVERSION%%
-lib/klayout/libklayout_QtSql.so
-lib/klayout/libklayout_QtSql.so.0
-lib/klayout/libklayout_QtSql.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_QtSql.so.%%PORTVERSION%%
-lib/klayout/libklayout_QtSvg.so
-lib/klayout/libklayout_QtSvg.so.0
-lib/klayout/libklayout_QtSvg.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_QtSvg.so.%%PORTVERSION%%
-lib/klayout/libklayout_QtUiTools.so
-lib/klayout/libklayout_QtUiTools.so.0
-lib/klayout/libklayout_QtUiTools.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_QtUiTools.so.%%PORTVERSION%%
-lib/klayout/libklayout_QtWidgets.so
-lib/klayout/libklayout_QtWidgets.so.0
-lib/klayout/libklayout_QtWidgets.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_QtWidgets.so.%%PORTVERSION%%
-lib/klayout/libklayout_QtXml.so
-lib/klayout/libklayout_QtXml.so.0
-lib/klayout/libklayout_QtXml.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_QtXml.so.%%PORTVERSION%%
-lib/klayout/libklayout_QtXmlPatterns.so
-lib/klayout/libklayout_QtXmlPatterns.so.0
-lib/klayout/libklayout_QtXmlPatterns.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_QtXmlPatterns.so.%%PORTVERSION%%
-lib/klayout/libklayout_ant.so
-lib/klayout/libklayout_ant.so.0
-lib/klayout/libklayout_ant.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_ant.so.%%PORTVERSION%%
-lib/klayout/libklayout_bd.so
-lib/klayout/libklayout_bd.so.0
-lib/klayout/libklayout_bd.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_bd.so.%%PORTVERSION%%
-lib/klayout/libklayout_db.so
-lib/klayout/libklayout_db.so.0
-lib/klayout/libklayout_db.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_db.so.%%PORTVERSION%%
-lib/klayout/libklayout_doc.so
-lib/klayout/libklayout_doc.so.0
-lib/klayout/libklayout_doc.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_doc.so.%%PORTVERSION%%
-lib/klayout/libklayout_drc.so
-lib/klayout/libklayout_drc.so.0
-lib/klayout/libklayout_drc.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_drc.so.%%PORTVERSION%%
-lib/klayout/libklayout_edt.so
-lib/klayout/libklayout_edt.so.0
-lib/klayout/libklayout_edt.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_edt.so.%%PORTVERSION%%
-lib/klayout/libklayout_gsi.so
-lib/klayout/libklayout_gsi.so.0
-lib/klayout/libklayout_gsi.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_gsi.so.%%PORTVERSION%%
-lib/klayout/libklayout_gsi_test.so
-lib/klayout/libklayout_gsi_test.so.0
-lib/klayout/libklayout_gsi_test.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_gsi_test.so.%%PORTVERSION%%
-lib/klayout/libklayout_icons.so
-lib/klayout/libklayout_icons.so.0
-lib/klayout/libklayout_icons.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_icons.so.%%PORTVERSION%%
-lib/klayout/libklayout_img.so
-lib/klayout/libklayout_img.so.0
-lib/klayout/libklayout_img.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_img.so.%%PORTVERSION%%
-lib/klayout/libklayout_lay.so
-lib/klayout/libklayout_lay.so.0
-lib/klayout/libklayout_lay.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_lay.so.%%PORTVERSION%%
-lib/klayout/libklayout_laybasic.so
-lib/klayout/libklayout_laybasic.so.0
-lib/klayout/libklayout_laybasic.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_laybasic.so.%%PORTVERSION%%
-lib/klayout/libklayout_layui.so
-lib/klayout/libklayout_layui.so.0
-lib/klayout/libklayout_layui.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_layui.so.%%PORTVERSION%%
-lib/klayout/libklayout_layview.so
-lib/klayout/libklayout_layview.so.0
-lib/klayout/libklayout_layview.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_layview.so.%%PORTVERSION%%
-lib/klayout/libklayout_lib.so
-lib/klayout/libklayout_lib.so.0
-lib/klayout/libklayout_lib.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_lib.so.%%PORTVERSION%%
-lib/klayout/libklayout_lvs.so
-lib/klayout/libklayout_lvs.so.0
-lib/klayout/libklayout_lvs.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_lvs.so.%%PORTVERSION%%
-lib/klayout/libklayout_lym.so
-lib/klayout/libklayout_lym.so.0
-lib/klayout/libklayout_lym.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_lym.so.%%PORTVERSION%%
-lib/klayout/libklayout_pya.so
-lib/klayout/libklayout_pya.so.0
-lib/klayout/libklayout_pya.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_pya.so.%%PORTVERSION%%
-lib/klayout/libklayout_qtbasic.so
-lib/klayout/libklayout_qtbasic.so.0
-lib/klayout/libklayout_qtbasic.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_qtbasic.so.%%PORTVERSION%%
-lib/klayout/libklayout_rba.so
-lib/klayout/libklayout_rba.so.0
-lib/klayout/libklayout_rba.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_rba.so.%%PORTVERSION%%
-lib/klayout/libklayout_rdb.so
-lib/klayout/libklayout_rdb.so.0
-lib/klayout/libklayout_rdb.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_rdb.so.%%PORTVERSION%%
-lib/klayout/libklayout_tl.so
-lib/klayout/libklayout_tl.so.0
-lib/klayout/libklayout_tl.so.%%PORTVERSION_R%%
-lib/klayout/libklayout_tl.so.%%PORTVERSION%%
-lib/klayout/liblaycore.so
-lib/klayout/liblaycore.so.0
-lib/klayout/liblaycore.so.%%PORTVERSION_R%%
-lib/klayout/liblaycore.so.%%PORTVERSION%%
-lib/klayout/liblibcore.so
-lib/klayout/liblibcore.so.0
-lib/klayout/liblibcore.so.%%PORTVERSION_R%%
-lib/klayout/liblibcore.so.%%PORTVERSION%%
-lib/klayout/librdbcore.so
-lib/klayout/librdbcore.so.0
-lib/klayout/librdbcore.so.%%PORTVERSION_R%%
-lib/klayout/librdbcore.so.%%PORTVERSION%%
-lib/klayout/libtlcore.so
-lib/klayout/libtlcore.so.0
-lib/klayout/libtlcore.so.%%PORTVERSION_R%%
-lib/klayout/libtlcore.so.%%PORTVERSION%%
-%%PYTHON_SITELIBDIR%%/klayout/QtCore%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/QtDesigner%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/QtGui%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/QtMultimedia%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/QtNetwork%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/QtPrintSupport%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/QtSql%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/QtSvg%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/QtUiTools%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/QtWidgets%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/QtXml%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/QtXmlPatterns%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/__init__.py
-%%PYTHON_SITELIBDIR%%/klayout/db/__init__.py
-%%PYTHON_SITELIBDIR%%/klayout/db/pcell_declaration_helper.py
-%%PYTHON_SITELIBDIR%%/klayout/dbcore%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/lay
-%%PYTHON_SITELIBDIR%%/klayout/laycore%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/lib/__init__.py
-%%PYTHON_SITELIBDIR%%/klayout/libcore%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/pya/__init__.py
-%%PYTHON_SITELIBDIR%%/klayout/rdb/__init__.py
-%%PYTHON_SITELIBDIR%%/klayout/rdbcore%%PYTHON_TAG%%.so
-%%PYTHON_SITELIBDIR%%/klayout/tl/__init__.py
-%%PYTHON_SITELIBDIR%%/klayout/tlcore%%PYTHON_TAG%%.so
+klayout/db_plugins/libcif.so
+klayout/db_plugins/libcif.so.0
+klayout/db_plugins/libcif.so.%%DISTVERSION_R%%
+klayout/db_plugins/libcif.so.%%DISTVERSION%%
+klayout/db_plugins/libdxf.so
+klayout/db_plugins/libdxf.so.0
+klayout/db_plugins/libdxf.so.%%DISTVERSION_R%%
+klayout/db_plugins/libdxf.so.%%DISTVERSION%%
+klayout/db_plugins/libgds2.so
+klayout/db_plugins/libgds2.so.0
+klayout/db_plugins/libgds2.so.%%DISTVERSION_R%%
+klayout/db_plugins/libgds2.so.%%DISTVERSION%%
+klayout/db_plugins/liblefdef.so
+klayout/db_plugins/liblefdef.so.0
+klayout/db_plugins/liblefdef.so.%%DISTVERSION_R%%
+klayout/db_plugins/liblefdef.so.%%DISTVERSION%%
+klayout/db_plugins/liblstream.so
+klayout/db_plugins/liblstream.so.0
+klayout/db_plugins/liblstream.so.%%DISTVERSION_R%%
+klayout/db_plugins/liblstream.so.%%DISTVERSION%%
+klayout/db_plugins/libmag.so
+klayout/db_plugins/libmag.so.0
+klayout/db_plugins/libmag.so.%%DISTVERSION_R%%
+klayout/db_plugins/libmag.so.%%DISTVERSION%%
+klayout/db_plugins/libmaly.so
+klayout/db_plugins/libmaly.so.0
+klayout/db_plugins/libmaly.so.%%DISTVERSION_R%%
+klayout/db_plugins/libmaly.so.%%DISTVERSION%%
+klayout/db_plugins/libnet_tracer.so
+klayout/db_plugins/libnet_tracer.so.0
+klayout/db_plugins/libnet_tracer.so.%%DISTVERSION_R%%
+klayout/db_plugins/libnet_tracer.so.%%DISTVERSION%%
+klayout/db_plugins/liboasis.so
+klayout/db_plugins/liboasis.so.0
+klayout/db_plugins/liboasis.so.%%DISTVERSION_R%%
+klayout/db_plugins/liboasis.so.%%DISTVERSION%%
+klayout/db_plugins/libpcb.so
+klayout/db_plugins/libpcb.so.0
+klayout/db_plugins/libpcb.so.%%DISTVERSION_R%%
+klayout/db_plugins/libpcb.so.%%DISTVERSION%%
+klayout/klayout
+klayout/lay_plugins/libbool_ui.so
+klayout/lay_plugins/libbool_ui.so.0
+klayout/lay_plugins/libbool_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/libbool_ui.so.%%DISTVERSION%%
+klayout/lay_plugins/libcif_ui.so
+klayout/lay_plugins/libcif_ui.so.0
+klayout/lay_plugins/libcif_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/libcif_ui.so.%%DISTVERSION%%
+klayout/lay_plugins/libcommon_ui.so
+klayout/lay_plugins/libcommon_ui.so.0
+klayout/lay_plugins/libcommon_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/libcommon_ui.so.%%DISTVERSION%%
+klayout/lay_plugins/libd25_ui.so
+klayout/lay_plugins/libd25_ui.so.0
+klayout/lay_plugins/libd25_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/libd25_ui.so.%%DISTVERSION%%
+klayout/lay_plugins/libdensity_map_ui.so
+klayout/lay_plugins/libdensity_map_ui.so.0
+klayout/lay_plugins/libdensity_map_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/libdensity_map_ui.so.%%DISTVERSION%%
+klayout/lay_plugins/libdiff_ui.so
+klayout/lay_plugins/libdiff_ui.so.0
+klayout/lay_plugins/libdiff_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/libdiff_ui.so.%%DISTVERSION%%
+klayout/lay_plugins/libdxf_ui.so
+klayout/lay_plugins/libdxf_ui.so.0
+klayout/lay_plugins/libdxf_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/libdxf_ui.so.%%DISTVERSION%%
+klayout/lay_plugins/libgds2_ui.so
+klayout/lay_plugins/libgds2_ui.so.0
+klayout/lay_plugins/libgds2_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/libgds2_ui.so.%%DISTVERSION%%
+klayout/lay_plugins/libimport_ui.so
+klayout/lay_plugins/libimport_ui.so.0
+klayout/lay_plugins/libimport_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/libimport_ui.so.%%DISTVERSION%%
+klayout/lay_plugins/liblay_plugin.so
+klayout/lay_plugins/liblay_plugin.so.0
+klayout/lay_plugins/liblay_plugin.so.%%DISTVERSION_R%%
+klayout/lay_plugins/liblay_plugin.so.%%DISTVERSION%%
+klayout/lay_plugins/liblefdef_ui.so
+klayout/lay_plugins/liblefdef_ui.so.0
+klayout/lay_plugins/liblefdef_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/liblefdef_ui.so.%%DISTVERSION%%
+klayout/lay_plugins/libmag_ui.so
+klayout/lay_plugins/libmag_ui.so.0
+klayout/lay_plugins/libmag_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/libmag_ui.so.%%DISTVERSION%%
+klayout/lay_plugins/libmaly_ui.so
+klayout/lay_plugins/libmaly_ui.so.0
+klayout/lay_plugins/libmaly_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/libmaly_ui.so.%%DISTVERSION%%
+klayout/lay_plugins/libnet_tracer_ui.so
+klayout/lay_plugins/libnet_tracer_ui.so.0
+klayout/lay_plugins/libnet_tracer_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/libnet_tracer_ui.so.%%DISTVERSION%%
+klayout/lay_plugins/liboasis_ui.so
+klayout/lay_plugins/liboasis_ui.so.0
+klayout/lay_plugins/liboasis_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/liboasis_ui.so.%%DISTVERSION%%
+klayout/lay_plugins/libpcb_ui.so
+klayout/lay_plugins/libpcb_ui.so.0
+klayout/lay_plugins/libpcb_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/libpcb_ui.so.%%DISTVERSION%%
+klayout/lay_plugins/libxor_ui.so
+klayout/lay_plugins/libxor_ui.so.0
+klayout/lay_plugins/libxor_ui.so.%%DISTVERSION_R%%
+klayout/lay_plugins/libxor_ui.so.%%DISTVERSION%%
+klayout/libklayout_QtCore.so
+klayout/libklayout_QtCore.so.0
+klayout/libklayout_QtCore.so.%%DISTVERSION_R%%
+klayout/libklayout_QtCore.so.%%DISTVERSION%%
+klayout/libklayout_QtCore5Compat.so
+klayout/libklayout_QtCore5Compat.so.0
+klayout/libklayout_QtCore5Compat.so.%%DISTVERSION_R%%
+klayout/libklayout_QtCore5Compat.so.%%DISTVERSION%%
+klayout/libklayout_QtGui.so
+klayout/libklayout_QtGui.so.0
+klayout/libklayout_QtGui.so.%%DISTVERSION_R%%
+klayout/libklayout_QtGui.so.%%DISTVERSION%%
+klayout/libklayout_QtMultimedia.so
+klayout/libklayout_QtMultimedia.so.0
+klayout/libklayout_QtMultimedia.so.%%DISTVERSION_R%%
+klayout/libklayout_QtMultimedia.so.%%DISTVERSION%%
+klayout/libklayout_QtNetwork.so
+klayout/libklayout_QtNetwork.so.0
+klayout/libklayout_QtNetwork.so.%%DISTVERSION_R%%
+klayout/libklayout_QtNetwork.so.%%DISTVERSION%%
+klayout/libklayout_QtPrintSupport.so
+klayout/libklayout_QtPrintSupport.so.0
+klayout/libklayout_QtPrintSupport.so.%%DISTVERSION_R%%
+klayout/libklayout_QtPrintSupport.so.%%DISTVERSION%%
+klayout/libklayout_QtSql.so
+klayout/libklayout_QtSql.so.0
+klayout/libklayout_QtSql.so.%%DISTVERSION_R%%
+klayout/libklayout_QtSql.so.%%DISTVERSION%%
+klayout/libklayout_QtSvg.so
+klayout/libklayout_QtSvg.so.0
+klayout/libklayout_QtSvg.so.%%DISTVERSION_R%%
+klayout/libklayout_QtSvg.so.%%DISTVERSION%%
+klayout/libklayout_QtUiTools.so
+klayout/libklayout_QtUiTools.so.0
+klayout/libklayout_QtUiTools.so.%%DISTVERSION_R%%
+klayout/libklayout_QtUiTools.so.%%DISTVERSION%%
+klayout/libklayout_QtWidgets.so
+klayout/libklayout_QtWidgets.so.0
+klayout/libklayout_QtWidgets.so.%%DISTVERSION_R%%
+klayout/libklayout_QtWidgets.so.%%DISTVERSION%%
+klayout/libklayout_QtXml.so
+klayout/libklayout_QtXml.so.0
+klayout/libklayout_QtXml.so.%%DISTVERSION_R%%
+klayout/libklayout_QtXml.so.%%DISTVERSION%%
+klayout/libklayout_ant.so
+klayout/libklayout_ant.so.0
+klayout/libklayout_ant.so.%%DISTVERSION_R%%
+klayout/libklayout_ant.so.%%DISTVERSION%%
+klayout/libklayout_bd.so
+klayout/libklayout_bd.so.0
+klayout/libklayout_bd.so.%%DISTVERSION_R%%
+klayout/libklayout_bd.so.%%DISTVERSION%%
+klayout/libklayout_db.so
+klayout/libklayout_db.so.0
+klayout/libklayout_db.so.%%DISTVERSION_R%%
+klayout/libklayout_db.so.%%DISTVERSION%%
+klayout/libklayout_doc.so
+klayout/libklayout_doc.so.0
+klayout/libklayout_doc.so.%%DISTVERSION_R%%
+klayout/libklayout_doc.so.%%DISTVERSION%%
+klayout/libklayout_drc.so
+klayout/libklayout_drc.so.0
+klayout/libklayout_drc.so.%%DISTVERSION_R%%
+klayout/libklayout_drc.so.%%DISTVERSION%%
+klayout/libklayout_edt.so
+klayout/libklayout_edt.so.0
+klayout/libklayout_edt.so.%%DISTVERSION_R%%
+klayout/libklayout_edt.so.%%DISTVERSION%%
+klayout/libklayout_gsi.so
+klayout/libklayout_gsi.so.0
+klayout/libklayout_gsi.so.%%DISTVERSION_R%%
+klayout/libklayout_gsi.so.%%DISTVERSION%%
+klayout/libklayout_icons.so
+klayout/libklayout_icons.so.0
+klayout/libklayout_icons.so.%%DISTVERSION_R%%
+klayout/libklayout_icons.so.%%DISTVERSION%%
+klayout/libklayout_img.so
+klayout/libklayout_img.so.0
+klayout/libklayout_img.so.%%DISTVERSION_R%%
+klayout/libklayout_img.so.%%DISTVERSION%%
+klayout/libklayout_lay.so
+klayout/libklayout_lay.so.0
+klayout/libklayout_lay.so.%%DISTVERSION_R%%
+klayout/libklayout_lay.so.%%DISTVERSION%%
+klayout/libklayout_laybasic.so
+klayout/libklayout_laybasic.so.0
+klayout/libklayout_laybasic.so.%%DISTVERSION_R%%
+klayout/libklayout_laybasic.so.%%DISTVERSION%%
+klayout/libklayout_layui.so
+klayout/libklayout_layui.so.0
+klayout/libklayout_layui.so.%%DISTVERSION_R%%
+klayout/libklayout_layui.so.%%DISTVERSION%%
+klayout/libklayout_layview.so
+klayout/libklayout_layview.so.0
+klayout/libklayout_layview.so.%%DISTVERSION_R%%
+klayout/libklayout_layview.so.%%DISTVERSION%%
+klayout/libklayout_lib.so
+klayout/libklayout_lib.so.0
+klayout/libklayout_lib.so.%%DISTVERSION_R%%
+klayout/libklayout_lib.so.%%DISTVERSION%%
+klayout/libklayout_lvs.so
+klayout/libklayout_lvs.so.0
+klayout/libklayout_lvs.so.%%DISTVERSION_R%%
+klayout/libklayout_lvs.so.%%DISTVERSION%%
+klayout/libklayout_lym.so
+klayout/libklayout_lym.so.0
+klayout/libklayout_lym.so.%%DISTVERSION_R%%
+klayout/libklayout_lym.so.%%DISTVERSION%%
+klayout/libklayout_pex.so
+klayout/libklayout_pex.so.0
+klayout/libklayout_pex.so.%%DISTVERSION_R%%
+klayout/libklayout_pex.so.%%DISTVERSION%%
+klayout/libklayout_pya.so
+klayout/libklayout_pya.so.0
+klayout/libklayout_pya.so.%%DISTVERSION_R%%
+klayout/libklayout_pya.so.%%DISTVERSION%%
+klayout/libklayout_qtbasic.so
+klayout/libklayout_qtbasic.so.0
+klayout/libklayout_qtbasic.so.%%DISTVERSION_R%%
+klayout/libklayout_qtbasic.so.%%DISTVERSION%%
+klayout/libklayout_rba.so
+klayout/libklayout_rba.so.0
+klayout/libklayout_rba.so.%%DISTVERSION_R%%
+klayout/libklayout_rba.so.%%DISTVERSION%%
+klayout/libklayout_rdb.so
+klayout/libklayout_rdb.so.0
+klayout/libklayout_rdb.so.%%DISTVERSION_R%%
+klayout/libklayout_rdb.so.%%DISTVERSION%%
+klayout/libklayout_tl.so
+klayout/libklayout_tl.so.0
+klayout/libklayout_tl.so.%%DISTVERSION_R%%
+klayout/libklayout_tl.so.%%DISTVERSION%%
+klayout/pymod/klayout/QtCore%%PYTHON_TAG%%.so
+klayout/pymod/klayout/QtCore5Compat%%PYTHON_TAG%%.so
+klayout/pymod/klayout/QtGui%%PYTHON_TAG%%.so
+klayout/pymod/klayout/QtMultimedia%%PYTHON_TAG%%.so
+klayout/pymod/klayout/QtNetwork%%PYTHON_TAG%%.so
+klayout/pymod/klayout/QtPrintSupport%%PYTHON_TAG%%.so
+klayout/pymod/klayout/QtSql%%PYTHON_TAG%%.so
+klayout/pymod/klayout/QtSvg%%PYTHON_TAG%%.so
+klayout/pymod/klayout/QtUiTools%%PYTHON_TAG%%.so
+klayout/pymod/klayout/QtWidgets%%PYTHON_TAG%%.so
+klayout/pymod/klayout/QtXml%%PYTHON_TAG%%.so
+klayout/pymod/klayout/__init__.py
+klayout/pymod/klayout/db/__init__.py
+klayout/pymod/klayout/db/pcell_declaration_helper.py
+klayout/pymod/klayout/dbcore%%PYTHON_TAG%%.so
+klayout/pymod/klayout/lay/__init__.py
+klayout/pymod/klayout/laycore%%PYTHON_TAG%%.so
+klayout/pymod/klayout/lib/__init__.py
+klayout/pymod/klayout/libcore%%PYTHON_TAG%%.so
+klayout/pymod/klayout/pex/__init__.py
+klayout/pymod/klayout/pexcore%%PYTHON_TAG%%.so
+klayout/pymod/klayout/pya/__init__.py
+klayout/pymod/klayout/pyacore%%PYTHON_TAG%%.so
+klayout/pymod/klayout/rdb/__init__.py
+klayout/pymod/klayout/rdbcore%%PYTHON_TAG%%.so
+klayout/pymod/klayout/tl/__init__.py
+klayout/pymod/klayout/tlcore%%PYTHON_TAG%%.so
+klayout/pymod/pya/__init__.py
+klayout/strm2cif
+klayout/strm2dxf
+klayout/strm2gds
+klayout/strm2gdstxt
+klayout/strm2lstr
+klayout/strm2mag
+klayout/strm2oas
+klayout/strm2txt
+klayout/strmclip
+klayout/strmcmp
+klayout/strmrun
+klayout/strmxor
author	Kevin Zheng <kevinz5000@gmail.com>	2026-07-24 23:21:53 +0000
committer	Vladimir Druzenko <vvd@FreeBSD.org>	2026-07-24 23:21:53 +0000
commit	0df877bdd97bc73d55b248086d1b9b9d9bd4121a (patch)
tree	ae09c81aeaa4c34fc6484ca181bedf25c964339b
parent	a907ef593f153461bd30f958815555cf2325a79c (diff)