Update to 2.15

2.5 years worth of changes.

5 files changed, 95 insertions, 10 deletions

diff --git a/graphics/asymptote/Makefile b/graphics/asymptote/Makefile
index 2380620427d..fbfa31980f2 100644
--- a/graphics/asymptote/Makefile
+++ b/graphics/asymptote/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2011/11/25 21:55:06 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2012/03/10 21:14:51 markd Exp $
 #
 
-DISTNAME=	asymptote-1.85
+DISTNAME=	asymptote-2.15
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=asymptote/}
 EXTRACT_SUFX=	.tgz
@@ -14,6 +14,7 @@ LICENSE=	gnu-gpl-v3 AND gnu-lgpl-v3
 
 BUILD_DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
 BUILD_DEPENDS+=	tex-pdftex-[0-9]*:../../print/tex-pdftex
+BUILD_DEPENDS+=	tex-parskip-[0-9]*:../../print/tex-parskip
 BUILD_DEPENDS+=	ghostscript-[0-9]*:../../print/ghostscript
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/graphics/asymptote/PLIST b/graphics/asymptote/PLIST
index 3fd20f1be6f..dfc391ec72d 100644
--- a/graphics/asymptote/PLIST
+++ b/graphics/asymptote/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/08/21 23:02:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/03/10 21:14:51 markd Exp $
 bin/asy
 bin/xasy
 info/asy-faq.info
@@ -64,6 +64,7 @@ share/asymptote/plain.asy
 share/asymptote/plain_Label.asy
 share/asymptote/plain_arcs.asy
 share/asymptote/plain_arrows.asy
+share/asymptote/plain_bounds.asy
 share/asymptote/plain_boxes.asy
 share/asymptote/plain_constants.asy
 share/asymptote/plain_debugger.asy
@@ -73,6 +74,8 @@ share/asymptote/plain_markers.asy
 share/asymptote/plain_paths.asy
 share/asymptote/plain_pens.asy
 share/asymptote/plain_picture.asy
+share/asymptote/plain_prethree.asy
+share/asymptote/plain_scaling.asy
 share/asymptote/plain_shipout.asy
 share/asymptote/plain_strings.asy
 share/asymptote/plain_xasy.asy
@@ -101,6 +104,7 @@ share/asymptote/unicode.asy
 share/asymptote/version.asy
 share/asymptote/x11colors.asy
 share/doc/asymptote/CAD.pdf
+share/doc/asymptote/TeXShopAndAsymptote.pdf
 share/doc/asymptote/asy-faq.ascii
 share/doc/asymptote/asy-faq.html/index.html
 share/doc/asymptote/asy-faq.html/section1.html
@@ -112,8 +116,11 @@ share/doc/asymptote/asy-faq.html/section6.html
 share/doc/asymptote/asy-faq.html/section7.html
 share/doc/asymptote/asy-faq.html/section8.html
 share/doc/asymptote/asy-faq.html/section9.html
+share/doc/asymptote/asy-latex.pdf
+share/doc/asymptote/asyRefCard.pdf
 share/doc/asymptote/asymptote.pdf
 share/doc/asymptote/examples/100d.views
+share/doc/asymptote/examples/1overx.asy
 share/doc/asymptote/examples/BezierPatch.asy
 share/doc/asymptote/examples/BezierSurface.asy
 share/doc/asymptote/examples/Bode.asy
@@ -127,12 +134,16 @@ share/doc/asymptote/examples/HermiteSpline.asy
 share/doc/asymptote/examples/Hobbycontrol.asy
 share/doc/asymptote/examples/Hobbydir.asy
 share/doc/asymptote/examples/Klein.asy
+share/doc/asymptote/examples/NURBScurve.asy
+share/doc/asymptote/examples/NURBSsphere.asy
 share/doc/asymptote/examples/NURBSsurface.asy
 share/doc/asymptote/examples/Pythagoras.asy
 share/doc/asymptote/examples/PythagoreanTree.asy
 share/doc/asymptote/examples/RiemannSurface.asy
 share/doc/asymptote/examples/RiemannSurfaceRoot.asy
 share/doc/asymptote/examples/Sierpinski.asy
+share/doc/asymptote/examples/SierpinskiGasket.asy
+share/doc/asymptote/examples/SierpinskiSponge.asy
 share/doc/asymptote/examples/advection.asy
 share/doc/asymptote/examples/alignbox.asy
 share/doc/asymptote/examples/alignedaxis.asy
@@ -154,18 +165,22 @@ share/doc/asymptote/examples/animations/wheel.asy
 share/doc/asymptote/examples/annotation.asy
 share/doc/asymptote/examples/arrows3.asy
 share/doc/asymptote/examples/axis3.asy
+share/doc/asymptote/examples/bars3.asy
 share/doc/asymptote/examples/basealign.asy
 share/doc/asymptote/examples/bezier.asy
 share/doc/asymptote/examples/bezier2.asy
 share/doc/asymptote/examples/beziercurve.asy
-share/doc/asymptote/examples/bigsquare.asy
+share/doc/asymptote/examples/bigdiagonal.asy
+share/doc/asymptote/examples/billboard.asy
 share/doc/asymptote/examples/binarytreetest.asy
 share/doc/asymptote/examples/brokenaxis.asy
 share/doc/asymptote/examples/buildcycle.asy
 share/doc/asymptote/examples/cardioid.asy
+share/doc/asymptote/examples/cards.asy
 share/doc/asymptote/examples/centroidfg.asy
 share/doc/asymptote/examples/cheese.asy
 share/doc/asymptote/examples/circles.asy
+share/doc/asymptote/examples/clockarray.asy
 share/doc/asymptote/examples/coag.asy
 share/doc/asymptote/examples/colons.asy
 share/doc/asymptote/examples/colorplanes.asy
@@ -176,6 +191,7 @@ share/doc/asymptote/examples/conicurv.asy
 share/doc/asymptote/examples/contextfonts.asy
 share/doc/asymptote/examples/controlsystem.asy
 share/doc/asymptote/examples/cos2theta.asy
+share/doc/asymptote/examples/cos3.asy
 share/doc/asymptote/examples/cosaddition.asy
 share/doc/asymptote/examples/cpkcolors.asy
 share/doc/asymptote/examples/cube.asy
@@ -201,9 +217,11 @@ share/doc/asymptote/examples/equilateral.asy
 share/doc/asymptote/examples/equilchord.asy
 share/doc/asymptote/examples/errorbars.asy
 share/doc/asymptote/examples/exp.asy
+share/doc/asymptote/examples/exp3.asy
 share/doc/asymptote/examples/externalprc.tex
 share/doc/asymptote/examples/extrudedcontour.asy
 share/doc/asymptote/examples/fano.asy
+share/doc/asymptote/examples/fequlogo.asy
 share/doc/asymptote/examples/fermi.asy
 share/doc/asymptote/examples/filegraph.asy
 share/doc/asymptote/examples/filegraph.dat
@@ -248,10 +266,13 @@ share/doc/asymptote/examples/knots.asy
 share/doc/asymptote/examples/label3.asy
 share/doc/asymptote/examples/label3ribbon.asy
 share/doc/asymptote/examples/label3solid.asy
+share/doc/asymptote/examples/label3zoom.asy
 share/doc/asymptote/examples/labelbox.asy
 share/doc/asymptote/examples/labelsquare.asy
 share/doc/asymptote/examples/laserlattice.asy
-share/doc/asymptote/examples/latexusage.asy
+share/doc/asymptote/examples/latexusage-1.asy
+share/doc/asymptote/examples/latexusage-2.asy
+share/doc/asymptote/examples/latexusage-3.asy
 share/doc/asymptote/examples/latexusage.tex
 share/doc/asymptote/examples/latticeshading.asy
 share/doc/asymptote/examples/layers.asy
@@ -281,6 +302,7 @@ share/doc/asymptote/examples/makepen.asy
 share/doc/asymptote/examples/markers1.asy
 share/doc/asymptote/examples/markers2.asy
 share/doc/asymptote/examples/markregular.asy
+share/doc/asymptote/examples/mergeExample.asy
 share/doc/asymptote/examples/mexicanhat.asy
 share/doc/asymptote/examples/monthaxis.asy
 share/doc/asymptote/examples/mosaic.asy
@@ -296,22 +318,28 @@ share/doc/asymptote/examples/parametricelevation.asy
 share/doc/asymptote/examples/parametricgraph.asy
 share/doc/asymptote/examples/parametricsurface.asy
 share/doc/asymptote/examples/partialsurface.asy
+share/doc/asymptote/examples/partitionExample.asy
 share/doc/asymptote/examples/pathintersectsurface.asy
 share/doc/asymptote/examples/pdb.asy
+share/doc/asymptote/examples/penfunctionimage.asy
 share/doc/asymptote/examples/penimage.asy
 share/doc/asymptote/examples/phase.asy
 share/doc/asymptote/examples/piicon.eps
 share/doc/asymptote/examples/pipeintersection.asy
+share/doc/asymptote/examples/pipes.asy
 share/doc/asymptote/examples/pixel.pdf
 share/doc/asymptote/examples/planeproject.asy
 share/doc/asymptote/examples/planes.asy
 share/doc/asymptote/examples/polararea.asy
 share/doc/asymptote/examples/polarcircle.asy
+share/doc/asymptote/examples/polardatagraph.asy
 share/doc/asymptote/examples/poster.asy
 share/doc/asymptote/examples/progrid.asy
 share/doc/asymptote/examples/projectelevation.asy
 share/doc/asymptote/examples/projectrevolution.asy
+share/doc/asymptote/examples/pseudosphere.asy
 share/doc/asymptote/examples/quartercircle.asy
+share/doc/asymptote/examples/quilt.asy
 share/doc/asymptote/examples/rainbow.asy
 share/doc/asymptote/examples/randompath3.asy
 share/doc/asymptote/examples/ring.asy
@@ -331,10 +359,10 @@ share/doc/asymptote/examples/shadestroke.asy
 share/doc/asymptote/examples/shellmethod.asy
 share/doc/asymptote/examples/shellsqrtx01.asy
 share/doc/asymptote/examples/sin1x.asy
+share/doc/asymptote/examples/sin3.asy
 share/doc/asymptote/examples/sinc.asy
 share/doc/asymptote/examples/sinxlex.asy
 share/doc/asymptote/examples/slidedemo.asy
-share/doc/asymptote/examples/slidemovies.asy
 share/doc/asymptote/examples/slopefield1.asy
 share/doc/asymptote/examples/smoothelevation.asy
 share/doc/asymptote/examples/soccerball.asy
@@ -354,6 +382,7 @@ share/doc/asymptote/examples/sqrtx01.asy
 share/doc/asymptote/examples/sqrtx01y1.asy
 share/doc/asymptote/examples/square.asy
 share/doc/asymptote/examples/star.asy
+share/doc/asymptote/examples/stereoscopic.asy
 share/doc/asymptote/examples/stroke3.asy
 share/doc/asymptote/examples/strokepath.asy
 share/doc/asymptote/examples/strokeshade.asy
@@ -375,6 +404,7 @@ share/doc/asymptote/examples/triangle.asy
 share/doc/asymptote/examples/triangulate.asy
 share/doc/asymptote/examples/triceratops.asy
 share/doc/asymptote/examples/trumpet.asy
+share/doc/asymptote/examples/truncatedIcosahedron.asy
 share/doc/asymptote/examples/tvgen.asy
 share/doc/asymptote/examples/twistedtubes.asy
 share/doc/asymptote/examples/unitcircle.asy
@@ -385,13 +415,18 @@ share/doc/asymptote/examples/vectorfield.asy
 share/doc/asymptote/examples/vectorfield3.asy
 share/doc/asymptote/examples/vectorfieldsphere.asy
 share/doc/asymptote/examples/venn.asy
+share/doc/asymptote/examples/venn3.asy
 share/doc/asymptote/examples/vertexshading.asy
+share/doc/asymptote/examples/washer.asy
 share/doc/asymptote/examples/washermethod.asy
 share/doc/asymptote/examples/wedge.asy
 share/doc/asymptote/examples/westnile.asy
 share/doc/asymptote/examples/westnile.csv
 share/doc/asymptote/examples/workcone.asy
+share/doc/asymptote/examples/worksheet.asy
+share/doc/asymptote/examples/worldmap.asy
 share/doc/asymptote/examples/xsin1x.asy
+share/doc/asymptote/examples/xstitch.asy
 share/doc/asymptote/examples/xxsq01.asy
 share/doc/asymptote/examples/xxsq01x-1.asy
 share/doc/asymptote/examples/xxsq01y.asy
@@ -399,4 +434,5 @@ share/doc/asymptote/examples/yingyang.asy
 share/texmf-local/tex/context/third/asymptote/colo-asy.tex
 share/texmf-local/tex/latex/asymptote/asycolors.sty
 share/texmf-local/tex/latex/asymptote/asymptote.sty
+share/texmf-local/tex/latex/asymptote/latexmkrc
 share/texmf-local/tex/latex/asymptote/ocg.sty
diff --git a/graphics/asymptote/distinfo b/graphics/asymptote/distinfo
index 16964faa4af..61799eb24d1 100644
--- a/graphics/asymptote/distinfo
+++ b/graphics/asymptote/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/08/31 14:53:10 wiz Exp $
+$NetBSD: distinfo,v 1.3 2012/03/10 21:14:51 markd Exp $
 
-SHA1 (asymptote-1.85.src.tgz) = 7330403ad72de92e3791a977c50838675be1c061
-RMD160 (asymptote-1.85.src.tgz) = 4e801ca4d90a2d132a8553cfe3a5ddfef160d754
-Size (asymptote-1.85.src.tgz) = 1521242 bytes
+SHA1 (asymptote-2.15.src.tgz) = e0fb336c195fb21a39e3d0f3acd4881ce5e170a7
+RMD160 (asymptote-2.15.src.tgz) = 1916f4160034d4d76280bfed8ebe0bb898fc80ce
+Size (asymptote-2.15.src.tgz) = 1763773 bytes
+SHA1 (patch-configure) = 62bdb60b197034338222357ce7ddf58c654f6589
+SHA1 (patch-runtime.cc) = e61bdfc8c911f81f727c0b341522e66372905b1a
diff --git a/graphics/asymptote/patches/patch-configure b/graphics/asymptote/patches/patch-configure
new file mode 100644
index 00000000000..c353e4ca089
--- /dev/null
+++ b/graphics/asymptote/patches/patch-configure
@@ -0,0 +1,33 @@
+$NetBSD: patch-configure,v 1.1 2012/03/10 21:14:52 markd Exp $
+
+Handle TEXMFLOCAL having multiple elements.
+
+--- configure.orig	2012-02-18 05:02:01.000000000 +0000
++++ configure
+@@ -3773,7 +3773,7 @@ fi
+ 
+ 
+ if test "x$kpsewhich" = "xtrue"; then
+-  latexdir=`kpsewhich -expand-var='$TEXMFLOCAL'/tex/latex`
++  latexdir=`kpsewhich -expand-var='$TEXMFLOCAL' | sed -e 's/:.*//' -e 's:$:/tex/latex:'`
+ else
+   latexdir=$prefix/share/texmf/tex/latex
+   as_ac_File=`$as_echo "ac_cv_file_$latexdir/base/latex.ltx" | $as_tr_sh`
+@@ -3872,7 +3872,7 @@ fi
+ 
+ 
+ if test "x$kpsewhich" = "xtrue"; then
+-  contextdir=`kpsewhich -expand-var='$TEXMFLOCAL'/tex/context/third`
++  contextdir=`kpsewhich -expand-var='$TEXMFLOCAL' | sed -e 's/:.*//' -e 's:$:/tex/context/third:'`
+ else
+   contextdir=$prefix/share/texmf/tex/context/third
+ fi
+@@ -6709,7 +6709,7 @@ $as_echo "$as_me: *** Could not find lib
+ fi
+ 
+ esac
+-   if test "x$enable_offscreen" == "xyes"; then
++   if test "x$enable_offscreen" = "xyes"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSMesaCreateContext in -lOSMesa" >&5
+ $as_echo_n "checking for OSMesaCreateContext in -lOSMesa... " >&6; }
+ if test "${ac_cv_lib_OSMesa_OSMesaCreateContext+set}" = set; then :
diff --git a/graphics/asymptote/patches/patch-runtime.cc b/graphics/asymptote/patches/patch-runtime.cc
new file mode 100644
index 00000000000..e49e7ef9b74
--- /dev/null
+++ b/graphics/asymptote/patches/patch-runtime.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-runtime.cc,v 1.1 2012/03/10 21:14:52 markd Exp $
+
+--- runtime.cc.orig	2011-11-16 21:40:24.000000000 +0000
++++ runtime.cc
+@@ -274,7 +274,7 @@ void gen_runtime3(stack *Stack)
+ {
+   real x=vm::pop<real>(Stack);
+ #line 241 "runtime.in"
+-  {Stack->push<bool>(isnan(x)); return;}
++  {Stack->push<bool>(std::isnan(x)); return;}
+ }
+ 
+ #line 245 "runtime.in"