From nobody Thu May 26 19:50:47 2022 X-Original-To: dev-commits-ports-main@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 54B4A1B42DDF; Thu, 26 May 2022 19:50:47 +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 4L8JT31tVRz3FXx; Thu, 26 May 2022 19:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653594647; 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=wtikhSwJB7x6gAoy7m3gz2OHE6PU43LGpAOBgqBKpgE=; b=Y3A9CXAyKRk9xfZaUGhNCdP4/jT5GxZaDLevRh53vkPlSYLnyRl6RuqGqVRYHEnbEhTuk2 xRCs7Fy1JEtOKzSbvZFYxRRbsNInTW0TeudJU43JqOhFygezNa1FQwtHh6fCRCQe6YXx9o H0qTciEWXei+d97hXMmURsYxbJ1O75C3u6Vpp2ZB9Yt0g9AIf1B+z5F5SaNRcUuHZDSdfy cjn4X2d8XwGFXUDvTfivk/iJ2zkt8BygEm7UFrNQD7t/cNWrtR6//GCjUIfoQ+vEy0rEYy U8juDdWZ+qYWy7FUZegLVqvyNjWKnMSY6IQenWZkRUOGUc/a5lMm7jFWbGHVHg== 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 2062514681; Thu, 26 May 2022 19:50:47 +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 24QJolVs033136; Thu, 26 May 2022 19:50:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24QJolVV033135; Thu, 26 May 2022 19:50:47 GMT (envelope-from git) Date: Thu, 26 May 2022 19:50:47 GMT Message-Id: <202205261950.24QJolVV033135@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: ae7dd6324cae - main - cad/openscad-devel: Update to 2022.05.20 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: ae7dd6324cae63651a845c92861e5474e4040318 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653594647; 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=wtikhSwJB7x6gAoy7m3gz2OHE6PU43LGpAOBgqBKpgE=; b=b8qvpbpImiMcJ6IJCw/8NtGQBVcmC5FawGkQ0Y7t5YdyHFpPQjvzEJfvyqiHnK5V32v5ux yFZjoS+Ny5JIWwB904QgUIUlnwB5QMrknOfxTdJ4c6ZgqjlNqbSU7CYyhy9lRVulgvAJvF Nx5WMuXS6m5//tc7DDkOTgQCtQmPSVCUyYNYE21OmsJCSsz6Ry0ZJgcT/AazLgLezSqyVF d6+hOtyLGgg/c8lI+RZMlxggMVKuG6zTNb4DCpVfJNLDaabz7EtlGzb/xY4NacjugOO3wv p43UoP/qf+nZUaoJtvNXhUhITZeYFI8bOiiJ7MQcVO620K+hV2BfUSG7CLbpuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653594647; a=rsa-sha256; cv=none; b=ycbUjhRBt9+FYkzQR0q2ndRWorfzl8jxWBXpzvSw/OYc7zqQdqVsHhVCuaTumBmo8JB1ML mga+TKRy6FtitzBSv5HwUdrANU4aojBpgwcKM+Bh3u1mIk/VvyHWSFeHVEXV0e0hAiY2KA qSnQ5QjAfre4UNVyPJYqa4SqapxGYI7PNXz4DscyqLFusuzG6WPDBxj9FsNJr2NMbDn0g/ CA1z5+V63YiUkx4bGG4DDvZQggSa7+iYH/bCqXVcP7uoDD1YKFac8RULIaQMHhwqGL+SGN JPBghNi8EOF3X+yK8h2yexc4lpWPqEobcVh96uiJyciXoREpwmGzj7AJFRPo2g== 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=ae7dd6324cae63651a845c92861e5474e4040318 commit ae7dd6324cae63651a845c92861e5474e4040318 Author: Michael Reifenberger AuthorDate: 2022-05-26 19:45:31 +0000 Commit: Michael Reifenberger CommitDate: 2022-05-26 19:45:31 +0000 cad/openscad-devel: Update to 2022.05.20 Use the version as of 2022.05.20 --- cad/openscad-devel/Makefile | 31 ++++++++++++---------- cad/openscad-devel/distinfo | 12 +++++---- cad/openscad-devel/pkg-plist | 63 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 86 insertions(+), 20 deletions(-) diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile index 3289d2d38fc5..677d409d2b2f 100644 --- a/cad/openscad-devel/Makefile +++ b/cad/openscad-devel/Makefile @@ -1,13 +1,13 @@ # Created by: Michael Reifenberger PORTNAME= openscad -PORTVERSION= 2021.02.09 -PORTREVISION= 12 +PORTVERSION= 2022.05.20 +#PORTREVISION= 1 CATEGORIES= cad PKGNAMESUFFIX= -devel -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= cc49ad8dac24.patch:-p1 +#PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +#PATCHFILES+= cc49ad8dac24.patch:-p1 MAINTAINER= mr@FreeBSD.org COMMENT= Programmer's solid 3D CAD modeller #' @@ -30,21 +30,24 @@ LIB_DEPENDS= libzip.so:archivers/libzip \ CONFLICTS= openscad -USES= bison compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \ - gl gnome pkgconfig qmake qt:5 shared-mime-info xorg +USES= bison cmake compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \ + gl gnome pkgconfig qt:5 shared-mime-info xorg USE_GITHUB= yes USE_GL= gl glu glew -USE_GNOME= glib20 libxml2 +USE_GNOME= cairo glib20 libxml2 USE_QT= buildtools_build core concurrent_build dbus gui multimedia widgets USE_XORG= x11 -GH_TAGNAME= 63a7c77740030c63d646eb0684ba6947eecb0db7 -QMAKE_ARGS= CONFIG+="experimental" VERSION=${PORTVERSION} +GH_ACCOUNT= microsoft:mimalloc +GH_PROJECT= MCAD:mcad mimalloc:mimalloc +GH_TAGNAME= 6aae7963498675dfb5bedaaef2cb8e56bdcddcab 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) -LDFLAGS+= -Wl,--as-needed +LDFLAGS+= -Wl,--as-needed -L${LOCALBASE}/lib -post-patch: - @${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf - @${REINPLACE_CMD} -e 's,share/man,man,' \ - ${WRKSRC}/openscad.pro +#post-patch: +# @${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf +# @${REINPLACE_CMD} -e 's,share/man,man,' \ +# ${WRKSRC}/openscad.pro .include diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo index ded771b81d20..effab3f636bd 100644 --- a/cad/openscad-devel/distinfo +++ b/cad/openscad-devel/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1612905122 -SHA256 (openscad-openscad-2021.02.09-63a7c77740030c63d646eb0684ba6947eecb0db7_GH0.tar.gz) = 18342253697115d16a6d81ff9b05d8128cf8aac3138ac4d339fb722869113e4d -SIZE (openscad-openscad-2021.02.09-63a7c77740030c63d646eb0684ba6947eecb0db7_GH0.tar.gz) = 15687873 -SHA256 (cc49ad8dac24.patch) = 43cebd358d152f7a6dc1fc27294c67c4938b207d6a06f26fd60117e3a3c71412 -SIZE (cc49ad8dac24.patch) = 1610 +TIMESTAMP = 1653125562 +SHA256 (openscad-openscad-2022.05.20-6aae7963498675dfb5bedaaef2cb8e56bdcddcab_GH0.tar.gz) = 9ae2eec9680a1bf7f9d3e8ee85cc48acef5abb674053ab74f4665187c7187a23 +SIZE (openscad-openscad-2022.05.20-6aae7963498675dfb5bedaaef2cb8e56bdcddcab_GH0.tar.gz) = 23042608 +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 +SIZE (openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26_GH0.tar.gz) = 58895 diff --git a/cad/openscad-devel/pkg-plist b/cad/openscad-devel/pkg-plist index 51e407c2a8d5..065134fa7276 100644 --- a/cad/openscad-devel/pkg-plist +++ b/cad/openscad-devel/pkg-plist @@ -9,6 +9,8 @@ share/icons/hicolor/64x64/apps/openscad.png share/metainfo/org.openscad.OpenSCAD.appdata.xml share/mime/packages/openscad.xml %%DATADIR%%/color-schemes/editor/dark-background.json +%%DATADIR%%/color-schemes/editor/high-contrast-dark.json +%%DATADIR%%/color-schemes/editor/high-contrast-light.json %%DATADIR%%/color-schemes/editor/light-background.json %%DATADIR%%/color-schemes/editor/monokai.json %%DATADIR%%/color-schemes/editor/solarized-dark.json @@ -16,8 +18,10 @@ share/mime/packages/openscad.xml %%DATADIR%%/color-schemes/editor/tomorrow-night.json %%DATADIR%%/color-schemes/editor/tomorrow.json %%DATADIR%%/color-schemes/editor/visualstudio.json +%%DATADIR%%/color-schemes/editor/xcode.json %%DATADIR%%/color-schemes/readme.txt %%DATADIR%%/color-schemes/render/beforedawn.json +%%DATADIR%%/color-schemes/render/clearsky.json %%DATADIR%%/color-schemes/render/deepocean.json %%DATADIR%%/color-schemes/render/metallic.json %%DATADIR%%/color-schemes/render/monotone.json @@ -44,6 +48,7 @@ share/mime/packages/openscad.xml %%DATADIR%%/examples/Basics/logo_and_text.scad %%DATADIR%%/examples/Basics/projection.scad %%DATADIR%%/examples/Basics/projection.stl +%%DATADIR%%/examples/Basics/roof.scad %%DATADIR%%/examples/Basics/rotate_extrude.scad %%DATADIR%%/examples/Basics/text_on_cube.scad %%DATADIR%%/examples/COPYING-CC0.txt @@ -107,6 +112,57 @@ share/mime/packages/openscad.xml %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Regular.ttf +%%DATADIR%%/libraries/MCAD/2Dshapes.scad +%%DATADIR%%/libraries/MCAD/3d_triangle.scad +%%DATADIR%%/libraries/MCAD/README.markdown +%%DATADIR%%/libraries/MCAD/TODO +%%DATADIR%%/libraries/MCAD/__init__.py +%%DATADIR%%/libraries/MCAD/array.scad +%%DATADIR%%/libraries/MCAD/bearing.scad +%%DATADIR%%/libraries/MCAD/bitmap/README +%%DATADIR%%/libraries/MCAD/bitmap/alphabet_block.scad +%%DATADIR%%/libraries/MCAD/bitmap/bitmap.scad +%%DATADIR%%/libraries/MCAD/bitmap/height_map.scad +%%DATADIR%%/libraries/MCAD/bitmap/letter_necklace.scad +%%DATADIR%%/libraries/MCAD/bitmap/name_tag.scad +%%DATADIR%%/libraries/MCAD/bitmap/test_name_tag.scad +%%DATADIR%%/libraries/MCAD/boxes.scad +%%DATADIR%%/libraries/MCAD/constants.scad +%%DATADIR%%/libraries/MCAD/curves.scad +%%DATADIR%%/libraries/MCAD/fonts.scad +%%DATADIR%%/libraries/MCAD/gears.scad +%%DATADIR%%/libraries/MCAD/gridbeam.scad +%%DATADIR%%/libraries/MCAD/hardware.scad +%%DATADIR%%/libraries/MCAD/involute_gears.scad +%%DATADIR%%/libraries/MCAD/layouts.scad +%%DATADIR%%/libraries/MCAD/lego_compatibility.scad +%%DATADIR%%/libraries/MCAD/lgpl-2.1.txt +%%DATADIR%%/libraries/MCAD/libtriangles.scad +%%DATADIR%%/libraries/MCAD/linear_bearing.scad +%%DATADIR%%/libraries/MCAD/materials.scad +%%DATADIR%%/libraries/MCAD/math.scad +%%DATADIR%%/libraries/MCAD/metric_fastners.scad +%%DATADIR%%/libraries/MCAD/motors.scad +%%DATADIR%%/libraries/MCAD/multiply.scad +%%DATADIR%%/libraries/MCAD/nuts_and_bolts.scad +%%DATADIR%%/libraries/MCAD/openscad_testing.py +%%DATADIR%%/libraries/MCAD/openscad_utils.py +%%DATADIR%%/libraries/MCAD/polyholes.scad +%%DATADIR%%/libraries/MCAD/profiles.scad +%%DATADIR%%/libraries/MCAD/regular_shapes.scad +%%DATADIR%%/libraries/MCAD/screw.scad +%%DATADIR%%/libraries/MCAD/servos.scad +%%DATADIR%%/libraries/MCAD/shapes.scad +%%DATADIR%%/libraries/MCAD/stepper.scad +%%DATADIR%%/libraries/MCAD/teardrop.scad +%%DATADIR%%/libraries/MCAD/test_docs.py +%%DATADIR%%/libraries/MCAD/test_mcad.py +%%DATADIR%%/libraries/MCAD/transformations.scad +%%DATADIR%%/libraries/MCAD/triangles.scad +%%DATADIR%%/libraries/MCAD/trochoids.scad +%%DATADIR%%/libraries/MCAD/units.scad +%%DATADIR%%/libraries/MCAD/unregular_shapes.scad +%%DATADIR%%/libraries/MCAD/utilities.scad %%DATADIR%%/locale/cs/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/de/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/es/LC_MESSAGES/openscad.mo @@ -114,13 +170,18 @@ share/mime/packages/openscad.xml %%DATADIR%%/locale/hy/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/pl/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/ru/LC_MESSAGES/openscad.mo +%%DATADIR%%/locale/tr/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/uk/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/zh_CN/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/zh_TW/LC_MESSAGES/openscad.mo +%%DATADIR%%/shaders/MouseSelector.frag +%%DATADIR%%/shaders/MouseSelector.vert +%%DATADIR%%/shaders/Preview.frag +%%DATADIR%%/shaders/Preview.vert +%%DATADIR%%/templates/CC0.json %%DATADIR%%/templates/difference.json %%DATADIR%%/templates/for.json %%DATADIR%%/templates/function.json %%DATADIR%%/templates/module.json %%DATADIR%%/templates/rotate.json %%DATADIR%%/templates/translate.json -@dir %%DATADIR%%/libraries/MCAD