From owner-svn-ports-all@freebsd.org Fri Jun 15 11:03:31 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC8BD101898A; Fri, 15 Jun 2018 11:03:30 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8631A8727F; Fri, 15 Jun 2018 11:03:30 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 669FF168B1; Fri, 15 Jun 2018 11:03:30 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5FB3Ueh046107; Fri, 15 Jun 2018 11:03:30 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5FB3Ths046102; Fri, 15 Jun 2018 11:03:29 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201806151103.w5FB3Ths046102@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Fri, 15 Jun 2018 11:03:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472440 - in head/math/asymptote: . files X-SVN-Group: ports-head X-SVN-Commit-Author: cpm X-SVN-Commit-Paths: in head/math/asymptote: . files X-SVN-Commit-Revision: 472440 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jun 2018 11:03:31 -0000 Author: cpm Date: Fri Jun 15 11:03:29 2018 New Revision: 472440 URL: https://svnweb.freebsd.org/changeset/ports/472440 Log: math/asymptote: Udpate to 2.44 - Register the missing dependencies for USE_GL - Add BDWGC (enable Boehm-Demers-Weiser garbage collector) option. At the moment, it is disabled by default to fix build on CURRENT and avoid breaking the interactive mode on 10.4 - Add USES=compiler:c++14-lang to fix segfault with 3D examples - Use readline from ports - Sort Makefile and cosmetic fixes - Silence a explictly called command Changelog: http://asymptote.sourceforge.net/ChangeLog PR: 228667 Submitted by: cpm Approved by: nivit (maintainer timeout, 2 weeks) MFH: 2018Q2 Added: head/math/asymptote/files/patch-runtime.in (contents, props changed) head/math/asymptote/files/patch-xstream.h (contents, props changed) Modified: head/math/asymptote/Makefile head/math/asymptote/distinfo head/math/asymptote/pkg-plist Modified: head/math/asymptote/Makefile ============================================================================== --- head/math/asymptote/Makefile Fri Jun 15 09:54:53 2018 (r472439) +++ head/math/asymptote/Makefile Fri Jun 15 11:03:29 2018 (r472440) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= asymptote -PORTVERSION= 2.41 -PORTREVISION= 4 +PORTVERSION= 2.44 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -14,18 +13,39 @@ COMMENT= Powerful script-based vector graphics languag LICENSE= GPLv3 LGPL3 LICENSE_COMB= dual -LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded \ - libsigsegv.so:devel/libsigsegv +ONLY_FOR_ARCHS= amd64 i386 + +LIB_DEPENDS= libsigsegv.so:devel/libsigsegv RUN_DEPENDS= animate:graphics/ImageMagick \ gv:print/gv \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} -ALL_TARGET= asy asy-keywords.el +USES= compiler:c++14-lang gettext-runtime ghostscript gmake ncurses perl5 python \ + shebangfix tar:tgz +SHEBANG_FILES= GUI/*.py +USE_GL= gl glu glut +USE_PERL5= build +USE_TEX= dvipsk formats -CONFIGURE_ARGS= --enable-gc=system CPPFLAGS+= -I${LOCALBASE}/include +GNU_CONFIGURE= yes +MAKE_ENV= ASYMPTOTE_HOME=${WRKDIR} HOME=${WRKDIR} +MAKE_JOBS_UNSAFE= yes + +ALL_TARGET= asy asy-keywords.el +INSTALL_TARGET= install-asy + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + +OPTIONS_DEFAULT= FFTW GSL MANPAGES READLINE +OPTIONS_DEFINE= BDWGC DOCS EXAMPLES FFTW GSL MANPAGES OFFSCREEN READLINE + +BDWGC_LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded +BDWGC_DESC= Enable Boehm-Demers-Weiser garbage collector +BDWGC_CONFIGURE_ENABLE= gc=${LOCALBASE} + DOCS_ALL_TARGET= html DOCS_BUILD_DEPENDS= texi2dvi:print/texinfo DOCS_CONFIGURE_WITH= docdir=${DOCSDIR} @@ -35,15 +55,10 @@ FFTW_CONFIGURE_ENABLE= fftw FFTW_DESC= Use FFTW to compute the Discrete Fourier Transform FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 -GNU_CONFIGURE= yes GSL_CONFIGURE_ENABLE= gsl GSL_DESC= Enable GNU Scientific library GSL_LIB_DEPENDS= libgsl.so:math/gsl -INSTALL_TARGET= install-asy - -MAKE_ENV= ASYMPTOTE_HOME=${WRKDIR} HOME=${WRKDIR} -MAKE_JOBS_UNSAFE= yes MANPAGES_ALL_TARGET= man MANPAGES_BUILD_DEPENDS= texi2dvi:print/texinfo MANPAGES_INFO= asy-faq @@ -52,32 +67,21 @@ MANPAGE_INSTALL_TARGET= install-man OFFSCREEN_CONFIGURE_ENABLE= offscreen OFFSCREEN_DESC= Enable offscreen rendering using OSMesa library OFFSCREEN_LIB_DEPENDS= libOSMesa.so:graphics/libosmesa -ONLY_FOR_ARCHS= amd64 i386 -OPTIONS_DEFAULT= FFTW GSL MANPAGES READLINE -OPTIONS_DEFINE= DOCS EXAMPLES FFTW GSL MANPAGES OFFSCREEN READLINE READLINE_CONFIGURE_ENABLE= readline -READLINE_DESC= ${LIBEDIT_DESC} -READLINE_USES= readline +READLINE_USES= readline:port -SHEBANG_FILES= GUI/*.py - -USES= gettext-runtime ghostscript gmake ncurses perl5 python \ - shebangfix tar:tgz -USE_GL= glut -USE_PERL5= build -USE_TEX= dvipsk formats - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - post-patch: @${REINPLACE_CMD} 's/-lgc/-lgc-threaded/' ${WRKSRC}/configure @${REINPLACE_CMD} 's,/usr/lib/libgs.so,${LOCALBASE}/lib/libgs.so,' \ ${WRKSRC}/settings.cc + @${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 python,${PYTHON_CMD},' ${WRKSRC}/Makefile.in post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/asy + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/asy .include Modified: head/math/asymptote/distinfo ============================================================================== --- head/math/asymptote/distinfo Fri Jun 15 09:54:53 2018 (r472439) +++ head/math/asymptote/distinfo Fri Jun 15 11:03:29 2018 (r472440) @@ -1,3 +1,3 @@ -TIMESTAMP = 1500975929 -SHA256 (asymptote-2.41.src.tgz) = 1d6e7e89fb5293fad7d836fb0477f785a113f689bd71f37a05af18ff0c5eeef0 -SIZE (asymptote-2.41.src.tgz) = 3516426 +TIMESTAMP = 1527856340 +SHA256 (asymptote-2.44.src.tgz) = 6f9bd2f1ed2835aa69ec382fefbec55ba5ec859341a42a543631a7f04ada49e7 +SIZE (asymptote-2.44.src.tgz) = 3549129 Added: head/math/asymptote/files/patch-runtime.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/asymptote/files/patch-runtime.in Fri Jun 15 11:03:29 2018 (r472440) @@ -0,0 +1,11 @@ +--- runtime.in.orig 2018-06-03 13:52:26 UTC ++++ runtime.in +@@ -85,7 +85,7 @@ stringarray2* => stringArray2() + #include "process.h" + #include "arrayop.h" + +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + extern "C" int isnan(double); + #endif + Added: head/math/asymptote/files/patch-xstream.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/asymptote/files/patch-xstream.h Fri Jun 15 11:03:29 2018 (r472440) @@ -0,0 +1,23 @@ +--- xstream.h.orig 2018-06-10 15:14:47 UTC ++++ xstream.h +@@ -31,7 +31,7 @@ + #define quad_t long long + #define u_quad_t unsigned long long + +-#if defined(__CYGWIN__) || defined(__FreeBSD__) ++#if defined(__CYGWIN__) + #include + #define u_char unsigned char + #define u_int unsigned int +@@ -41,6 +41,11 @@ extern "C" int fseeko(FILE *, off_t, int + extern "C" off_t ftello(FILE *); + #endif + ++#ifdef __FreeBSD__ ++#define xdr_longlong_t xdr_int64_t ++#define xdr_u_longlong_t xdr_u_int64_t ++#endif ++ + #ifdef _POSIX_SOURCE + #undef _POSIX_SOURCE + #include Modified: head/math/asymptote/pkg-plist ============================================================================== --- head/math/asymptote/pkg-plist Fri Jun 15 09:54:53 2018 (r472439) +++ head/math/asymptote/pkg-plist Fri Jun 15 11:03:29 2018 (r472440) @@ -160,6 +160,7 @@ man/man1/xasy.1x.gz %%DATADIR%%/plain_strings.asy %%DATADIR%%/plain_xasy.asy %%DATADIR%%/pstoedit.asy +%%DATADIR%%/rational.asy %%DATADIR%%/reload.js %%DATADIR%%/roundedpath.asy %%DATADIR%%/simplex.asy @@ -360,6 +361,7 @@ man/man1/xasy.1x.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/limit.asy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lineargraph.asy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lineargraph0.asy +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/linearregression.asy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lines.asy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/linetype.asy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lmfit1.asy