diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile index 334a3940cfdd..afca4b7319b5 100644 --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -1,97 +1,95 @@ PORTNAME= asymptote -PORTVERSION= 2.92 -PORTREVISION= 6 +PORTVERSION= 3.12 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src MAINTAINER= nivit@FreeBSD.org COMMENT= Powerful script-based vector graphics language WWW= https://asymptote.sourceforge.io/ LICENSE= GPLv3 LGPL3 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 SUB_FILES= pkg-message WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFAULT= FFTW GSL MANPAGES READLINE 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 DOCS_CONFIGURE_WITH= docdir=${DOCSDIR} DOCS_INSTALL_TARGET= install-html FFTW_CONFIGURE_ENABLE= fftw FFTW_DESC= Use FFTW to compute the Discrete Fourier Transform FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 GSL_CONFIGURE_ENABLE= gsl GSL_DESC= Enable GNU Scientific library 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 TEST_TARGET= test TEST_WRKSRC= ${WRKSRC}/tests PORTEXAMPLES= * -.include - -.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 .include 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 @@ -1,15 +1,15 @@ --- settings.cc.orig 2024-10-07 18:22:37 UTC +++ settings.cc @@ -101,9 +101,9 @@ string defaultHTMLViewer="open"; string defaultPDFViewer="open"; string defaultHTMLViewer="open"; #else -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 string defaultGhostscript="gs"; string defaultGhostscriptLibrary=""; 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 - - 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 @@ -1,14 +1,14 @@ [ { type: install message: <