- Update to 1.40

- Use SF as MASTER_SITES
- Use devel/boehm-gc with both ARCHS (--enable-gc=system)

4 files changed, 72 insertions, 59 deletions

diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index e209adf6767b..bb468a8a40e8 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -6,22 +6,25 @@
 #
 
 PORTNAME=	asymptote
-PORTVERSION=	1.25
-PORTREVISION=	2
+PORTVERSION=	1.40
+#PORTREVISION=	0
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
+DISTNAME=	${PORTNAME}-${PORTVERSION}.src
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A powerful script-based vector graphics language
 
 LIB_DEPENDS=	fftw3.4:${PORTSDIR}/math/fftw3
-BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
+BUILD_DEPENDS=	boehm-gc>=6.8:${PORTSDIR}/devel/boehm-gc \
+		convert:${PORTSDIR}/graphics/ImageMagick \
 		latex:${PORTSDIR}/print/teTeX \
 		makeinfo:${PORTSDIR}/textproc/texi2html \
 		${MKTEXLSR}:${PORTSDIR}/print/teTeX \
 		texi2dvi:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	ggv:${PORTSDIR}/print/ggv \
+RUN_DEPENDS=	boehm-gc>=6.8:${PORTSDIR}/devel/boehm-gc \
+		ggv:${PORTSDIR}/print/ggv \
 		latex:${PORTSDIR}/print/teTeX \
 		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
@@ -33,8 +36,10 @@ USE_GHOSTSCRIPT=yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-latex=${LOCALBASE}/share/texmf-local/tex/latex
+CONFIGURE_ARGS=	--enable-gc=system --with-latex=${LOCALBASE}/share/texmf-local/tex/latex
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include $${CPPFLAGS}" LFLAGS="-L${LOCALBASE}/lib $${LFLAGS}" CFLAGS="-I${LOCALBASE}/include $${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib $${LDFLAGS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAKE_ENV+=	${CONFIGURE_ENV}
@@ -59,24 +64,7 @@ CONFIGURE_ARGS+=	--with-docdir=${DOCSDIR}
 INSTALL_TARGET+=	install-doc
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ( ${ARCH} == "amd64" )
-BUILD_DEPENDS+=	boehm-gc=6.8:${PORTSDIR}/devel/boehm-gc
-CONFIGURE_ARGS+=	--enable-gc=system
-.else
-BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/boehm-gc:fetch
-CONFIGURE_ARGS+=	--enable-gc=${GCVERSION}
-GCVERSION=	6.8
-GC_DISTNAME=	gc${GCVERSION}.tar.gz
-LN_OPTS=	-sf
-
-pre-configure:
-	cd ${WRKSRC}; \
-	${LN} ${LN_OPTS} ${DISTDIR}/${GC_DISTNAME} ${GC_DISTNAME};
-.endif
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/asymptote/distinfo b/math/asymptote/distinfo
index 39630f3f500d..41bdca9d3c40 100644
--- a/math/asymptote/distinfo
+++ b/math/asymptote/distinfo
@@ -1,3 +1,3 @@
-MD5 (asymptote-1.25.tar.gz) = 32a89bbec5a66d754c61ab7d9bfd1dbf
-SHA256 (asymptote-1.25.tar.gz) = 240a83641e6135e3734f1300b9408a00486b9f53dfbb2ddea30db5795c7cfbd5
-SIZE (asymptote-1.25.tar.gz) = 925462
+MD5 (asymptote-1.40.src.tgz) = 157b1902766b363bf0d74d059f490861
+SHA256 (asymptote-1.40.src.tgz) = 821cf24417ad9cb7c94d982da6c21f030398108c6063a041fa0871ce36565024
+SIZE (asymptote-1.40.src.tgz) = 1041654
diff --git a/math/asymptote/files/patch-Makefile.in b/math/asymptote/files/patch-Makefile.in
index d6ea43ed3f7e..e131c7fb0ee6 100644
--- a/math/asymptote/files/patch-Makefile.in
+++ b/math/asymptote/files/patch-Makefile.in
@@ -1,53 +1,55 @@
---- Makefile.in	Mon Mar  5 10:04:20 2007
-+++ Makefile.in.port	Mon Mar  5 21:44:00 2007
-@@ -22,9 +22,9 @@
+--- Makefile.in	2007-11-28 08:38:48.000000000 +0100
++++ Makefile.in.port	2007-12-27 18:16:24.000000000 +0100
+@@ -24,9 +24,9 @@
  CLEAN = camp.output asy.list
  NAME = asy
- EXTRABIN = x$(NAME)
+ XNAME = x$(NAME)
 -EXTRA = asy-mode.el asy-keywords.el asy-init.el asy.vim asymptote.py
 -KEYWORDS = base $(ASYMPTOTE_SITEDIR)
--LATEXFILES = asymptote.sty asycolors.sty pdfanim_temp.sty
+-LATEXFILES = asymptote.sty asycolors.sty
 +EXTRA = base/asy-mode.el base/asy-keywords.el base/asy-init.el base/asy.vim base/asymptote.py
 +KEYWORDS = base/*.asy
-+LATEXFILES = doc/asymptote.sty doc/asycolors.sty doc/pdfanim_temp.sty
++LATEXFILES = doc/asymptote.sty doc/asycolors.sty
+ ASY = ./asy -dir base -config ""
  
  DEFS = @DEFS@ @OPTIONS@
- CFLAGS = @CPPFLAGS@ @CFLAGS@ 
-@@ -45,7 +45,7 @@
- datadir = $(DESTDIR)@datadir@
+@@ -50,7 +50,7 @@
  asydir = $(datadir)/asymptote
+ GUIdir = $(asydir)/GUI
  docdir = $(DESTDIR)@docdir@
 -exampledir = $(docdir)/examples
 +exampledir = $(datadir)/examples/asymptote
  animationsdir = $(exampledir)/animations
  latexdir = $(DESTDIR)@latexdir@
  INSTALL = @INSTALL@
-@@ -73,7 +73,7 @@
+@@ -81,7 +81,7 @@
  	fi
  	cd $(GC); \
  	./configure $(GCOPTIONS); \
 -	$(MAKE) check
 +	$(MAKE)
  
- html:	asy
- 	cd doc; $(MAKE) doc
-@@ -103,7 +103,7 @@
+ $(GCPPLIB): $(GCLIB)
  
- asy-keywords.el: asy-list.pl 
- 	./asy -l -dir base > asy.list
--	ls $(addsuffix /*.asy,$(KEYWORDS)) | grep -v plain\* | grep -v featpost3D | xargs ./asy -l -dir base >> asy.list
-+	ls $(KEYWORDS) | grep -v plain\* | grep -v featpost3D | xargs ./asy -l -dir base >> asy.list
+@@ -114,7 +114,7 @@
+ 
+ asy-keywords.el: asy asy-list.pl
+ 	$(ASY) -l > asy.list
+-	ls $(addsuffix /*.asy,$(KEYWORDS)) | grep -v plain\* | grep -v featpost3D | xargs $(ASY) -l >> asy.list
++	ls $(KEYWORDS) | grep -v plain\* | grep -v featpost3D | xargs $(ASY) -l >> asy.list
  	./asy-list.pl asy.list @VERSION@
  	ln -sf ../asy-keywords.el base/
  
-@@ -115,11 +115,11 @@
- 	${INSTALL} -d $(bindir) $(asydir) $(exampledir) $(animationsdir)
+@@ -127,13 +127,13 @@
+           $(animationsdir)
  	-${INSTALL} -d $(latexdir)
- 	${INSTALL} -p -m 755 $(NAME) $(EXTRABIN) $(bindir)
+ 	${INSTALL} -p -m 755 $(NAME) $(bindir)
 -	${INSTALL} -p -m 644 base/*.asy $(addprefix base/,$(EXTRA)) $(asydir)
 +	${INSTALL} -p -m 644 base/*.asy $(EXTRA) $(asydir)
- 	${INSTALL} -p -m 644 examples/*.asy examples/piicon.eps \
- 		doc/*.asy doc/*.csv doc/*.dat doc/latexusage.tex $(exampledir)
+ 	${INSTALL} -p -m 755 GUI/*.py $(GUIdir)
+ 	ln -sf @datadir@/asymptote/GUI/xasy.py $(bindir)/$(XNAME)
+ 	${INSTALL} -p -m 644 examples/*.asy examples/piicon.eps doc/*.asy \
+ 	  doc/extra/*.asy doc/*.csv doc/*.dat doc/latexusage.tex $(exampledir)
  	${INSTALL} -p -m 644 examples/animations/*.asy $(animationsdir)
 -	-${INSTALL} -p -m 644 $(addprefix doc/,$(LATEXFILES)) $(latexdir)
 +	-${INSTALL} -p -m 644 $(LATEXFILES) $(latexdir)
diff --git a/math/asymptote/pkg-plist b/math/asymptote/pkg-plist
index 3207ad810032..c38544aefad2 100644
--- a/math/asymptote/pkg-plist
+++ b/math/asymptote/pkg-plist
@@ -2,6 +2,20 @@
 bin/asy
 bin/xasy
 %%DATADIR%%/CAD.asy
+%%DATADIR%%/GUI/CubicBezier.py
+%%DATADIR%%/GUI/UndoRedoStack.py
+%%DATADIR%%/GUI/xasy.py
+%%DATADIR%%/GUI/xasy2asy.py
+%%DATADIR%%/GUI/xasyActions.py
+%%DATADIR%%/GUI/xasyBezierEditor.py
+%%DATADIR%%/GUI/xasyCodeEditor.py
+%%DATADIR%%/GUI/xasyColorPicker.py
+%%DATADIR%%/GUI/xasyFile.py
+%%DATADIR%%/GUI/xasyGUIIcons.py
+%%DATADIR%%/GUI/xasyMainWin.py
+%%DATADIR%%/GUI/xasyOptions.py
+%%DATADIR%%/GUI/xasyOptionsDialog.py
+%%DATADIR%%/GUI/xasyVersion.py
 %%DATADIR%%/animate.asy
 %%DATADIR%%/annotate.asy
 %%DATADIR%%/asy-init.el
@@ -12,6 +26,7 @@ bin/xasy
 %%DATADIR%%/babel.asy
 %%DATADIR%%/binarytree.asy
 %%DATADIR%%/contour.asy
+%%DATADIR%%/contour3.asy
 %%DATADIR%%/drawtree.asy
 %%DATADIR%%/embed.asy
 %%DATADIR%%/external.asy
@@ -33,7 +48,6 @@ bin/xasy
 %%DATADIR%%/metapost.asy
 %%DATADIR%%/palette.asy
 %%DATADIR%%/patterns.asy
-%%DATADIR%%/pdfanim.asy
 %%DATADIR%%/plain.asy
 %%DATADIR%%/plain_Label.asy
 %%DATADIR%%/plain_arcs.asy
@@ -49,12 +63,14 @@ bin/xasy
 %%DATADIR%%/plain_picture.asy
 %%DATADIR%%/plain_shipout.asy
 %%DATADIR%%/plain_strings.asy
+%%DATADIR%%/plain_xasy.asy
 %%DATADIR%%/pstoedit.asy
 %%DATADIR%%/roundedpath.asy
 %%DATADIR%%/simplex.asy
 %%DATADIR%%/slide.asy
 %%DATADIR%%/slopefield.asy
 %%DATADIR%%/solids.asy
+%%DATADIR%%/splinetype.asy
 %%DATADIR%%/stats.asy
 %%DATADIR%%/surface.asy
 %%DATADIR%%/syzygy.asy
@@ -65,7 +81,6 @@ bin/xasy
 %%DATADIR%%/version.asy
 %%DATADIR%%/x11colors.asy
 %%PORTDOCS%%%%DOCSDIR%%/CAD.pdf
-%%PORTDOCS%%%%DOCSDIR%%/PDFAnim_temp_Guide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/asy-faq.ascii
 %%PORTDOCS%%%%DOCSDIR%%/asy-faq.html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/asy-faq.html/section1.html
@@ -78,7 +93,6 @@ bin/xasy
 %%PORTDOCS%%%%DOCSDIR%%/asy-faq.html/section8.html
 %%PORTDOCS%%%%DOCSDIR%%/asy-faq.html/section9.html
 %%PORTDOCS%%%%DOCSDIR%%/asymptote.pdf
-%%PORTDOCS%%%%DOCSDIR%%/intro.pdf
 %%EXAMPLESDIR%%/BezierSurface.asy
 %%EXAMPLESDIR%%/Bode.asy
 %%EXAMPLESDIR%%/CAD1.asy
@@ -87,16 +101,22 @@ bin/xasy
 %%EXAMPLESDIR%%/GaussianSurface.asy
 %%EXAMPLESDIR%%/Gouraud.asy
 %%EXAMPLESDIR%%/Gouraudcontour.asy
+%%EXAMPLESDIR%%/HermiteSpline.asy
+%%EXAMPLESDIR%%/Hobbycontrol.asy
+%%EXAMPLESDIR%%/Hobbydir.asy
 %%EXAMPLESDIR%%/Klein.asy
 %%EXAMPLESDIR%%/Pythagoras.asy
 %%EXAMPLESDIR%%/PythagoreanTree.asy
 %%EXAMPLESDIR%%/Sierpinski.asy
 %%EXAMPLESDIR%%/advection.asy
+%%EXAMPLESDIR%%/alignedaxis.asy
 %%EXAMPLESDIR%%/animations/cube.asy
 %%EXAMPLESDIR%%/animations/embeddedmovie.asy
 %%EXAMPLESDIR%%/animations/embeddedu3d.asy
 %%EXAMPLESDIR%%/animations/externalmovie.asy
 %%EXAMPLESDIR%%/animations/pdfmovie.asy
+%%EXAMPLESDIR%%/animations/slidemovies.asy
+%%EXAMPLESDIR%%/animations/sphere.asy
 %%EXAMPLESDIR%%/animations/wavepacket.asy
 %%EXAMPLESDIR%%/animations/wheel.asy
 %%EXAMPLESDIR%%/annotation.asy
@@ -116,9 +136,6 @@ bin/xasy
 %%EXAMPLESDIR%%/colors.asy
 %%EXAMPLESDIR%%/cones.asy
 %%EXAMPLESDIR%%/conicurv.asy
-%%EXAMPLESDIR%%/contour1.asy
-%%EXAMPLESDIR%%/contour2.asy
-%%EXAMPLESDIR%%/contour3.asy
 %%EXAMPLESDIR%%/cos2theta.asy
 %%EXAMPLESDIR%%/cosaddition.asy
 %%EXAMPLESDIR%%/cube.asy
@@ -165,8 +182,10 @@ bin/xasy
 %%EXAMPLESDIR%%/integraltest.asy
 %%EXAMPLESDIR%%/interpolate1.asy
 %%EXAMPLESDIR%%/intro.asy
+%%EXAMPLESDIR%%/irregularcontour.asy
 %%EXAMPLESDIR%%/join.asy
 %%EXAMPLESDIR%%/join3.asy
+%%EXAMPLESDIR%%/jump.asy
 %%EXAMPLESDIR%%/knots.asy
 %%EXAMPLESDIR%%/labelbox.asy
 %%EXAMPLESDIR%%/labelsquare.asy
@@ -191,6 +210,7 @@ bin/xasy
 %%EXAMPLESDIR%%/logticks.asy
 %%EXAMPLESDIR%%/lowint.asy
 %%EXAMPLESDIR%%/lowupint.asy
+%%EXAMPLESDIR%%/magnetic.asy
 %%EXAMPLESDIR%%/makepen.asy
 %%EXAMPLESDIR%%/markers1.asy
 %%EXAMPLESDIR%%/markers2.asy
@@ -198,8 +218,9 @@ bin/xasy
 %%EXAMPLESDIR%%/monthaxis.asy
 %%EXAMPLESDIR%%/mosaic.asy
 %%EXAMPLESDIR%%/mosquito.asy
-%%EXAMPLESDIR%%/mosquito.csv
+%%EXAMPLESDIR%%/multicontour.asy
 %%EXAMPLESDIR%%/near_earth.asy
+%%EXAMPLESDIR%%/onecontour.asy
 %%EXAMPLESDIR%%/orthocenter.asy
 %%EXAMPLESDIR%%/parametricgraph.asy
 %%EXAMPLESDIR%%/parametricsurface.asy
@@ -212,6 +233,7 @@ bin/xasy
 %%EXAMPLESDIR%%/poster.asy
 %%EXAMPLESDIR%%/progrid.asy
 %%EXAMPLESDIR%%/quartercircle.asy
+%%EXAMPLESDIR%%/rainbow.asy
 %%EXAMPLESDIR%%/ring.asy
 %%EXAMPLESDIR%%/roundpath.asy
 %%EXAMPLESDIR%%/sacone.asy
@@ -229,10 +251,10 @@ bin/xasy
 %%EXAMPLESDIR%%/sinc.asy
 %%EXAMPLESDIR%%/sinxlex.asy
 %%EXAMPLESDIR%%/slidedemo.asy
-%%EXAMPLESDIR%%/slidemovies.asy
 %%EXAMPLESDIR%%/slopefield1.asy
 %%EXAMPLESDIR%%/sphere.asy
 %%EXAMPLESDIR%%/spiral.asy
+%%EXAMPLESDIR%%/spline.asy
 %%EXAMPLESDIR%%/spring.asy
 %%EXAMPLESDIR%%/spring0.asy
 %%EXAMPLESDIR%%/spring2.asy
@@ -243,6 +265,7 @@ bin/xasy
 %%EXAMPLESDIR%%/subpictures.asy
 %%EXAMPLESDIR%%/superpath.asy
 %%EXAMPLESDIR%%/tanh.asy
+%%EXAMPLESDIR%%/teapot.asy
 %%EXAMPLESDIR%%/tensor.asy
 %%EXAMPLESDIR%%/thermodynamics.asy
 %%EXAMPLESDIR%%/tile.asy
@@ -266,6 +289,7 @@ bin/xasy
 %%EXAMPLESDIR%%/xxsq01x-1.asy
 %%EXAMPLESDIR%%/xxsq01y.asy
 %%EXAMPLESDIR%%/yingyang.asy
+@dirrm %%DATADIR%%/GUI
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/asy-faq.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
@@ -273,7 +297,6 @@ bin/xasy
 @dirrm %%EXAMPLESDIR%%
 share/texmf-local/tex/latex/asymptote/asycolors.sty
 share/texmf-local/tex/latex/asymptote/asymptote.sty
-share/texmf-local/tex/latex/asymptote/pdfanim_temp.sty
 @dirrm share/texmf-local/tex/latex/asymptote
 @unexec %%MKTEXLSR%%
 @exec %%MKTEXLSR%%