Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Jun 2018 13:30:30 +0200
From:      "Carlos J. Puga Medina" <cpm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org,  svn-ports-head@freebsd.org
Subject:   Re: svn commit: r472440 - in head/math/asymptote: . files
Message-ID:  <1529062230.84685.3.camel@FreeBSD.org>
In-Reply-To: <201806151103.w5FB3Ths046102@repo.freebsd.org>
References:  <201806151103.w5FB3Ths046102@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--=-mQhaTXRxOrIBOY63DFKL
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Fri, 2018-06-15 at 11:03 +0000, Carlos J. Puga Medina wrote:
> Author: cpm
> Date: Fri Jun 15 11:03:29 2018
> New Revision: 472440
> URL: https://svnweb.freebsd.org/changeset/ports/472440
>=20
> Log:
>   math/asymptote: Udpate to 2.44

Oops! Too fast... I should have written s/Udpate/Update

>  =20
>   - 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=3Dcompiler:c++14-lang to fix segfault with 3D examples
>   - Use readline from ports
>   - Sort Makefile and cosmetic fixes
>   - Silence a explictly called command

Also, I forgot to explain that it must use ${LOCALBASE}/bin/makeinfo to
fix build on 10.4

>  =20
>   Changelog: http://asymptote.sourceforge.net/ChangeLog
>  =20
>   PR:		228667
>   Submitted by:	cpm
>   Approved by:	nivit (maintainer timeout, 2 weeks)
>   MFH:		2018Q2
>=20
> 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
>=20
> Modified: head/math/asymptote/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> =3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- head/math/asymptote/Makefile	Fri Jun 15 09:54:53 2018=09
> (r472439)
> +++ head/math/asymptote/Makefile	Fri Jun 15 11:03:29 2018=09
> (r472440)
> @@ -2,8 +2,7 @@
>  # $FreeBSD$
> =20
>  PORTNAME=3D	asymptote
> -PORTVERSION=3D	2.41
> -PORTREVISION=3D	4
> +PORTVERSION=3D	2.44
>  CATEGORIES=3D	math
>  MASTER_SITES=3D	SF/${PORTNAME}/${PORTVERSION}
>  DISTNAME=3D	${PORTNAME}-${PORTVERSION}.src
> @@ -14,18 +13,39 @@ COMMENT=3D	Powerful script-based vector
> graphics languag
>  LICENSE=3D	GPLv3 LGPL3
>  LICENSE_COMB=3D	dual
> =20
> -LIB_DEPENDS=3D	libgc-threaded.so:devel/boehm-gc-threaded \
> -		libsigsegv.so:devel/libsigsegv
> +ONLY_FOR_ARCHS=3D	amd64 i386
> +
> +LIB_DEPENDS=3D	libsigsegv.so:devel/libsigsegv
>  RUN_DEPENDS=3D	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}
> =20
> -ALL_TARGET=3D	asy asy-keywords.el
> +USES=3D		compiler:c++14-lang gettext-runtime ghostscript
> gmake ncurses perl5 python \
> +		shebangfix tar:tgz
> +SHEBANG_FILES=3D	GUI/*.py
> +USE_GL=3D		gl glu glut
> +USE_PERL5=3D	build
> +USE_TEX=3D	dvipsk formats
> =20
> -CONFIGURE_ARGS=3D	--enable-gc=3Dsystem
>  CPPFLAGS+=3D	-I${LOCALBASE}/include
> +GNU_CONFIGURE=3D	yes
> =20
> +MAKE_ENV=3D	ASYMPTOTE_HOME=3D${WRKDIR} HOME=3D${WRKDIR}
> +MAKE_JOBS_UNSAFE=3D	yes
> +
> +ALL_TARGET=3D	asy asy-keywords.el
> +INSTALL_TARGET=3D	install-asy
> +
> +WRKSRC=3D		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> +
> +OPTIONS_DEFAULT=3D	FFTW GSL MANPAGES READLINE
> +OPTIONS_DEFINE=3D		BDWGC DOCS EXAMPLES FFTW GSL MANPAGES
> OFFSCREEN READLINE
> +
> +BDWGC_LIB_DEPENDS=3D	libgc-threaded.so:devel/boehm-gc-threaded
> +BDWGC_DESC=3D		Enable Boehm-Demers-Weiser garbage
> collector
> +BDWGC_CONFIGURE_ENABLE=3D	gc=3D${LOCALBASE}
> +
>  DOCS_ALL_TARGET=3D	html
>  DOCS_BUILD_DEPENDS=3D	texi2dvi:print/texinfo
>  DOCS_CONFIGURE_WITH=3D	docdir=3D${DOCSDIR}
> @@ -35,15 +55,10 @@ FFTW_CONFIGURE_ENABLE=3D	fftw
>  FFTW_DESC=3D	Use FFTW to compute the Discrete Fourier Transform
>  FFTW_LIB_DEPENDS=3D	libfftw3.so:math/fftw3
> =20
> -GNU_CONFIGURE=3D	yes
>  GSL_CONFIGURE_ENABLE=3D	gsl
>  GSL_DESC=3D	Enable GNU Scientific library
>  GSL_LIB_DEPENDS=3D	libgsl.so:math/gsl
> =20
> -INSTALL_TARGET=3D	install-asy
> -
> -MAKE_ENV=3D	ASYMPTOTE_HOME=3D${WRKDIR} HOME=3D${WRKDIR}
> -MAKE_JOBS_UNSAFE=3D	yes
>  MANPAGES_ALL_TARGET=3D	man
>  MANPAGES_BUILD_DEPENDS=3D	texi2dvi:print/texinfo
>  MANPAGES_INFO=3D	asy-faq
> @@ -52,32 +67,21 @@ MANPAGE_INSTALL_TARGET=3D	install-man
>  OFFSCREEN_CONFIGURE_ENABLE=3D	offscreen
>  OFFSCREEN_DESC=3D	Enable offscreen rendering using OSMesa
> library
>  OFFSCREEN_LIB_DEPENDS=3D	libOSMesa.so:graphics/libosmesa
> -ONLY_FOR_ARCHS=3D	amd64 i386
> -OPTIONS_DEFAULT=3D	FFTW GSL MANPAGES READLINE
> -OPTIONS_DEFINE=3D	DOCS EXAMPLES FFTW GSL MANPAGES OFFSCREEN
> READLINE
> =20
>  READLINE_CONFIGURE_ENABLE=3D	readline
> -READLINE_DESC=3D	${LIBEDIT_DESC}
> -READLINE_USES=3D	readline
> +READLINE_USES=3D	readline:port
> =20
> -SHEBANG_FILES=3D	GUI/*.py
> -
> -USES=3D		gettext-runtime ghostscript gmake ncurses perl5
> python \
> -		shebangfix tar:tgz
> -USE_GL=3D	glut
> -USE_PERL5=3D	build
> -USE_TEX=3D	dvipsk formats
> -
> -WRKSRC=3D	${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
> =20
>  post-install:
> -	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/asy
> +	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/asy
> =20
>  .include <bsd.port.mk>
>=20
> Modified: head/math/asymptote/distinfo
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> =3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- head/math/asymptote/distinfo	Fri Jun 15 09:54:53 2018=09
> (r472439)
> +++ head/math/asymptote/distinfo	Fri Jun 15 11:03:29 2018=09
> (r472440)
> @@ -1,3 +1,3 @@
> -TIMESTAMP =3D 1500975929
> -SHA256 (asymptote-2.41.src.tgz) =3D
> 1d6e7e89fb5293fad7d836fb0477f785a113f689bd71f37a05af18ff0c5eeef0
> -SIZE (asymptote-2.41.src.tgz) =3D 3516426
> +TIMESTAMP =3D 1527856340
> +SHA256 (asymptote-2.44.src.tgz) =3D
> 6f9bd2f1ed2835aa69ec382fefbec55ba5ec859341a42a543631a7f04ada49e7
> +SIZE (asymptote-2.44.src.tgz) =3D 3549129
>=20
> Added: head/math/asymptote/files/patch-runtime.in
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> =3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- /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* =3D> stringArray2()
> + #include "process.h"
> + #include "arrayop.h"
> +   =20
> +-#ifdef __APPLE__
> ++#if defined(__APPLE__) || defined(__FreeBSD__)
> + extern "C" int isnan(double); =20
> + #endif
> +=20
>=20
> Added: head/math/asymptote/files/patch-xstream.h
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> =3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- /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
> +  =20
> +-#if defined(__CYGWIN__) || defined(__FreeBSD__)
> ++#if defined(__CYGWIN__)
> + #include <sys/select.h>
> + #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 =20
> +=20
> ++#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 <rpc/rpc.h>
>=20
> Modified: head/math/asymptote/pkg-plist
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> =3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- head/math/asymptote/pkg-plist	Fri Jun 15 09:54:53 2018=09
> (r472439)
> +++ head/math/asymptote/pkg-plist	Fri Jun 15 11:03:29 2018=09
> (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
>=20
--=20
Carlos Jacobo Puga Medina <cpm@FreeBSD.org>
PGP fingerprint =3D C60E 9497 5302 793B CC2D  BB89 A1F3 5D66 E6D0 5453
--=-mQhaTXRxOrIBOY63DFKL
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----

iQGTBAABCgB9FiEExg6Ul1MCeTvMLbuJofNdZubQVFMFAlsjo1ZfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2
MEU5NDk3NTMwMjc5M0JDQzJEQkI4OUExRjM1RDY2RTZEMDU0NTMACgkQofNdZubQ
VFNHzAf/XPs6a0SvOePbaOo034k5Mvt+Nvd4T9X+P4JstuQj1lBJyketRRtILeZH
Uxo/w5m8vAhss/gTjGbHglR4770tlwBh9tOIKLQfKPo4P/5Ay74/37Wrdl6xscI/
Lp9/3UxS1W7eIPKpatQ7PVyF6qWZEKmbEpMV/+g5eARK9OVyiUtJESbKIyezwvxW
1iV53+UAdeuqEIN+XpVcczbxPclXdPRXvW/NeGKdrei7xxaly6POELtv2Km16F9l
3EkQHZcnAyOEfc1BVfhawXxQmCykMKRGOmmKfB2yeufaQiOA+jAFqXK6RYqpeTnR
m1EwTPhIIxaISM3FW90aOs0tZ7/plg==
=tIoT
-----END PGP SIGNATURE-----

--=-mQhaTXRxOrIBOY63DFKL--




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1529062230.84685.3.camel>