From nobody Sun Dec 26 07:05:52 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 086DC190A490; Sun, 26 Dec 2021 07:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JMBf85CySz3GQH; Sun, 26 Dec 2021 07:05:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 94AE325E25; Sun, 26 Dec 2021 07:05:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BQ75qUM041862; Sun, 26 Dec 2021 07:05:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BQ75qn0041861; Sun, 26 Dec 2021 07:05:52 GMT (envelope-from git) Date: Sun, 26 Dec 2021 07:05:52 GMT Message-Id: <202112260705.1BQ75qn0041861@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: f3e9a3b3c81c - main - cad/klayout: Unbreak build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3e9a3b3c81cb533d87b42b96cce4d5eee20c088 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640502352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ChBeDGpCg07PfE+7hd1KluDrA88KH+XszDlKtCAiWJM=; b=OjBZddtTt65G/HolW06KxKh74LFiRlZScbXqMcIL1AZLKQ1z6tmXSWKGqONQiOPJ3GzEHU UO+UdmAdUfisR+84Dz4njBnMEvMvs0vE+9gh32IM7uCNrwHEDKn2TmWZ2C9TswdToQPNgB IAvU9vkulM052pLqGM6BmGHp4J4pEkR2F3VGnAVEBI0JWubbWPaatOkqtll2Y84DtyfeIp AEudHosxDwv/W1UHZp9ioJC0QjbFQ3AcGbMRzbwP9/m/Pe6VN29uQtwsMhTP1/ghoIiTiQ e/8qUNeb8KG2X2m8OZ+woT1qXyZwxadnN2gbXjHY3PVQzRIxbwS05vhqlZxjDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640502352; a=rsa-sha256; cv=none; b=A68e9PNRc+hLIOsY5/+uhixVPMvOIgv8s7vC1bV1f59Gocl+ECbqcIJuWJYROuJUou7nBF JBfxAO2AiqNVoMXvdG2J5/q7pkk5bKpLv+oklHZIgxj1xT8QSCujmaoSVMfTPAH0K7rDh/ C2U2V7FPyC52ig28AxMt38eHUgsYjrmXcWLQ/nnRmCVdDoaQOqiLIJrXwO/q4UNz1ox+7r fetp2lIzPzgFu15xIiqmRpiv9KTY6yYh2KtJFN+n2fpFrVX27G+Pbu0l1tVs6kLNfsT8V+ Gs6K9X5MC3nTVHBjcewuL0VQ9JC9rtjJmkafwAUtnFH0vEXshZqIAhHZrdejDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3e9a3b3c81cb533d87b42b96cce4d5eee20c088 commit f3e9a3b3c81cb533d87b42b96cce4d5eee20c088 Author: Yuri Victorovich AuthorDate: 2021-12-26 07:03:53 +0000 Commit: Yuri Victorovich CommitDate: 2021-12-26 07:05:50 +0000 cad/klayout: Unbreak build It wasn't finding the library in the build directory. Also add the missing USE_QT element and fix plist. Approved by: portmgr (unbreak) --- cad/klayout/Makefile | 4 +- cad/klayout/pkg-plist | 210 ++++++++++++++++++++++++++------------------------ 2 files changed, 112 insertions(+), 102 deletions(-) diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile index e513a94a6c1d..ef8869016fec 100644 --- a/cad/klayout/Makefile +++ b/cad/klayout/Makefile @@ -1,5 +1,6 @@ PORTNAME= klayout PORTVERSION= 0.27.3 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= cad @@ -18,13 +19,14 @@ GH_ACCOUNT= KLayout USE_GL= gl USE_RUBY= yes USE_QT= core buildtools designer gui multimedia network printsupport \ - qmake sql svg testlib widgets xml xmlpatterns + qmake sql svg testlib uitools widgets xml xmlpatterns USE_LDCONFIG= yes CXXFLAGS+= -fPIC -I${LOCALBASE}/include/qt5 \ ${QT5MODULES:S,^,-I${LOCALBASE}/include/qt5/Qt,} LDFLAGS+= ${LIBS} ${QT5MODULES:S,^,-lQt5,} \ -L${LOCALBASE}/lib/qt5 -lpthread +LDFLAGS+= -L${BUILD_WRKSRC} # workaround for the error: unable to find library -lklayout_lib: https://github.com/KLayout/klayout/issues/955 QT5MODULES= Core Designer Gui Multimedia MultimediaWidgets \ Network PrintSupport Sql Svg Test Widgets Xml XmlPatterns MAKE_ENV= INSTALLROOT=${STAGEDIR} \ diff --git a/cad/klayout/pkg-plist b/cad/klayout/pkg-plist index 8f76a2e55465..c0dfa72a9b59 100644 --- a/cad/klayout/pkg-plist +++ b/cad/klayout/pkg-plist @@ -98,7 +98,54 @@ lib/klayout/lay_plugins/libxor_ui.so lib/klayout/lay_plugins/libxor_ui.so.0 lib/klayout/lay_plugins/libxor_ui.so.0.27 lib/klayout/lay_plugins/libxor_ui.so.0.27.3 -@dir lib/klayout/lay_plugins +lib/klayout/libQtCore.so +lib/klayout/libQtCore.so.0 +lib/klayout/libQtCore.so.0.27 +lib/klayout/libQtCore.so.0.27.3 +lib/klayout/libQtDesigner.so +lib/klayout/libQtDesigner.so.0 +lib/klayout/libQtDesigner.so.0.27 +lib/klayout/libQtDesigner.so.0.27.3 +lib/klayout/libQtGui.so +lib/klayout/libQtGui.so.0 +lib/klayout/libQtGui.so.0.27 +lib/klayout/libQtGui.so.0.27.3 +lib/klayout/libQtMultimedia.so +lib/klayout/libQtMultimedia.so.0 +lib/klayout/libQtMultimedia.so.0.27 +lib/klayout/libQtMultimedia.so.0.27.3 +lib/klayout/libQtNetwork.so +lib/klayout/libQtNetwork.so.0 +lib/klayout/libQtNetwork.so.0.27 +lib/klayout/libQtNetwork.so.0.27.3 +lib/klayout/libQtPrintSupport.so +lib/klayout/libQtPrintSupport.so.0 +lib/klayout/libQtPrintSupport.so.0.27 +lib/klayout/libQtPrintSupport.so.0.27.3 +lib/klayout/libQtSql.so +lib/klayout/libQtSql.so.0 +lib/klayout/libQtSql.so.0.27 +lib/klayout/libQtSql.so.0.27.3 +lib/klayout/libQtSvg.so +lib/klayout/libQtSvg.so.0 +lib/klayout/libQtSvg.so.0.27 +lib/klayout/libQtSvg.so.0.27.3 +lib/klayout/libQtUiTools.so +lib/klayout/libQtUiTools.so.0 +lib/klayout/libQtUiTools.so.0.27 +lib/klayout/libQtUiTools.so.0.27.3 +lib/klayout/libQtWidgets.so +lib/klayout/libQtWidgets.so.0 +lib/klayout/libQtWidgets.so.0.27 +lib/klayout/libQtWidgets.so.0.27.3 +lib/klayout/libQtXml.so +lib/klayout/libQtXml.so.0 +lib/klayout/libQtXml.so.0.27 +lib/klayout/libQtXml.so.0.27.3 +lib/klayout/libQtXmlPatterns.so +lib/klayout/libQtXmlPatterns.so.0 +lib/klayout/libQtXmlPatterns.so.0.27 +lib/klayout/libQtXmlPatterns.so.0.27.3 lib/klayout/libbridge_mod.so lib/klayout/libbridge_mod.so.1 lib/klayout/libbridge_mod.so.1.0 @@ -107,6 +154,54 @@ lib/klayout/libdbcore.so lib/klayout/libdbcore.so.0 lib/klayout/libdbcore.so.0.27 lib/klayout/libdbcore.so.0.27.3 +lib/klayout/libklayout_QtCore.so +lib/klayout/libklayout_QtCore.so.0 +lib/klayout/libklayout_QtCore.so.0.27 +lib/klayout/libklayout_QtCore.so.0.27.3 +lib/klayout/libklayout_QtDesigner.so +lib/klayout/libklayout_QtDesigner.so.0 +lib/klayout/libklayout_QtDesigner.so.0.27 +lib/klayout/libklayout_QtDesigner.so.0.27.3 +lib/klayout/libklayout_QtGui.so +lib/klayout/libklayout_QtGui.so.0 +lib/klayout/libklayout_QtGui.so.0.27 +lib/klayout/libklayout_QtGui.so.0.27.3 +lib/klayout/libklayout_QtMultimedia.so +lib/klayout/libklayout_QtMultimedia.so.0 +lib/klayout/libklayout_QtMultimedia.so.0.27 +lib/klayout/libklayout_QtMultimedia.so.0.27.3 +lib/klayout/libklayout_QtNetwork.so +lib/klayout/libklayout_QtNetwork.so.0 +lib/klayout/libklayout_QtNetwork.so.0.27 +lib/klayout/libklayout_QtNetwork.so.0.27.3 +lib/klayout/libklayout_QtPrintSupport.so +lib/klayout/libklayout_QtPrintSupport.so.0 +lib/klayout/libklayout_QtPrintSupport.so.0.27 +lib/klayout/libklayout_QtPrintSupport.so.0.27.3 +lib/klayout/libklayout_QtSql.so +lib/klayout/libklayout_QtSql.so.0 +lib/klayout/libklayout_QtSql.so.0.27 +lib/klayout/libklayout_QtSql.so.0.27.3 +lib/klayout/libklayout_QtSvg.so +lib/klayout/libklayout_QtSvg.so.0 +lib/klayout/libklayout_QtSvg.so.0.27 +lib/klayout/libklayout_QtSvg.so.0.27.3 +lib/klayout/libklayout_QtUiTools.so +lib/klayout/libklayout_QtUiTools.so.0 +lib/klayout/libklayout_QtUiTools.so.0.27 +lib/klayout/libklayout_QtUiTools.so.0.27.3 +lib/klayout/libklayout_QtWidgets.so +lib/klayout/libklayout_QtWidgets.so.0 +lib/klayout/libklayout_QtWidgets.so.0.27 +lib/klayout/libklayout_QtWidgets.so.0.27.3 +lib/klayout/libklayout_QtXml.so +lib/klayout/libklayout_QtXml.so.0 +lib/klayout/libklayout_QtXml.so.0.27 +lib/klayout/libklayout_QtXml.so.0.27.3 +lib/klayout/libklayout_QtXmlPatterns.so +lib/klayout/libklayout_QtXmlPatterns.so.0 +lib/klayout/libklayout_QtXmlPatterns.so.0.27 +lib/klayout/libklayout_QtXmlPatterns.so.0.27.3 lib/klayout/libklayout_ant.so lib/klayout/libklayout_ant.so.0 lib/klayout/libklayout_ant.so.0.27 @@ -127,14 +222,14 @@ lib/klayout/libklayout_edt.so lib/klayout/libklayout_edt.so.0 lib/klayout/libklayout_edt.so.0.27 lib/klayout/libklayout_edt.so.0.27.3 -lib/klayout/libklayout_gsi_test.so -lib/klayout/libklayout_gsi_test.so.0 -lib/klayout/libklayout_gsi_test.so.0.27 -lib/klayout/libklayout_gsi_test.so.0.27.3 lib/klayout/libklayout_gsi.so lib/klayout/libklayout_gsi.so.0 lib/klayout/libklayout_gsi.so.0.27 lib/klayout/libklayout_gsi.so.0.27.3 +lib/klayout/libklayout_gsi_test.so +lib/klayout/libklayout_gsi_test.so.0 +lib/klayout/libklayout_gsi_test.so.0.27 +lib/klayout/libklayout_gsi_test.so.0.27.3 lib/klayout/libklayout_img.so lib/klayout/libklayout_img.so.0 lib/klayout/libklayout_img.so.0.27 @@ -167,50 +262,6 @@ lib/klayout/libklayout_qtbasic.so lib/klayout/libklayout_qtbasic.so.0 lib/klayout/libklayout_qtbasic.so.0.27 lib/klayout/libklayout_qtbasic.so.0.27.3 -lib/klayout/libklayout_QtCore.so -lib/klayout/libklayout_QtCore.so.0 -lib/klayout/libklayout_QtCore.so.0.27 -lib/klayout/libklayout_QtCore.so.0.27.3 -lib/klayout/libklayout_QtDesigner.so -lib/klayout/libklayout_QtDesigner.so.0 -lib/klayout/libklayout_QtDesigner.so.0.27 -lib/klayout/libklayout_QtDesigner.so.0.27.3 -lib/klayout/libklayout_QtGui.so -lib/klayout/libklayout_QtGui.so.0 -lib/klayout/libklayout_QtGui.so.0.27 -lib/klayout/libklayout_QtGui.so.0.27.3 -lib/klayout/libklayout_QtMultimedia.so -lib/klayout/libklayout_QtMultimedia.so.0 -lib/klayout/libklayout_QtMultimedia.so.0.27 -lib/klayout/libklayout_QtMultimedia.so.0.27.3 -lib/klayout/libklayout_QtNetwork.so -lib/klayout/libklayout_QtNetwork.so.0 -lib/klayout/libklayout_QtNetwork.so.0.27 -lib/klayout/libklayout_QtNetwork.so.0.27.3 -lib/klayout/libklayout_QtPrintSupport.so -lib/klayout/libklayout_QtPrintSupport.so.0 -lib/klayout/libklayout_QtPrintSupport.so.0.27 -lib/klayout/libklayout_QtPrintSupport.so.0.27.3 -lib/klayout/libklayout_QtSql.so -lib/klayout/libklayout_QtSql.so.0 -lib/klayout/libklayout_QtSql.so.0.27 -lib/klayout/libklayout_QtSql.so.0.27.3 -lib/klayout/libklayout_QtSvg.so -lib/klayout/libklayout_QtSvg.so.0 -lib/klayout/libklayout_QtSvg.so.0.27 -lib/klayout/libklayout_QtSvg.so.0.27.3 -lib/klayout/libklayout_QtWidgets.so -lib/klayout/libklayout_QtWidgets.so.0 -lib/klayout/libklayout_QtWidgets.so.0.27 -lib/klayout/libklayout_QtWidgets.so.0.27.3 -lib/klayout/libklayout_QtXml.so -lib/klayout/libklayout_QtXml.so.0 -lib/klayout/libklayout_QtXml.so.0.27 -lib/klayout/libklayout_QtXml.so.0.27.3 -lib/klayout/libklayout_QtXmlPatterns.so -lib/klayout/libklayout_QtXmlPatterns.so.0 -lib/klayout/libklayout_QtXmlPatterns.so.0.27 -lib/klayout/libklayout_QtXmlPatterns.so.0.27.3 lib/klayout/libklayout_rba.so lib/klayout/libklayout_rba.so.0 lib/klayout/libklayout_rba.so.0.27 @@ -231,50 +282,6 @@ lib/klayout/liblibcore.so lib/klayout/liblibcore.so.0 lib/klayout/liblibcore.so.0.27 lib/klayout/liblibcore.so.0.27.3 -lib/klayout/libQtCore.so -lib/klayout/libQtCore.so.0 -lib/klayout/libQtCore.so.0.27 -lib/klayout/libQtCore.so.0.27.3 -lib/klayout/libQtDesigner.so -lib/klayout/libQtDesigner.so.0 -lib/klayout/libQtDesigner.so.0.27 -lib/klayout/libQtDesigner.so.0.27.3 -lib/klayout/libQtGui.so -lib/klayout/libQtGui.so.0 -lib/klayout/libQtGui.so.0.27 -lib/klayout/libQtGui.so.0.27.3 -lib/klayout/libQtMultimedia.so -lib/klayout/libQtMultimedia.so.0 -lib/klayout/libQtMultimedia.so.0.27 -lib/klayout/libQtMultimedia.so.0.27.3 -lib/klayout/libQtNetwork.so -lib/klayout/libQtNetwork.so.0 -lib/klayout/libQtNetwork.so.0.27 -lib/klayout/libQtNetwork.so.0.27.3 -lib/klayout/libQtPrintSupport.so -lib/klayout/libQtPrintSupport.so.0 -lib/klayout/libQtPrintSupport.so.0.27 -lib/klayout/libQtPrintSupport.so.0.27.3 -lib/klayout/libQtSql.so -lib/klayout/libQtSql.so.0 -lib/klayout/libQtSql.so.0.27 -lib/klayout/libQtSql.so.0.27.3 -lib/klayout/libQtSvg.so -lib/klayout/libQtSvg.so.0 -lib/klayout/libQtSvg.so.0.27 -lib/klayout/libQtSvg.so.0.27.3 -lib/klayout/libQtWidgets.so -lib/klayout/libQtWidgets.so.0 -lib/klayout/libQtWidgets.so.0.27 -lib/klayout/libQtWidgets.so.0.27.3 -lib/klayout/libQtXml.so -lib/klayout/libQtXml.so.0 -lib/klayout/libQtXml.so.0.27 -lib/klayout/libQtXml.so.0.27.3 -lib/klayout/libQtXmlPatterns.so -lib/klayout/libQtXmlPatterns.so.0 -lib/klayout/libQtXmlPatterns.so.0.27 -lib/klayout/libQtXmlPatterns.so.0.27.3 lib/klayout/librdbcore.so lib/klayout/librdbcore.so.0 lib/klayout/librdbcore.so.0.27 @@ -283,14 +290,6 @@ lib/klayout/libtlcore.so lib/klayout/libtlcore.so.0 lib/klayout/libtlcore.so.0.27 lib/klayout/libtlcore.so.0.27.3 -%%PYTHON_SITELIBDIR%%/klayout/__init__.py -%%PYTHON_SITELIBDIR%%/klayout/db/__init__.py -%%PYTHON_SITELIBDIR%%/klayout/db/pcell_declaration_helper.py -%%PYTHON_SITELIBDIR%%/klayout/dbcore%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/klayout/lay%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/klayout/lib/__init__.py -%%PYTHON_SITELIBDIR%%/klayout/libcore%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/klayout/pya/__init__.py %%PYTHON_SITELIBDIR%%/klayout/QtCore%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtDesigner%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtGui%%PYTHON_EXT_SUFFIX%%.so @@ -299,9 +298,18 @@ lib/klayout/libtlcore.so.0.27.3 %%PYTHON_SITELIBDIR%%/klayout/QtPrintSupport%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtSql%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtSvg%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/klayout/QtUiTools%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtWidgets%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtXml%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtXmlPatterns%%PYTHON_EXT_SUFFIX%%.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_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/klayout/lay%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/klayout/lib/__init__.py +%%PYTHON_SITELIBDIR%%/klayout/libcore%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/klayout/pya/__init__.py %%PYTHON_SITELIBDIR%%/klayout/rdb/__init__.py %%PYTHON_SITELIBDIR%%/klayout/rdbcore%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/tl/__init__.py