update sbcl to 1.1.2 and maxima to 5.29.1; adjust dependent ports

2012-12-16 05:34:02 +00:00
parent 6b4f8c7600
commit 8680d9196e
25 changed files with 51 additions and 33 deletions
--- a/converters/cl-babel-sbcl/Makefile
+++ b/converters/cl-babel-sbcl/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	babel
 PORTVERSION=	2010.01.16
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	converters lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
--- a/devel/buildapp/Makefile
+++ b/devel/buildapp/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	buildapp
 PORTVERSION=	1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel lisp
 MASTER_SITES=	http://www.xach.com/lisp/
 DISTNAME=	${PORTNAME}
--- a/devel/cl-alexandria-sbcl/Makefile
+++ b/devel/cl-alexandria-sbcl/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	alexandria
 PORTVERSION=	2010.01.16
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
--- a/devel/cl-cffi-sbcl/Makefile
+++ b/devel/cl-cffi-sbcl/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	cffi
 PORTVERSION=	0.10.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
--- a/devel/cl-infix-sbcl/Makefile
+++ b/devel/cl-infix-sbcl/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	infix
 PORTVERSION=	19960628
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
--- a/devel/cl-port-sbcl/Makefile
+++ b/devel/cl-port-sbcl/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	port
 PORTVERSION=	2002.10.02.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
--- a/devel/cl-split-sequence-sbcl/Makefile
+++ b/devel/cl-split-sequence-sbcl/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	split-sequence
 PORTVERSION=	20011114.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
--- a/devel/cl-trivial-features-sbcl/Makefile
+++ b/devel/cl-trivial-features-sbcl/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	trivial-features
 PORTVERSION=	2010.01.16
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
--- a/devel/cl-trivial-gray-streams-sbcl/Makefile
+++ b/devel/cl-trivial-gray-streams-sbcl/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	trivial-gray-streams
 PORTVERSION=	2008.11.02
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
--- a/devel/cl-uffi-sbcl/Makefile
+++ b/devel/cl-uffi-sbcl/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	uffi
 PORTVERSION=	2.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -5,7 +5,7 @@
 #

 PORTNAME=	sbcl
-PORTVERSION=	1.0.58
+PORTVERSION=	1.1.2
 PORTEPOCH=	1
 CATEGORIES=	lang lisp
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
@@ -64,7 +64,7 @@ SBCLCONFIG=	Config.x86-64-freebsd
 .endif

 MAKE_SH_ARGS?=	--prefix=${PREFIX} --dynamic-space-size=${DYNAMIC_SPACE_SIZE} \
--with-sb-core-compression
+--with-sb-core-compression --with-sb-qshow
 NM?=	/usr/bin/nm
 NMFLAGS?=	-gp

@@ -118,6 +118,11 @@ MAKE_SH_ARGS+=	--with-sb-futex
 .else
 MAKE_SH_ARGS+=	--without-sb-futex
 .endif
+.if defined(WITH_SAFEPOINT)
+MAKE_SH_ARGS+=	--with-sb-safepoint --with-sb-thruption --with-sb-wtimer
+.else
+MAKE_SH_ARGS+=	--without-sb-safepoint --without-sb-thruption --without-sb-wtimer
+.endif
 .else
 MAKE_SH_ARGS+=	--without-sb-thread
 .endif
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,7 +1,7 @@
-SHA256 (sbcl-1.0.58-source.tar.bz2) = 817972d3f0be2c37ef29a9ea4858e6772cccf87cfcc5b36361a5abe2a149d945
-SIZE (sbcl-1.0.58-source.tar.bz2) = 3618349
-SHA256 (sbcl-1.0.58-documentation-html.tar.bz2) = 7ae4654ef97e81738878474f4fbfd995a2b97c3271039b0f31cc4d525ce782b8
-SIZE (sbcl-1.0.58-documentation-html.tar.bz2) = 175205
+SHA256 (sbcl-1.1.2-source.tar.bz2) = 0c7a04d4ccf149324ff5919f230e1473757c223cda47623a97d749e018327713
+SIZE (sbcl-1.1.2-source.tar.bz2) = 3692248
+SHA256 (sbcl-1.1.2-documentation-html.tar.bz2) = 0be00e8afd311a0f03fe9c53af01c9d926582b60e733a7d543d557f83a6c36a4
+SIZE (sbcl-1.1.2-documentation-html.tar.bz2) = 178733
 SHA256 (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 06a1e4e3a5f5f8e012ff6037a51624d7d1f34bff0979ce45e70418a293412b4e
 SIZE (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 8397764
 SHA256 (sbcl-1.0.31-amd64-freebsd7-binary.tar.bz2) = fcbd5ed1948312a7b6eff7e6daf736e41be945a2c57bcee4b64f172ddde518b8
--- a/lang/sbcl/files/patch-contribsb-concurrencytests__test-frlock.lisp
+++ b/lang/sbcl/files/patch-contribsb-concurrencytests__test-frlock.lisp
@@ -0,0 +1,11 @@
+--- contrib/sb-concurrency/tests/test-frlock.lisp.orig	2012-12-01 06:32:36.000000000 -0500
+++ contrib/sb-concurrency/tests/test-frlock.lisp	2012-12-15 16:23:03.000000000 -0500
+@@ -80,7 +80,7 @@
+       (values (cdr w-e!) (cdr r-e!))))
+ 
+ #+sb-thread
+-(deftest* (frlock.1 :fails-on :win32)
+(deftest* (frlock.1 :fails-on (or :freebsd :win32))
+     (handler-case
+         (sb-ext:with-timeout 60 (test-frlocks))
+       (sb-ext:timeout (c)
--- a/lang/sbcl/pkg-plist
+++ b/lang/sbcl/pkg-plist
@@ -56,6 +56,8 @@ lib/sbcl/sb-cltl2/sb-cltl2.asd
 lib/sbcl/sb-cltl2/sb-cltl2.fasl
 lib/sbcl/sb-cltl2/tests.fasl
 lib/sbcl/sb-cltl2/tests.lisp
+lib/sbcl/sb-concurrency/frlock.fasl
+lib/sbcl/sb-concurrency/frlock.lisp
 lib/sbcl/sb-concurrency/gate.fasl
 lib/sbcl/sb-concurrency/gate.lisp
 lib/sbcl/sb-concurrency/mailbox.fasl
--- a/math/fricas/Makefile
+++ b/math/fricas/Makefile
@@ -3,6 +3,7 @@

 PORTNAME=	fricas
 PORTVERSION=	1.1.8
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-full
 CATEGORIES=	math
 MASTER_SITES=	SF
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -6,14 +6,14 @@
 #

 PORTNAME=	maxima
-PORTVERSION=	5.28.0
+PORTVERSION=	5.29.1
 CATEGORIES=	math lisp tk
 MASTER_SITES=	SF/maxima/Maxima-source/${PORTVERSION}-source

 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Symbolic mathematics program

-LICENSE=		GPLv2
+LICENSE=	GPLv2

 BUILD_DEPENDS=	${LOCALBASE}/bin/${LISPPORT}
 PATCH_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
--- a/math/maxima/distinfo
+++ b/math/maxima/distinfo
@@ -1,2 +1,2 @@
-SHA256 (maxima-5.28.0.tar.gz) = d73e925f0116ba361bf4390c80e24d4fa763f647cc1fc4cc06bbf40ceb3facda
-SIZE (maxima-5.28.0.tar.gz) = 27312348
+SHA256 (maxima-5.29.1.tar.gz) = e4d8558e6eff09aa0b424fd3591a3f309c7f53068640658d40c0b2a690a024dd
+SIZE (maxima-5.29.1.tar.gz) = 27148396
--- a/math/maxima/pkg-plist
+++ b/math/maxima/pkg-plist
@@ -424,7 +424,6 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/Zeilberger/zeilberger.mac
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/Zeilberger/zeilberger_algorithm.mac
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/Zeilberger/zeilberger_linear_algebra.mac
-%%DATADIR%%/%%PORTVERSION%%/share/contrib/aes.mac
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/altsimp/altsimp.lisp
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/augmented_lagrangian.mac
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/bitwise/bitwise.lisp
@@ -581,8 +580,9 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/gentran/test/type.output
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/gentran/vaxinit.lisp
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/gentran/vaxlsp.lisp
+%%DATADIR%%/%%PORTVERSION%%/share/contrib/gf/aes.mac
+%%DATADIR%%/%%PORTVERSION%%/share/contrib/gf/aes2.mac
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/gf/gf.mac
-%%DATADIR%%/%%PORTVERSION%%/share/contrib/gf/gf_hard_test.mac
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/gf/gf_manual.pdf
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/gf/gf_manual.tex
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/gf/gf_test.mac
@@ -1151,8 +1151,6 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/share/misc/declin.mac
 %%DATADIR%%/%%PORTVERSION%%/share/misc/declin.usg
 %%DATADIR%%/%%PORTVERSION%%/share/misc/diffop.lisp
-%%DATADIR%%/%%PORTVERSION%%/share/misc/disran.lisp
-%%DATADIR%%/%%PORTVERSION%%/share/misc/disran.usg
 %%DATADIR%%/%%PORTVERSION%%/share/misc/dump.lisp
 %%DATADIR%%/%%PORTVERSION%%/share/misc/dump.usg
 %%DATADIR%%/%%PORTVERSION%%/share/misc/foptim.lisp
@@ -1455,7 +1453,6 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/src/db.lisp
 %%DATADIR%%/%%PORTVERSION%%/src/defcal.lisp
 %%DATADIR%%/%%PORTVERSION%%/src/defint.lisp
-%%DATADIR%%/%%PORTVERSION%%/src/defopt.lisp
 %%DATADIR%%/%%PORTVERSION%%/src/desoln.lisp
 %%DATADIR%%/%%PORTVERSION%%/src/displa.lisp
 %%DATADIR%%/%%PORTVERSION%%/src/displm.lisp
@@ -1488,7 +1485,6 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/src/invert.lisp
 %%DATADIR%%/%%PORTVERSION%%/src/irinte.lisp
 %%DATADIR%%/%%PORTVERSION%%/src/laplac.lisp
-%%DATADIR%%/%%PORTVERSION%%/src/ldisp.lisp
 %%DATADIR%%/%%PORTVERSION%%/src/lesfac.lisp
 %%DATADIR%%/%%PORTVERSION%%/src/letmac.lisp
 %%DATADIR%%/%%PORTVERSION%%/src/limit.lisp
@@ -1772,6 +1768,7 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_integrate.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_integrate_special.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_lambert_w.mac
+%%DATADIR%%/%%PORTVERSION%%/tests/rtest_laplace.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_log.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_map.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_mset.mac
@@ -1779,6 +1776,7 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_plot.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_power.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_round.mac
+%%DATADIR%%/%%PORTVERSION%%/tests/rtest_rules.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_scalarp.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_sign.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_signum.mac
@@ -1788,6 +1786,7 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_trig.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_zeta.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtestconjugate.mac
+%%DATADIR%%/%%PORTVERSION%%/tests/rtestdefstruct.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtesthyp.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtestifactor.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtestint.mac
--- a/math/open-axiom/Makefile
+++ b/math/open-axiom/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	open-axiom
 PORTVERSION=	1.4.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}

--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	wxMaxima
 PORTVERSION=	12.04.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
--- a/security/cl-md5-sbcl/Makefile
+++ b/security/cl-md5-sbcl/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	md5
 PORTVERSION=	1.8.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
--- a/textproc/cl-meta-sbcl/Makefile
+++ b/textproc/cl-meta-sbcl/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	meta
 PORTVERSION=	0.1
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	textproc lisp
 PKGNAMEPREFIX=	cl-
--- a/textproc/cl-ppcre-sbcl/Makefile
+++ b/textproc/cl-ppcre-sbcl/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	cl-ppcre
 PORTVERSION=	2.0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc lisp
 DISTFILES=	# none

--- a/www/cl-lml-sbcl/Makefile
+++ b/www/cl-lml-sbcl/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	lml
 PORTVERSION=	2.5.7
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www textproc
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
--- a/x11-wm/stumpwm/Makefile
+++ b/x11-wm/stumpwm/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	stumpwm
 PORTVERSION=	0.9.7
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-wm lisp
 MASTER_SITES=	SAVANNAH
 DISTFILES=	${DISTNAME}.tgz