From 4044cbec5c5266e05b9ec7d0e3d7813316ab8926 Mon Sep 17 00:00:00 2001 From: jasper Date: Sun, 25 Nov 2007 22:16:21 +0000 Subject: [PATCH] - update clisp to 2.43 --- lang/clisp/Makefile | 14 ++++++------- lang/clisp/distinfo | 10 ++++----- lang/clisp/patches/patch-configure | 14 ++++++------- lang/clisp/patches/patch-src_configure | 26 +++++++++++++----------- lang/clisp/patches/patch-src_makemake_in | 8 ++++---- lang/clisp/pkg/PLIST | 10 ++++++--- 6 files changed, 44 insertions(+), 38 deletions(-) diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index 6067bc5c4c1..d34c5529178 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.28 2007/11/24 23:52:55 jasper Exp $ +# $OpenBSD: Makefile,v 1.29 2007/11/25 22:16:21 jasper Exp $ ONLY_FOR_ARCHS= i386 COMMENT= ANSI Common Lisp compiler -DISTNAME= clisp-2.42 +DISTNAME= clisp-2.43 CATEGORIES= lang HOMEPAGE= http://clisp.cons.org/ @@ -20,14 +20,13 @@ WANTLIB= c m ncurses readline MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clisp/} EXTRACT_SUFX= .tar.bz2 +USE_LIBTOOL= Yes CONFIGURE_STYLE=gnu old CONFIGURE_ARGS= --with-gmalloc \ --srcdir=${WRKSRC} ${WRKBUILD} SEPARATE_BUILD= simple -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/src/autoconf \ - ${WRKSRC}/ffcall/autoconf \ - ${WRKSRC}/libcharset/autoconf - +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/ffcall/autoconf +USE_GMAKE= Yes MAKE_FLAGS= INSTALL='install -c' \ INSTALL_PROGRAM='install -c -s -m 555' \ INSTALL_DATA='install -c -m 644' @@ -39,7 +38,8 @@ post-configure: --with-dynamic-ffi \ --with-gmalloc \ --mandir=${PREFIX}/man \ - --vimdir=${PREFIX}/share/doc/clisp >Makefile && \ + --vimdir=${PREFIX}/share/doc/clisp \ + --docdir=${PREFIX}/share/doc/clisp >Makefile && \ make config.lisp .include diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo index 0638f038ea1..b395d95d427 100644 --- a/lang/clisp/distinfo +++ b/lang/clisp/distinfo @@ -1,5 +1,5 @@ -MD5 (clisp-2.42.tar.bz2) = P8KDQuRGpiwetPZSd5KYiA== -RMD160 (clisp-2.42.tar.bz2) = ttazwlXD+R925fxGsfBcyi67s4g= -SHA1 (clisp-2.42.tar.bz2) = TDmlVJ0oIbHVqxz8oXJSfpBTrxw= -SHA256 (clisp-2.42.tar.bz2) = bg9E/XZQVVdiC0PYts/bP81r++H6zXwblR/A5H//MNg= -SIZE (clisp-2.42.tar.bz2) = 8284453 +MD5 (clisp-2.43.tar.bz2) = Rc96tijKuD6Zzqp1qogLYw== +RMD160 (clisp-2.43.tar.bz2) = MIgTJUPJIOArSCyQMXQro08v4Bc= +SHA1 (clisp-2.43.tar.bz2) = hePo9iazHfsVgQDmMeoXv0g2T60= +SHA256 (clisp-2.43.tar.bz2) = tSE8zFnWXBkPR8Dk8E1WihpmvLKK5e1ZcF5ZxrixHoM= +SIZE (clisp-2.43.tar.bz2) = 8143871 diff --git a/lang/clisp/patches/patch-configure b/lang/clisp/patches/patch-configure index 360d80b65bf..9354b85021c 100644 --- a/lang/clisp/patches/patch-configure +++ b/lang/clisp/patches/patch-configure @@ -1,13 +1,13 @@ -$OpenBSD: patch-configure,v 1.1 2007/11/24 23:52:55 jasper Exp $ ---- configure.orig Tue Jan 2 22:57:16 2007 -+++ configure Sun Nov 18 13:29:41 2007 -@@ -726,8 +726,7 @@ STACK_LIMIT=16384 - stacksizelimit=`ulimit -s 2>/dev/null || :` # cygwin /bin/sh ulimit is broken +$OpenBSD: patch-configure,v 1.2 2007/11/25 22:16:21 jasper Exp $ +--- configure.orig Sun Nov 11 22:42:57 2007 ++++ configure Sun Nov 25 21:16:30 2007 +@@ -731,8 +731,7 @@ stacksizelimit=`ulimit -s 2>/dev/null || :` # cygwin / # need 3 separate test calls because of "integer expression expected" errors # when $stacksizelimit is "" or "unlimited" (no short-circuiting!) + set +e; -test -z "$stacksizelimit" || { test "$stacksizelimit" != unlimited && test "$stacksizelimit" -lt ${STACK_LIMIT}; } -STACK_TOO_SMALL=$? # 0=true => need to reset; 1=false => big enough +STACK_TOO_SMALL=0 # 0=true => need to reset; 1=false => big enough + set -e - if test -z "$do_build"; then - + cd $ABS_DIRNAME diff --git a/lang/clisp/patches/patch-src_configure b/lang/clisp/patches/patch-src_configure index be8bbbd1401..a52e2f921e6 100644 --- a/lang/clisp/patches/patch-src_configure +++ b/lang/clisp/patches/patch-src_configure @@ -1,14 +1,14 @@ -$OpenBSD: patch-src_configure,v 1.3 2007/11/24 23:52:55 jasper Exp $ ---- src/configure.orig Wed Nov 21 15:51:33 2007 -+++ src/configure Wed Nov 21 15:52:36 2007 -@@ -19627,41 +19627,6 @@ else - echo "${ECHO_T}no" >&6 +$OpenBSD: patch-src_configure,v 1.4 2007/11/25 22:16:21 jasper Exp $ +--- src/configure.orig Sun Nov 25 21:14:31 2007 ++++ src/configure Sun Nov 25 21:14:54 2007 +@@ -21713,43 +21713,6 @@ echo "${ECHO_T}no" >&6; } fi + -# Extract the first word of "dvipdf", so it can be a program name with args. -set dummy dvipdf; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DVIPDF+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else @@ -21,24 +21,26 @@ $OpenBSD: patch-src_configure,v 1.3 2007/11/24 23:52:55 jasper Exp $ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DVIPDF="dvipdf" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done +-IFS=$as_save_IFS - -fi -fi -DVIPDF=$ac_cv_prog_DVIPDF -if test -n "$DVIPDF"; then -- echo "$as_me:$LINENO: result: $DVIPDF" >&5 --echo "${ECHO_T}$DVIPDF" >&6 +- { echo "$as_me:$LINENO: result: $DVIPDF" >&5 +-echo "${ECHO_T}$DVIPDF" >&6; } -else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } -fi +- - for ac_prog in gzip zip compress do diff --git a/lang/clisp/patches/patch-src_makemake_in b/lang/clisp/patches/patch-src_makemake_in index 173254c62e1..6cca3b2498a 100644 --- a/lang/clisp/patches/patch-src_makemake_in +++ b/lang/clisp/patches/patch-src_makemake_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_makemake_in,v 1.8 2007/11/24 23:52:55 jasper Exp $ ---- src/makemake.in.orig Mon Oct 15 20:16:52 2007 -+++ src/makemake.in Sun Nov 18 11:41:24 2007 -@@ -1930,7 +1930,7 @@ echol "# This can also be used for pre-test and post-r +$OpenBSD: patch-src_makemake_in,v 1.9 2007/11/25 22:16:21 jasper Exp $ +--- src/makemake.in.orig Sun Nov 25 21:15:04 2007 ++++ src/makemake.in Sun Nov 25 21:15:40 2007 +@@ -1872,7 +1872,7 @@ echol "# This can also be used for pre-test and post-r echol "# make distrib VERSION_SUFFIX=pre" echol "VERSION_SUFFIX=" echol "# The distribution's top directory" diff --git a/lang/clisp/pkg/PLIST b/lang/clisp/pkg/PLIST index 77f6dde0edd..4e5a7e2ae05 100644 --- a/lang/clisp/pkg/PLIST +++ b/lang/clisp/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.8 2007/11/24 23:52:55 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.9 2007/11/25 22:16:21 jasper Exp $ bin/clisp lib/clisp/ lib/clisp/base/ @@ -6,11 +6,11 @@ lib/clisp/base/calls.o lib/clisp/base/gettext.o lib/clisp/base/libavcall.a lib/clisp/base/libcallback.a -lib/clisp/base/libcharset.a lib/clisp/base/libnoreadline.a lib/clisp/base/lisp.a lib/clisp/base/lisp.run lib/clisp/base/lispinit.mem +lib/clisp/base/localcharset.o lib/clisp/base/makevars lib/clisp/base/modules.h lib/clisp/base/modules.o @@ -18,6 +18,8 @@ lib/clisp/base/readline.o lib/clisp/base/regex.o lib/clisp/base/regexi.o lib/clisp/base/regexp.dvi +lib/clisp/base/uniname.o +lib/clisp/base/width.o lib/clisp/clisp-link lib/clisp/data/ lib/clisp/data/Symbol-Table.text @@ -27,11 +29,11 @@ lib/clisp/full/calls.o lib/clisp/full/gettext.o lib/clisp/full/libavcall.a lib/clisp/full/libcallback.a -lib/clisp/full/libcharset.a lib/clisp/full/libnoreadline.a lib/clisp/full/lisp.a lib/clisp/full/lisp.run lib/clisp/full/lispinit.mem +lib/clisp/full/localcharset.o lib/clisp/full/makevars lib/clisp/full/modules.h lib/clisp/full/modules.o @@ -39,6 +41,8 @@ lib/clisp/full/readline.o lib/clisp/full/regex.o lib/clisp/full/regexi.o lib/clisp/full/regexp.dvi +lib/clisp/full/uniname.o +lib/clisp/full/width.o lib/clisp/linkkit/ lib/clisp/linkkit/clisp.h lib/clisp/linkkit/modprep.lisp