klayout: Fix install files

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: klayout: Fix install files
From: Atsushi Toyokura <asteria.at%gmail.com@localhost>
Date: Sat, 16 Jan 2021 14:53:52 +0000
Module Name:	pkgsrc-wip
Committed By:	Atsushi Toyokura <asteria.at%gmail.com@localhost>
Pushed By:	steleto
Date:		Sat Jan 16 23:53:52 2021 +0900
Changeset:	7104f217c1802716865836e1f809ddc92b31711d

Modified Files:
	klayout/Makefile
	klayout/PLIST

Log Message:
klayout: Fix install files

- add lay_plugins and pymod
- remove plugins
- use pax(1) instead of rsync

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

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

diffstat:
 klayout/Makefile |  23 +++---
 klayout/PLIST    | 208 ++++++++++++++++++++-----------------------------------
 2 files changed, 83 insertions(+), 148 deletions(-)

diffs:
diff --git a/klayout/Makefile b/klayout/Makefile
index 9bc4c4c170..f972edcd96 100644
--- a/klayout/Makefile
+++ b/klayout/Makefile
@@ -10,15 +10,11 @@ COMMENT=	Simple GDS and OASIS file viewer and Editor
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake bash
+USE_TOOLS+=	gmake bash pax
 
-BUILD_DEPENDS+=	rsync-[0-9]*:../../net/rsync
 CFLAGS+=	-I${PREFIX}/include/python${PYVERSUFFIX}
 NO_CONFIGURE=	yes
 
-CHECK_SHLIBS_SKIP+=	lib/klayout/plugins/streamers/*/unit_tests/* \
-			lib/klayout/plugins/tools/net_tracer/unit_tests/*
-
 SUBST_CLASSES+=		rpath
 SUBST_MESSAGE.rpath=	Add COMPILER_RPATH_FLAG and PREFIX to NetBSD specific config file
 SUBST_FILES.rpath+=	config/Makefile.conf.netbsd-32-gcc-release
@@ -30,7 +26,8 @@ BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
 AUTO_MKDIRS=		yes
 INSTALL_BINDIR=		${DESTDIR}${PREFIX}/bin
 INSTALL_LIBDIR=		${DESTDIR}${PREFIX}/lib/klayout
-REL_DIR=		build-release
+REL_DIR=		bin-release
+PLUGINS_DIR=		db_plugins lay_plugins pymod
 INSTALLATION_DIRS+=	lib/klayout
 
 
@@ -41,23 +38,19 @@ MAKE_JOBS_FLAG=		-option -j${MAKE_JOBS}
 .endif
 
 do-build:
-	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${BASH} build.sh \
+	cd ${WRKSRC} && ${MKDIR} ${REL_DIR} && \
+	${PKGSRC_SETENV} ${MAKE_ENV} ${BASH} build.sh \
 	-python python${PYVERSSUFFIX} \
 	-qt5 \
 	-qmake ${PREFIX}/qt5/bin/qmake \
 	-ruby ${PREFIX}/bin/${RUBY_NAME} \
 	${MAKE_JOBS_FLAG} \
-	-prefix ${PREFIX} \
+	-prefix ${REL_DIR} \
 	-rpath ${PREFIX}/lib/klayout
 
 do-install:
-	cd ${WRKSRC} && \
-	rsync     -aH      ${WRKSRC}/${REL_DIR}/libklayout_* \
-		${INSTALL_LIBDIR} && \
-	rsync     -aH --exclude=\*\.o      ${WRKSRC}/${REL_DIR}/plugins/ \
-		${INSTALL_LIBDIR}/plugins/ && \
-	rsync     -aH --exclude=\*\.o      ${WRKSRC}/${REL_DIR}/db_plugins/ \
-		${INSTALL_LIBDIR}/db_plugins/
+	cd ${WRKSRC}/${REL_DIR} && \
+	${PAX} -wr libklayout* ${PLUGINS_DIR} ${INSTALL_LIBDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/${REL_DIR}/strm* \
 		${INSTALL_BINDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/${REL_DIR}/klayout \
diff --git a/klayout/PLIST b/klayout/PLIST
index fbd031db02..153d6f351e 100644
--- a/klayout/PLIST
+++ b/klayout/PLIST
@@ -43,6 +43,58 @@ lib/klayout/db_plugins/libpcb.${RUBY_DLEXT}
 lib/klayout/db_plugins/libpcb.so.0
 lib/klayout/db_plugins/libpcb.so.0.26
 lib/klayout/db_plugins/libpcb.so.${PKGVERSION}
+lib/klayout/lay_plugins/libbool_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libbool_ui.so.0
+lib/klayout/lay_plugins/libbool_ui.so.0.26
+lib/klayout/lay_plugins/libbool_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libcif_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libcif_ui.so.0
+lib/klayout/lay_plugins/libcif_ui.so.0.26
+lib/klayout/lay_plugins/libcif_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libcommon_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libcommon_ui.so.0
+lib/klayout/lay_plugins/libcommon_ui.so.0.26
+lib/klayout/lay_plugins/libcommon_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libdiff_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libdiff_ui.so.0
+lib/klayout/lay_plugins/libdiff_ui.so.0.26
+lib/klayout/lay_plugins/libdiff_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libdxf_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libdxf_ui.so.0
+lib/klayout/lay_plugins/libdxf_ui.so.0.26
+lib/klayout/lay_plugins/libdxf_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libgds2_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libgds2_ui.so.0
+lib/klayout/lay_plugins/libgds2_ui.so.0.26
+lib/klayout/lay_plugins/libgds2_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libimport_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libimport_ui.so.0
+lib/klayout/lay_plugins/libimport_ui.so.0.26
+lib/klayout/lay_plugins/libimport_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/liblefdef_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/liblefdef_ui.so.0
+lib/klayout/lay_plugins/liblefdef_ui.so.0.26
+lib/klayout/lay_plugins/liblefdef_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libmag_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libmag_ui.so.0
+lib/klayout/lay_plugins/libmag_ui.so.0.26
+lib/klayout/lay_plugins/libmag_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libnet_tracer_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libnet_tracer_ui.so.0
+lib/klayout/lay_plugins/libnet_tracer_ui.so.0.26
+lib/klayout/lay_plugins/libnet_tracer_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/liboasis_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/liboasis_ui.so.0
+lib/klayout/lay_plugins/liboasis_ui.so.0.26
+lib/klayout/lay_plugins/liboasis_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libpcb_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libpcb_ui.so.0
+lib/klayout/lay_plugins/libpcb_ui.so.0.26
+lib/klayout/lay_plugins/libpcb_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libxor_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libxor_ui.so.0
+lib/klayout/lay_plugins/libxor_ui.so.0.26
+lib/klayout/lay_plugins/libxor_ui.so.${PKGVERSION}
 lib/klayout/libklayout_QtCore.${RUBY_DLEXT}
 lib/klayout/libklayout_QtCore.so.0
 lib/klayout/libklayout_QtCore.so.0.26
@@ -111,10 +163,6 @@ lib/klayout/libklayout_gsi.${RUBY_DLEXT}
 lib/klayout/libklayout_gsi.so.0
 lib/klayout/libklayout_gsi.so.0.26
 lib/klayout/libklayout_gsi.so.${PKGVERSION}
-lib/klayout/libklayout_gsi_test.${RUBY_DLEXT}
-lib/klayout/libklayout_gsi_test.so.0
-lib/klayout/libklayout_gsi_test.so.0.26
-lib/klayout/libklayout_gsi_test.so.${PKGVERSION}
 lib/klayout/libklayout_img.${RUBY_DLEXT}
 lib/klayout/libklayout_img.so.0
 lib/klayout/libklayout_img.so.0.26
@@ -159,132 +207,26 @@ lib/klayout/libklayout_tl.${RUBY_DLEXT}
 lib/klayout/libklayout_tl.so.0
 lib/klayout/libklayout_tl.so.0.26
 lib/klayout/libklayout_tl.so.${PKGVERSION}
-lib/klayout/plugins/Makefile
-lib/klayout/plugins/streamers/Makefile
-lib/klayout/plugins/streamers/cif/Makefile
-lib/klayout/plugins/streamers/cif/db_plugin/Makefile
-lib/klayout/plugins/streamers/cif/lay_plugin/Makefile
-lib/klayout/plugins/streamers/cif/lay_plugin/moc_layCIFReaderPlugin.cpp
-lib/klayout/plugins/streamers/cif/lay_plugin/moc_layCIFWriterPlugin.cpp
-lib/klayout/plugins/streamers/cif/lay_plugin/moc_predefs.h
-lib/klayout/plugins/streamers/cif/lay_plugin/ui_CIFReaderOptionPage.h
-lib/klayout/plugins/streamers/cif/lay_plugin/ui_CIFWriterOptionPage.h
-lib/klayout/plugins/streamers/cif/unit_tests/Makefile
-lib/klayout/plugins/streamers/cif/unit_tests/libcif_tests.${RUBY_DLEXT}
-lib/klayout/plugins/streamers/cif/unit_tests/libcif_tests.so.0
-lib/klayout/plugins/streamers/cif/unit_tests/libcif_tests.so.0.26
-lib/klayout/plugins/streamers/cif/unit_tests/libcif_tests.so.${PKGVERSION}
-lib/klayout/plugins/streamers/common/Makefile
-lib/klayout/plugins/streamers/common/lay_plugin/Makefile
-lib/klayout/plugins/streamers/common/lay_plugin/moc_layCommonReaderPlugin.cpp
-lib/klayout/plugins/streamers/common/lay_plugin/moc_predefs.h
-lib/klayout/plugins/streamers/common/lay_plugin/ui_CommonReaderOptionsPage.h
-lib/klayout/plugins/streamers/dxf/Makefile
-lib/klayout/plugins/streamers/dxf/db_plugin/Makefile
-lib/klayout/plugins/streamers/dxf/lay_plugin/Makefile
-lib/klayout/plugins/streamers/dxf/lay_plugin/moc_layDXFReaderPlugin.cpp
-lib/klayout/plugins/streamers/dxf/lay_plugin/moc_layDXFWriterPlugin.cpp
-lib/klayout/plugins/streamers/dxf/lay_plugin/moc_predefs.h
-lib/klayout/plugins/streamers/dxf/lay_plugin/ui_DXFReaderOptionPage.h
-lib/klayout/plugins/streamers/dxf/lay_plugin/ui_DXFWriterOptionPage.h
-lib/klayout/plugins/streamers/dxf/unit_tests/Makefile
-lib/klayout/plugins/streamers/dxf/unit_tests/libdxf_tests.${RUBY_DLEXT}
-lib/klayout/plugins/streamers/dxf/unit_tests/libdxf_tests.so.0
-lib/klayout/plugins/streamers/dxf/unit_tests/libdxf_tests.so.0.26
-lib/klayout/plugins/streamers/dxf/unit_tests/libdxf_tests.so.${PKGVERSION}
-lib/klayout/plugins/streamers/gds2/Makefile
-lib/klayout/plugins/streamers/gds2/db_plugin/Makefile
-lib/klayout/plugins/streamers/gds2/lay_plugin/Makefile
-lib/klayout/plugins/streamers/gds2/lay_plugin/moc_layGDS2ReaderPlugin.cpp
-lib/klayout/plugins/streamers/gds2/lay_plugin/moc_layGDS2WriterPlugin.cpp
-lib/klayout/plugins/streamers/gds2/lay_plugin/moc_predefs.h
-lib/klayout/plugins/streamers/gds2/lay_plugin/ui_GDS2ReaderOptionPage.h
-lib/klayout/plugins/streamers/gds2/lay_plugin/ui_GDS2WriterOptionPage.h
-lib/klayout/plugins/streamers/gds2/unit_tests/Makefile
-lib/klayout/plugins/streamers/gds2/unit_tests/libgds2_tests.${RUBY_DLEXT}
-lib/klayout/plugins/streamers/gds2/unit_tests/libgds2_tests.so.0
-lib/klayout/plugins/streamers/gds2/unit_tests/libgds2_tests.so.0.26
-lib/klayout/plugins/streamers/gds2/unit_tests/libgds2_tests.so.${PKGVERSION}
-lib/klayout/plugins/streamers/lefdef/Makefile
-lib/klayout/plugins/streamers/lefdef/db_plugin/Makefile
-lib/klayout/plugins/streamers/lefdef/lay_plugin/Makefile
-lib/klayout/plugins/streamers/lefdef/lay_plugin/moc_layLEFDEFImportDialogs.cpp
-lib/klayout/plugins/streamers/lefdef/lay_plugin/moc_predefs.h
-lib/klayout/plugins/streamers/lefdef/lay_plugin/ui_LEFDEFImportOptionsDialog.h
-lib/klayout/plugins/streamers/lefdef/lay_plugin/ui_LEFDEFTechnologyComponentEditor.h
-lib/klayout/plugins/streamers/lefdef/unit_tests/Makefile
-lib/klayout/plugins/streamers/lefdef/unit_tests/liblefdef_tests.${RUBY_DLEXT}
-lib/klayout/plugins/streamers/lefdef/unit_tests/liblefdef_tests.so.0
-lib/klayout/plugins/streamers/lefdef/unit_tests/liblefdef_tests.so.0.26
-lib/klayout/plugins/streamers/lefdef/unit_tests/liblefdef_tests.so.${PKGVERSION}
-lib/klayout/plugins/streamers/magic/Makefile
-lib/klayout/plugins/streamers/magic/db_plugin/Makefile
-lib/klayout/plugins/streamers/magic/lay_plugin/Makefile
-lib/klayout/plugins/streamers/magic/lay_plugin/moc_layMAGReaderPlugin.cpp
-lib/klayout/plugins/streamers/magic/lay_plugin/moc_layMAGWriterPlugin.cpp
-lib/klayout/plugins/streamers/magic/lay_plugin/moc_predefs.h
-lib/klayout/plugins/streamers/magic/lay_plugin/ui_MAGReaderOptionPage.h
-lib/klayout/plugins/streamers/magic/lay_plugin/ui_MAGWriterOptionPage.h
-lib/klayout/plugins/streamers/magic/unit_tests/Makefile
-lib/klayout/plugins/streamers/magic/unit_tests/libmag_tests.${RUBY_DLEXT}
-lib/klayout/plugins/streamers/magic/unit_tests/libmag_tests.so.0
-lib/klayout/plugins/streamers/magic/unit_tests/libmag_tests.so.0.26
-lib/klayout/plugins/streamers/magic/unit_tests/libmag_tests.so.${PKGVERSION}
-lib/klayout/plugins/streamers/oasis/Makefile
-lib/klayout/plugins/streamers/oasis/db_plugin/Makefile
-lib/klayout/plugins/streamers/oasis/lay_plugin/Makefile
-lib/klayout/plugins/streamers/oasis/lay_plugin/ui_OASISWriterOptionPage.h
-lib/klayout/plugins/streamers/oasis/unit_tests/Makefile
-lib/klayout/plugins/streamers/oasis/unit_tests/liboasis_tests.${RUBY_DLEXT}
-lib/klayout/plugins/streamers/oasis/unit_tests/liboasis_tests.so.0
-lib/klayout/plugins/streamers/oasis/unit_tests/liboasis_tests.so.0.26
-lib/klayout/plugins/streamers/oasis/unit_tests/liboasis_tests.so.${PKGVERSION}
-lib/klayout/plugins/streamers/pcb/Makefile
-lib/klayout/plugins/streamers/pcb/db_plugin/Makefile
-lib/klayout/plugins/streamers/pcb/lay_plugin/Makefile
-lib/klayout/plugins/streamers/pcb/lay_plugin/moc_layGerberImportDialog.cpp
-lib/klayout/plugins/streamers/pcb/lay_plugin/moc_predefs.h
-lib/klayout/plugins/streamers/pcb/lay_plugin/ui_GerberImportDialog.h
-lib/klayout/plugins/streamers/pcb/unit_tests/Makefile
-lib/klayout/plugins/streamers/pcb/unit_tests/libpcb_tests.${RUBY_DLEXT}
-lib/klayout/plugins/streamers/pcb/unit_tests/libpcb_tests.so.0
-lib/klayout/plugins/streamers/pcb/unit_tests/libpcb_tests.so.0.26
-lib/klayout/plugins/streamers/pcb/unit_tests/libpcb_tests.so.${PKGVERSION}
-lib/klayout/plugins/tools/Makefile
-lib/klayout/plugins/tools/bool/Makefile
-lib/klayout/plugins/tools/bool/lay_plugin/Makefile
-lib/klayout/plugins/tools/bool/lay_plugin/moc_layBooleanOperationsDialogs.cpp
-lib/klayout/plugins/tools/bool/lay_plugin/moc_predefs.h
-lib/klayout/plugins/tools/bool/lay_plugin/ui_BooleanOptionsDialog.h
-lib/klayout/plugins/tools/bool/lay_plugin/ui_MergeOptionsDialog.h
-lib/klayout/plugins/tools/bool/lay_plugin/ui_SizingOptionsDialog.h
-lib/klayout/plugins/tools/diff/Makefile
-lib/klayout/plugins/tools/diff/lay_plugin/Makefile
-lib/klayout/plugins/tools/diff/lay_plugin/moc_layDiffToolDialog.cpp
-lib/klayout/plugins/tools/diff/lay_plugin/moc_predefs.h
-lib/klayout/plugins/tools/diff/lay_plugin/ui_DiffToolDialog.h
-lib/klayout/plugins/tools/import/Makefile
-lib/klayout/plugins/tools/import/lay_plugin/Makefile
-lib/klayout/plugins/tools/import/lay_plugin/moc_layStreamImportDialog.cpp
-lib/klayout/plugins/tools/import/lay_plugin/moc_predefs.h
-lib/klayout/plugins/tools/import/lay_plugin/ui_StreamImportDialog.h
-lib/klayout/plugins/tools/net_tracer/Makefile
-lib/klayout/plugins/tools/net_tracer/db_plugin/Makefile
-lib/klayout/plugins/tools/net_tracer/lay_plugin/Makefile
-lib/klayout/plugins/tools/net_tracer/lay_plugin/moc_layNetTracerConfig.cpp
-lib/klayout/plugins/tools/net_tracer/lay_plugin/moc_layNetTracerDialog.cpp
-lib/klayout/plugins/tools/net_tracer/lay_plugin/moc_layNetTracerIO.cpp
-lib/klayout/plugins/tools/net_tracer/lay_plugin/moc_predefs.h
-lib/klayout/plugins/tools/net_tracer/lay_plugin/ui_NetTracerConfigPage.h
-lib/klayout/plugins/tools/net_tracer/lay_plugin/ui_NetTracerDialog.h
-lib/klayout/plugins/tools/net_tracer/lay_plugin/ui_NetTracerTechComponentEditor.h
-lib/klayout/plugins/tools/net_tracer/unit_tests/Makefile
-lib/klayout/plugins/tools/net_tracer/unit_tests/libnet_tracer_tests.${RUBY_DLEXT}
-lib/klayout/plugins/tools/net_tracer/unit_tests/libnet_tracer_tests.so.0
-lib/klayout/plugins/tools/net_tracer/unit_tests/libnet_tracer_tests.so.0.26
-lib/klayout/plugins/tools/net_tracer/unit_tests/libnet_tracer_tests.so.${PKGVERSION}
-lib/klayout/plugins/tools/xor/Makefile
-lib/klayout/plugins/tools/xor/lay_plugin/Makefile
-lib/klayout/plugins/tools/xor/lay_plugin/moc_layXORToolDialog.cpp
-lib/klayout/plugins/tools/xor/lay_plugin/moc_predefs.h
-lib/klayout/plugins/tools/xor/lay_plugin/ui_XORToolDialog.h
+lib/klayout/pymod/klayout/QtCore.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtDesigner.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtGui.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtMultimedia.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtNetwork.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtPrintSupport.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtSql.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtSvg.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtWidgets.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtXml.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtXmlPatterns.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/__init__.py
+lib/klayout/pymod/klayout/db/__init__.py
+lib/klayout/pymod/klayout/db/pcell_declaration_helper.py
+lib/klayout/pymod/klayout/dbcore.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/lay.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/lib/__init__.py
+lib/klayout/pymod/klayout/libcore.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/rdb/__init__.py
+lib/klayout/pymod/klayout/rdbcore.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/tl/__init__.py
+lib/klayout/pymod/klayout/tlcore.${RUBY_DLEXT}
+lib/klayout/pymod/pya/__init__.py
Prev by Date: (devel/git-modes-git) adjust INSTALLATION_DIRS
Next by Date: py-hg-git: remove, updated in pkgsrc.
Previous by Thread: (devel/git-modes-git) adjust INSTALLATION_DIRS
Next by Thread: py-hg-git: remove, updated in pkgsrc.
Indexes:
Home | Main Index | Thread Index | Old Index