Date: Fri, 03 Jul 2026 19:28:17 +0000 From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0912a8679b7d - main - math/asymptote: upgrade to 3.12 Message-ID: <6a480d51.345db.7edc8040@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=0912a8679b7d9e22bfa12bdba88796711760aebb commit 0912a8679b7d9e22bfa12bdba88796711760aebb Author: Thierry Thomas <thierry@FreeBSD.org> AuthorDate: 2026-06-30 08:48:35 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> CommitDate: 2026-07-03 19:28:09 +0000 math/asymptote: upgrade to 3.12 Changelog at https://sourceforge.net/projects/asymptote/files/3.12/ChangeLog/download PR: 296399 Approved by: nivit (maintainer) --- math/asymptote/Makefile | 50 ++++++++++++++--------------- math/asymptote/distinfo | 8 ++--- math/asymptote/files/patch-settings.cc | 2 +- math/asymptote/files/patch-xstream.h | 11 ------- math/asymptote/files/pkg-message.in | 2 +- math/asymptote/pkg-plist | 58 ++++++++++++++++++++++++++-------- 6 files changed, 73 insertions(+), 58 deletions(-) diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile index 334a3940cfdd..afca4b7319b5 100644 --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -1,6 +1,5 @@ PORTNAME= asymptote -PORTVERSION= 2.92 -PORTREVISION= 6 +PORTVERSION= 3.12 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -14,30 +13,37 @@ LICENSE_COMB= dual ONLY_FOR_ARCHS= amd64 i386 -LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ - libcurl.so:ftp/curl \ - libsigsegv.so:devel/libsigsegv +BUILD_DEPENDS= glm>0:math/glm \ + glslang>0:graphics/glslang \ + vulkan-headers>0:graphics/vulkan-headers +LIB_DEPENDS= libcurl.so:ftp/curl \ + libglfw.so:graphics/glfw \ + libsigsegv.so:devel/libsigsegv \ + libvulkan.so:graphics/vulkan-loader \ + libglslang.so:graphics/glslang@shared RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cson>=0.8:devel/py-cson@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyside6>0:devel/pyside6 \ ${PY_PILLOW} \ xdg-open:devel/xdg-utils -USES= bison compiler:c++14-lang gettext-runtime ghostscript gl gmake gnome ncurses perl5 python \ - pyqt:5 shebangfix tar:tgz tex -SHEBANG_FILES= GUI/*.py -USE_GL= gl glu glut +USES= bison compiler:c++17-lang gettext-runtime ghostscript gl gmake \ + gnome ncurses perl5 python pyqt:6 shebangfix tar:tgz tex +SHEBANG_GLOB= *.py +USE_GL= gl glu USE_GNOME= librsvg2:run USE_PERL5= build USE_TEX= dvipsk formats -USE_PYQT= pyqt5:run +USE_PYQT= pyqt6:run + +BINARY_ALIAS= python3=${PYTHON_VERSION} CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -CONFIGURE_ARGS= --disable-offscreen \ - --disable-lsp # disable the module with Boost-related errors +CONFIGURE_ARGS= --disable-lsp # disable the module with Boost-related errors MAKE_ENV= ASYMPTOTE_HOME=${WRKDIR} HOME=${WRKDIR} -MAKE_JOBS_UNSAFE= yes # see https://github.com/vectorgraphics/asymptote/issues/331 +MAKE_JOBS_UNSAFE=yes # https://github.com/vectorgraphics/asymptote/issues/331 fixed but still needed ALL_TARGET= asy asy-keywords.el INSTALL_TARGET= install-asy @@ -51,6 +57,7 @@ OPTIONS_DEFINE= BDWGC DOCS EXAMPLES FFTW GSL MANPAGES READLINE BDWGC_LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded BDWGC_DESC= Enable Boehm-Demers-Weiser garbage collector BDWGC_CONFIGURE_ENABLE= gc=${LOCALBASE} +BDWGC_BROKEN= To be fixed DOCS_ALL_TARGET= html DOCS_BUILD_DEPENDS= texi2dvi:print/texinfo @@ -67,7 +74,7 @@ GSL_LIB_DEPENDS= libgsl.so:math/gsl MANPAGES_ALL_TARGET= man MANPAGES_BUILD_DEPENDS= texi2dvi:print/texinfo -MANPAGES_INFO= asy-faq +MANPAGES_INFO= asy-faq READLINE_CONFIGURE_ENABLE= readline READLINE_USES= readline @@ -77,20 +84,11 @@ TEST_WRKSRC= ${WRKSRC}/tests PORTEXAMPLES= * -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD -USES+= llvm:max=15 -.endif - -post-patch: - @${REINPLACE_CMD} 's/-lgc/-lgc-threaded/' ${WRKSRC}/configure - @${REINPLACE_CMD} 's,makeinfo,${LOCALBASE}/bin/makeinfo,' \ +pre-configure: + ${REINPLACE_CMD} 's/-lgc/-lgc-threaded/' ${WRKSRC}/configure + ${REINPLACE_CMD} 's,makeinfo,${LOCALBASE}/bin/makeinfo,' \ ${WRKSRC}/doc/png/Makefile.in -# Fix the python interpreter in the generated file share/asymptote/GUI/xasyVersion.py: - @${REINPLACE_CMD} 's,/usr/bin/env python3,${PYTHON_CMD},' ${WRKSRC}/Makefile.in - post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/asy diff --git a/math/asymptote/distinfo b/math/asymptote/distinfo index 3c2a12cba1e6..ea4087e6e3e5 100644 --- a/math/asymptote/distinfo +++ b/math/asymptote/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1728465593 -SHA256 (asymptote-2.92.src.tgz) = 9d9b5c6fa7e0fbce3c1e54feb25e2d51d28c4fe7798f24c76cdcae8291a8ea66 -SIZE (asymptote-2.92.src.tgz) = 17075592 -SHA256 (fa28442195bd99b9bac87e3ff752953ac57ee172.patch) = 88d733ec69d5c0b03a866ef20d4e6f3cf308ebd048143d2ce34dcaaaf1fa357b -SIZE (fa28442195bd99b9bac87e3ff752953ac57ee172.patch) = 667 +TIMESTAMP = 1782735638 +SHA256 (asymptote-3.12.src.tgz) = eaec1e97463ef213a393c388d466a73478b0818f9403c962b91240659c9b8f1b +SIZE (asymptote-3.12.src.tgz) = 28607113 diff --git a/math/asymptote/files/patch-settings.cc b/math/asymptote/files/patch-settings.cc index aa044a38e8d1..0289262e3d0f 100644 --- a/math/asymptote/files/patch-settings.cc +++ b/math/asymptote/files/patch-settings.cc @@ -7,7 +7,7 @@ -string defaultPSViewer="evince"; -string defaultPDFViewer="evince"; -string defaultHTMLViewer="google-chrome"; -+string defaultPSViewer="gv"; ++string defaultPSViewer="xdg-open"; +string defaultPDFViewer="xdg-open"; +string defaultHTMLViewer="xdg-open"; #endif diff --git a/math/asymptote/files/patch-xstream.h b/math/asymptote/files/patch-xstream.h deleted file mode 100644 index 362604ebb1e0..000000000000 --- a/math/asymptote/files/patch-xstream.h +++ /dev/null @@ -1,11 +0,0 @@ ---- xstream.h.orig 2020-08-06 02:32:59 UTC -+++ xstream.h -@@ -41,7 +41,7 @@ extern "C" int fseeko(FILE *, off_t, int); - extern "C" off_t ftello(FILE *); - #endif - --#ifdef __APPLE__ -+if defined(__APPLE__) || defined(__FreeBSD__) - #include <rpc/xdr.h> - - inline bool_t xdr_long(XDR *__xdrs, long *__lp) { diff --git a/math/asymptote/files/pkg-message.in b/math/asymptote/files/pkg-message.in index f62154cd47cd..1636814dfebe 100644 --- a/math/asymptote/files/pkg-message.in +++ b/math/asymptote/files/pkg-message.in @@ -8,7 +8,7 @@ driver. To successfully process 3D figures or examples, it is necessary to always use software rendering. -% env LIBGL_ALWAYS_SOFTWARE=1 asy sample.asy +% env LIBGL_ALWAYS_SOFTWARE=1 asy EOM } ] diff --git a/math/asymptote/pkg-plist b/math/asymptote/pkg-plist index 6942c6f9ce16..cc57edaf584a 100644 --- a/math/asymptote/pkg-plist +++ b/math/asymptote/pkg-plist @@ -13,19 +13,10 @@ bin/xasy %%DATADIR%%/GUI/Widg_addPolyOpt.py %%DATADIR%%/GUI/Widg_editBezier.py %%DATADIR%%/GUI/Window1.py -%%DATADIR%%/GUI/__init__.py +%%DATADIR%%/GUI/buildtool.py %%DATADIR%%/GUI/configs/xasyconfig.cson %%DATADIR%%/GUI/configs/xasykeymap.cson -%%DATADIR%%/GUI/icons_rc.py %%DATADIR%%/GUI/labelEditor.py -%%DATADIR%%/GUI/pyUIClass/custMatTransform.py -%%DATADIR%%/GUI/pyUIClass/labelTextEditor.py -%%DATADIR%%/GUI/pyUIClass/setCustomAnchor.py -%%DATADIR%%/GUI/pyUIClass/widg_addLabel.py -%%DATADIR%%/GUI/pyUIClass/widg_addPolyOpt.py -%%DATADIR%%/GUI/pyUIClass/widg_editBezier.py -%%DATADIR%%/GUI/pyUIClass/widgetPointEditor.py -%%DATADIR%%/GUI/pyUIClass/window1.py %%DATADIR%%/GUI/res/icons/anchor.svg %%DATADIR%%/GUI/res/icons/android-arrow-back.svg %%DATADIR%%/GUI/res/icons/android-arrow-forward.svg @@ -70,7 +61,7 @@ bin/xasy %%DATADIR%%/GUI/res/icons/text.svg %%DATADIR%%/GUI/res/icons/triangle-stroked-15.svg %%DATADIR%%/GUI/res/icons/undo.svg -%%DATADIR%%/GUI/setup.py +%%DATADIR%%/GUI/ui_utils.py %%DATADIR%%/GUI/xasy.py %%DATADIR%%/GUI/xasy2asy.py %%DATADIR%%/GUI/xasyArgs.py @@ -82,7 +73,17 @@ bin/xasy %%DATADIR%%/GUI/xasyTransform.py %%DATADIR%%/GUI/xasyUtils.py %%DATADIR%%/GUI/xasyValidator.py -%%DATADIR%%/GUI/xasyVersion.py +%%DATADIR%%/GUI/xasyicons/icons_rc.py +%%DATADIR%%/GUI/xasyqtui/custMatTransform.py +%%DATADIR%%/GUI/xasyqtui/labelTextEditor.py +%%DATADIR%%/GUI/xasyqtui/setCustomAnchor.py +%%DATADIR%%/GUI/xasyqtui/widg_addLabel.py +%%DATADIR%%/GUI/xasyqtui/widg_addPolyOpt.py +%%DATADIR%%/GUI/xasyqtui/widg_editBezier.py +%%DATADIR%%/GUI/xasyqtui/widgetPointEditor.py +%%DATADIR%%/GUI/xasyqtui/window1.py +%%DATADIR%%/GUI/xasyversion/__init__.py +%%DATADIR%%/GUI/xasyversion/version.py %%DATADIR%%/animate.asy %%DATADIR%%/animation.asy %%DATADIR%%/annotate.asy @@ -97,6 +98,24 @@ bin/xasy %%DATADIR%%/bezulate.asy %%DATADIR%%/binarytree.asy %%DATADIR%%/bsp.asy +%%DATADIR%%/checkversion.asy +%%DATADIR%%/collections/btree.asy +%%DATADIR%%/collections/btreegeneral.asy +%%DATADIR%%/collections/btreemap.asy +%%DATADIR%%/collections/enumerate.asy +%%DATADIR%%/collections/genericpair.asy +%%DATADIR%%/collections/hashmap.asy +%%DATADIR%%/collections/hashset.asy +%%DATADIR%%/collections/iter.asy +%%DATADIR%%/collections/map.asy +%%DATADIR%%/collections/queue.asy +%%DATADIR%%/collections/set.asy +%%DATADIR%%/collections/sortedset.asy +%%DATADIR%%/collections/splaytree.asy +%%DATADIR%%/collections/wraparray.asy +%%DATADIR%%/collections/wrapper.asy +%%DATADIR%%/collections/zip.asy +%%DATADIR%%/collections/zip2.asy %%DATADIR%%/colormap.asy %%DATADIR%%/contour.asy %%DATADIR%%/contour3.asy @@ -115,6 +134,8 @@ bin/xasy %%DATADIR%%/interpolate.asy %%DATADIR%%/labelpath.asy %%DATADIR%%/labelpath3.asy +%%DATADIR%%/libasyopengl.so +%%DATADIR%%/libasyvulkan.so %%DATADIR%%/lmfit.asy %%DATADIR%%/map.asy %%DATADIR%%/mapArray.asy @@ -149,17 +170,26 @@ bin/xasy %%DATADIR%%/rationalSimplex.asy %%DATADIR%%/reload.js %%DATADIR%%/roundedpath.asy +%%DATADIR%%/shaders/GL/blend.glsl +%%DATADIR%%/shaders/GL/compress.glsl +%%DATADIR%%/shaders/GL/count.glsl +%%DATADIR%%/shaders/GL/fragment.glsl +%%DATADIR%%/shaders/GL/screen.glsl +%%DATADIR%%/shaders/GL/sum1.glsl +%%DATADIR%%/shaders/GL/sum2.glsl +%%DATADIR%%/shaders/GL/sum3.glsl +%%DATADIR%%/shaders/GL/vertex.glsl +%%DATADIR%%/shaders/GL/zero.glsl %%DATADIR%%/shaders/blend.glsl %%DATADIR%%/shaders/compress.glsl %%DATADIR%%/shaders/count.glsl %%DATADIR%%/shaders/fragment.glsl +%%DATADIR%%/shaders/fxaa.cs.glsl %%DATADIR%%/shaders/screen.glsl %%DATADIR%%/shaders/sum1.glsl %%DATADIR%%/shaders/sum2.glsl -%%DATADIR%%/shaders/sum2fast.glsl %%DATADIR%%/shaders/sum3.glsl %%DATADIR%%/shaders/vertex.glsl -%%DATADIR%%/shaders/zero.glsl %%DATADIR%%/simplex.asy %%DATADIR%%/simplex2.asy %%DATADIR%%/size10.asyhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a480d51.345db.7edc8040>