From nobody Mon Sep 05 10:21:30 2022 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 4MLl170VDmz4bwps; Mon, 5 Sep 2022 10:21:31 +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 4MLl1701h5z3T8m; Mon, 5 Sep 2022 10:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662373291; 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=cwQ9FnkFL6dBAL/mmniiile1j3IGYAReLlbQWuVe1q4=; b=GBPJIIWxb9ZujvZ0z8zRZ6R/zoRCSD5flfjEsjUrIKJo6fRAEzj0FOA3mWH9sSEx93xXSg kJ+9VFFgGb2y/hcovX4xlh3jXjNsST2TmrDnbMCEawDPoN7eY0JlgqNsWPiukn94wSvKDn 0rSwxi/8kIitRQkeY15LO9HAreZcTCdOecRDfv37pI/cKQ+fqk+inEyQ4G6v+OJqu0IScg GBPkUoIaaYjS/Q06/cYU/tVEQeVdjlAMfc8IP9lNdUyIQr4TvYyyvUzURYTE1gU/1TSdkN MzhaNfLfFC7NuyK94LC58GbH4FiyuCGVzwcUPX9cI4KtKkXDwwU7TbZWvoEjIA== 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 4MLl166C7PznfP; Mon, 5 Sep 2022 10:21:30 +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 285ALUdv062703; Mon, 5 Sep 2022 10:21:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 285ALUU7062702; Mon, 5 Sep 2022 10:21:30 GMT (envelope-from git) Date: Mon, 5 Sep 2022 10:21:30 GMT Message-Id: <202209051021.285ALUU7062702@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Reifenberger Subject: git: 10b44269556c - main - cad/openscad-devel: Update and unbreak 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: mr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10b44269556c1b8313cd3815dc2ea4725b26b332 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662373291; 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=cwQ9FnkFL6dBAL/mmniiile1j3IGYAReLlbQWuVe1q4=; b=s8QPy7F6bTgCq5F8b6F0LthTgHgMmvYZYmyOH+lJRnnZcsIwjGnQ863z/8HBfPqVTc/uj+ 25KE9zWek+2d+Q07NoFsqUZm4B9WMMyHr6QfIg/ab7Eb84f+odPwuH2DkgkDjbJWUXi+y0 iIiTMQNKoQubBZos2lJO2kMz8IXOf49l79uvOGInM2iQ+CYNjptFDKyT5VlDddR7obYqop +6CdHHsbs8X5B21wAUbDdRqjAZn94MeUZbKS5VG9Cz/MfiCDOOfY13DTKdYaHSZnzKtOhu JQy/o/z4EdmJK8zh78TYgJPjOj1KpDfsQx9i7QkJTFISIBraUyof5cr44aOX7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662373291; a=rsa-sha256; cv=none; b=UJpUcyhQ3+fYcKWfiflfbw5hK5MQP8MCoqyPTTPg6+ye/UoeyQ1kt3fpo1Ik3mneK5ygC9 nzMWmv/gHidYQ4afjX52k8SpEiQ7ETxQdI4PdsmSutBpygCGeIpJBCllBN5ji7EI5owkix hHDO6HlkW1r01v/wGK7RMTtAR9nznFB96w8MdHbH8AozQ8D/q+mJVp7TLsRPAG6EuQ7eWy QEIL/o9YJ+GHVFgzPu3A1z0nng4D+aOwVW3JfKCI7AwyuR8E/9XaasFLZffS+R8hrUxFTm ukfPapwcafcfkIsZ/aLU+EzquonXtIZzO10k4QAn+ityBT4NWc3ZhqVUyOqcxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mr: URL: https://cgit.FreeBSD.org/ports/commit/?id=10b44269556c1b8313cd3815dc2ea4725b26b332 commit 10b44269556c1b8313cd3815dc2ea4725b26b332 Author: Michael Reifenberger AuthorDate: 2022-09-05 10:20:15 +0000 Commit: Michael Reifenberger CommitDate: 2022-09-05 10:20:15 +0000 cad/openscad-devel: Update and unbreak Update to the current state as of 2022.09.03 and try to unbreak. --- cad/openscad-devel/Makefile | 23 ++++++++++++++--------- cad/openscad-devel/distinfo | 6 +++--- cad/openscad-devel/pkg-plist | 2 +- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile index 8e5c3301ebb1..790240f858bf 100644 --- a/cad/openscad-devel/Makefile +++ b/cad/openscad-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= openscad -PORTVERSION= 2022.05.20 -PORTREVISION= 2 +PORTVERSION= 2022.09.03 +#PORTREVISION= 1 CATEGORIES= cad PKGNAMESUFFIX= -devel @@ -10,12 +10,11 @@ PKGNAMESUFFIX= -devel MAINTAINER= mr@FreeBSD.org COMMENT= Programmer's solid 3D CAD modeller #' -BROKEN= fails to configure: The imported target "Qt5::Core" references the file "/usr/local/lib/qt5/bin/qmake" but this file does not exist. - LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= cgal>0:math/cgal +BUILD_DEPENDS= cgal>0:math/cgal \ + evdev-proto>0:devel/evdev-proto LIB_DEPENDS= libzip.so:archivers/libzip \ libhidapi.so:comms/hidapi \ libboost_regex.so:devel/boost-libs \ @@ -31,23 +30,29 @@ LIB_DEPENDS= libzip.so:archivers/libzip \ CONFLICTS= openscad USES= bison cmake compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \ - gl gnome pkgconfig qt:5 shared-mime-info xorg + gl gnome pkgconfig qmake qt:5 shared-mime-info xorg USE_GITHUB= yes USE_GL= gl glu glew USE_GNOME= cairo glib20 libxml2 -USE_QT= buildtools_build core concurrent_build dbus gui multimedia widgets +USE_QT= buildtools buildtools_build core concurrent_build dbus gui multimedia svg widgets USE_XORG= x11 GH_ACCOUNT= microsoft:mimalloc GH_PROJECT= MCAD:mcad mimalloc:mimalloc -GH_TAGNAME= 6aae7963498675dfb5bedaaef2cb8e56bdcddcab bd0a7ba3f042bfbced5ca1894b236cea08904e26:mcad v2.0.3:mimalloc +GH_TAGNAME= ea8950bd3cd7f06da333c15463492e484098e591 bd0a7ba3f042bfbced5ca1894b236cea08904e26:mcad v2.0.3:mimalloc GH_SUBDIR= libraries/MCAD:mcad submodules/mimalloc:mimalloc #QMAKE_ARGS= CONFIG+="experimental" VERSION=${PORTVERSION} # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport) +CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -Wl,--as-needed -L${LOCALBASE}/lib +.include + #post-patch: # @${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf # @${REINPLACE_CMD} -e 's,share/man,man,' \ # ${WRKSRC}/openscad.pro -.include +do-install: + ${CMAKE_BIN} --install ${BUILD_WRKSRC} --prefix ${STAGEDIR}${PREFIX} + +.include diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo index effab3f636bd..2cf3aaa9e7f4 100644 --- a/cad/openscad-devel/distinfo +++ b/cad/openscad-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1653125562 -SHA256 (openscad-openscad-2022.05.20-6aae7963498675dfb5bedaaef2cb8e56bdcddcab_GH0.tar.gz) = 9ae2eec9680a1bf7f9d3e8ee85cc48acef5abb674053ab74f4665187c7187a23 -SIZE (openscad-openscad-2022.05.20-6aae7963498675dfb5bedaaef2cb8e56bdcddcab_GH0.tar.gz) = 23042608 +TIMESTAMP = 1662218295 +SHA256 (openscad-openscad-2022.09.03-ea8950bd3cd7f06da333c15463492e484098e591_GH0.tar.gz) = 7c443183894aeeac2d113913667169d03e178c582a0ee12fcc11c18d8ef9998d +SIZE (openscad-openscad-2022.09.03-ea8950bd3cd7f06da333c15463492e484098e591_GH0.tar.gz) = 23042725 SHA256 (microsoft-mimalloc-v2.0.3_GH0.tar.gz) = 5af497f360879bf9d07a5146961d275a25f4177fbe21ee6c437db604422acd60 SIZE (microsoft-mimalloc-v2.0.3_GH0.tar.gz) = 917461 SHA256 (openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26_GH0.tar.gz) = 1f7003bf1bdfe9c7e5898eb5e82c54834b156569e79da97d906f3bbcf7c5549c diff --git a/cad/openscad-devel/pkg-plist b/cad/openscad-devel/pkg-plist index 065134fa7276..fe24c00b490f 100644 --- a/cad/openscad-devel/pkg-plist +++ b/cad/openscad-devel/pkg-plist @@ -1,11 +1,11 @@ bin/openscad -man/man1/openscad.1.gz share/applications/openscad.desktop share/icons/hicolor/128x128/apps/openscad.png share/icons/hicolor/256x256/apps/openscad.png share/icons/hicolor/48x48/apps/openscad.png share/icons/hicolor/512x512/apps/openscad.png share/icons/hicolor/64x64/apps/openscad.png +share/man/man1/openscad.1.gz share/metainfo/org.openscad.OpenSCAD.appdata.xml share/mime/packages/openscad.xml %%DATADIR%%/color-schemes/editor/dark-background.json