Hi, Ports!

This update package Clisp to the latest release 2.48.
Tested on i386.

Comments ? OK ?

-- 
Alexandr Shadchin
Index: clisp/Makefile
===================================================================
RCS file: /cvs/ports/lang/clisp/Makefile,v
retrieving revision 1.31
diff -N -u -p clisp/Makefile
--- clisp/Makefile      5 Mar 2009 23:44:38 -0000       1.31
+++ clisp/Makefile      30 Dec 2009 20:21:23 -0000
@@ -1,52 +1,45 @@
 # $OpenBSD: Makefile,v 1.31 2009/03/05 23:44:38 martynas Exp $
 
-ONLY_FOR_ARCHS= amd64 i386
+ONLY_FOR_ARCHS=                amd64 i386
 
-COMMENT=       ANSI Common Lisp compiler
+COMMENT=               ANSI Common Lisp compiler
 
-DISTNAME=      clisp-2.43
-PKGNAME=       ${DISTNAME}p1
-CATEGORIES=    lang
-HOMEPAGE=      http://clisp.cons.org/
+DISTNAME=              clisp-2.48
+CATEGORIES=            lang
+HOMEPAGE=              http://clisp.cons.org/
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-MODULES=       devel/gettext
+MODULES=               devel/gettext
 
-LIB_DEPENDS=   sigsegv::devel/libsigsegv
-WANTLIB=       c m ncurses readline
+LIB_DEPENDS=           sigsegv::devel/libsigsegv \
+                       avcall,callback::devel/ffcall
+WANTLIB=               c m ncurses readline
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=clisp/}
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=clisp/}
+EXTRACT_SUFX=          .tar.bz2
 
-USE_LIBTOOL=   Yes
-CONFIGURE_STYLE=gnu old
-CONFIGURE_ARGS= --with-gmalloc \
-               --srcdir=${WRKSRC} ${WRKBUILD}
-MAKEMAKE_ARGS= --fsstnd=openbsd \
-               --prefix=${PREFIX} \
-               --with-dynamic-ffi \
-               --with-gmalloc \
-               --mandir=${PREFIX}/man \
-               --vimdir=${PREFIX}/share/doc/clisp \
-               --docdir=${PREFIX}/share/doc/clisp
-.if ${MACHINE_ARCH} == "amd64"
-MAKEMAKE_ARGS+=        --disable-mmap
-.endif
-SEPARATE_BUILD=        simple
-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'
+USE_GMAKE=             Yes
+USE_LIBTOOL=           Yes
 
+SEPARATE_BUILD=                simple
 
-post-configure:
-       @cd ${WRKBUILD} && ./makemake ${MAKEMAKE_ARGS} >Makefile && \
-       make config.lisp
+CONFIGURE_STYLE=       gnu old
+CONFIGURE_ARGS=                --fsstnd=openbsd \
+                       --with-gmalloc \
+                       --with-gettext \
+                       --mandir=${PREFIX}/man \
+                       --docdir=${PREFIX}/share/doc/clisp \
+                       --elispdir=${PREFIX}/share/doc/clisp \
+                       --vimdir=${PREFIX}/share/doc/clisp \
+                       --srcdir=${WRKSRC} ${WRKBUILD}
+
+.if ${MACHINE_ARCH} == "amd64"
+CONFIGURE_ARGS+=       --disable-mmap
+.endif
 
 .include <bsd.port.mk>
Index: clisp/distinfo
===================================================================
RCS file: /cvs/ports/lang/clisp/distinfo,v
retrieving revision 1.8
diff -N -u -p clisp/distinfo
--- clisp/distinfo      25 Nov 2007 22:16:21 -0000      1.8
+++ clisp/distinfo      30 Dec 2009 20:21:23 -0000
@@ -1,5 +1,5 @@
-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
+MD5 (clisp-2.48.tar.bz2) = XkxPfNz3oe9BlrmJfChxWA==
+RMD160 (clisp-2.48.tar.bz2) = AcFQ69HkTmJ/Qd6c3IS5AmcYWnA=
+SHA1 (clisp-2.48.tar.bz2) = 3CE+0CGU7EyLWWEYxfkrJdH1QOA=
+SHA256 (clisp-2.48.tar.bz2) = Bbg/VghZojZ5zPwHOhKKU3f+lInXNEMaPcMu+I8MPcI=
+SIZE (clisp-2.48.tar.bz2) = 7885098
Index: clisp/patches/patch-configure
===================================================================
RCS file: /cvs/ports/lang/clisp/patches/patch-configure,v
retrieving revision 1.2
diff -N -u -p clisp/patches/patch-configure
--- clisp/patches/patch-configure       25 Nov 2007 22:16:21 -0000      1.2
+++ clisp/patches/patch-configure       30 Dec 2009 20:21:23 -0000
@@ -1,7 +1,25 @@
 $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 /
+--- configure.orig     Thu Jan 15 08:37:34 2009
++++ configure  Wed Dec 30 01:35:49 2009
+@@ -389,7 +389,7 @@ do
+         passnext=both ;;
+ 
+       --elispdir=* | --elispdi=* | --elispd=* | --elisp=* | --elis=* | 
--eli=* | --el=*)
+-        subdir_configure_args="$subdir_configure_args $arg"
++        subdir_configure_args="$subdir_configure_args"
+         makemake_args="$makemake_args --elispdir="`getarg "$arg"` ;;
+ 
+       --elispdir | --elispdi | --elispd | --elisp | --elis | --eli | --el)
+@@ -399,7 +399,7 @@ do
+         passnext=both ;;
+ 
+       --vimdir=* | --vimdi=* | --vimd=* | --vim=* | --vi=*)
+-        subdir_configure_args="$subdir_configure_args $arg"
++        subdir_configure_args="$subdir_configure_args"
+         makemake_args="$makemake_args --vimdir="`getarg "$arg"` ;;
+ 
+       --vimdir | --vimdi | --vimd | --vim | --vi)
+@@ -744,8 +744,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;
@@ -10,4 +28,4 @@ $OpenBSD: patch-configure,v 1.2 2007/11/25 22:16:21 ja
 +STACK_TOO_SMALL=0      # 0=true => need to reset; 1=false => big enough
  set -e
  
- cd $ABS_DIRNAME
+ cd "$ABS_DIRNAME"
Index: clisp/patches/patch-src_configure
===================================================================
RCS file: /cvs/ports/lang/clisp/patches/patch-src_configure,v
retrieving revision 1.4
diff -N -u -p clisp/patches/patch-src_configure
--- clisp/patches/patch-src_configure   25 Nov 2007 22:16:21 -0000      1.4
+++ clisp/patches/patch-src_configure   30 Dec 2009 20:21:23 -0000
@@ -1,16 +1,16 @@
 $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; }
+--- src/configure.orig Tue Jul 28 23:10:12 2009
++++ src/configure      Mon Dec 28 21:08:14 2009
+@@ -22606,43 +22606,6 @@ $as_echo "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; }
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
 -if test "${ac_cv_prog_DVIPDF+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  $as_echo_n "(cached) " >&6
 -else
 -  if test -n "$DVIPDF"; then
 -  ac_cv_prog_DVIPDF="$DVIPDF" # Let the user override the test.
@@ -23,7 +23,7 @@ $OpenBSD: patch-src_configure,v 1.4 2007/11/25 22:16:2
 -  for ac_exec_ext in '' $ac_executable_extensions; do
 -  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
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@@ -34,11 +34,11 @@ $OpenBSD: patch-src_configure,v 1.4 2007/11/25 22:16:2
 -fi
 -DVIPDF=$ac_cv_prog_DVIPDF
 -if test -n "$DVIPDF"; then
--  { echo "$as_me:$LINENO: result: $DVIPDF" >&5
--echo "${ECHO_T}$DVIPDF" >&6; }
+-  { $as_echo "$as_me:$LINENO: result: $DVIPDF" >&5
+-$as_echo "$DVIPDF" >&6; }
 -else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
 -fi
 -
 -
Index: clisp/patches/patch-src_makemake_in
===================================================================
RCS file: /cvs/ports/lang/clisp/patches/patch-src_makemake_in,v
retrieving revision 1.9
diff -N -u -p clisp/patches/patch-src_makemake_in
--- clisp/patches/patch-src_makemake_in 25 Nov 2007 22:16:21 -0000      1.9
+++ clisp/patches/patch-src_makemake_in 30 Dec 2009 20:21:23 -0000
@@ -1,7 +1,7 @@
 $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
+--- src/makemake.in.orig       Tue Jul 28 19:58:03 2009
++++ src/makemake.in    Wed Dec 30 22:12:19 2009
+@@ -1916,7 +1916,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"
@@ -10,3 +10,12 @@ $OpenBSD: patch-src_makemake_in,v 1.9 2007/11/25 22:16
  echol
  echol '# Directories used by "make install":'
  echol "prefix = ${PREFIX}"
+@@ -3002,7 +3002,7 @@ fi
+ CLISP_="${HERE_}lisp${LEXE} -M ${HERE_}lispinit.mem 
${localeflags}${someflags}"
+ 
+ if [ $CROSS = false ] ; then
+-  CHECK_DEPS="check-recompile check-fresh-line check-script check-exec-image 
check-tests"
++  CHECK_DEPS="check-recompile check-fresh-line check-script check-tests"
+ 
+   echol "# check the sources:"
+   echol "# 1. subr.d, fsubr.d, subrkw.d and all the LISPFUNs must add up"
Index: clisp/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/clisp/pkg/PLIST,v
retrieving revision 1.11
diff -N -u -p clisp/pkg/PLIST
--- clisp/pkg/PLIST     5 Mar 2009 23:44:38 -0000       1.11
+++ clisp/pkg/PLIST     30 Dec 2009 20:21:23 -0000
@@ -4,8 +4,6 @@ lib/clisp/
 lib/clisp/base/
 lib/clisp/base/calls.o
 lib/clisp/base/gettext.o
-lib/clisp/base/libavcall.a
-lib/clisp/base/libcallback.a
 lib/clisp/base/libnoreadline.a
 lib/clisp/base/lisp.a
 @bin lib/clisp/base/lisp.run
@@ -27,8 +25,6 @@ lib/clisp/data/UnicodeDataFull.txt
 lib/clisp/full/
 lib/clisp/full/calls.o
 lib/clisp/full/gettext.o
-lib/clisp/full/libavcall.a
-lib/clisp/full/libcallback.a
 lib/clisp/full/libnoreadline.a
 lib/clisp/full/lisp.a
 @bin lib/clisp/full/lisp.run
@@ -47,8 +43,8 @@ lib/clisp/linkkit/
 lib/clisp/linkkit/clisp.h
 lib/clisp/linkkit/modprep.lisp
 lib/clisp/linkkit/modules.c
-lib/clisp/linkkit/modules.d
 @man man/man1/clisp.1
+share/aclocal/clisp.m4
 share/doc/clisp/
 share/doc/clisp/ANNOUNCE
 share/doc/clisp/CLOS-guide.txt
@@ -61,20 +57,19 @@ share/doc/clisp/README
 share/doc/clisp/README.de
 share/doc/clisp/README.es
 share/doc/clisp/SUMMARY
+share/doc/clisp/clhs.el
+share/doc/clisp/clisp-coding.el
+share/doc/clisp/clisp-ffi.el
+share/doc/clisp/clisp-indent.el
+share/doc/clisp/clisp-indent.lisp
 share/doc/clisp/clisp.1
 share/doc/clisp/clisp.dvi
 share/doc/clisp/clisp.html
 share/doc/clisp/clisp.png
 share/doc/clisp/clisp.ps
-share/doc/clisp/editors.txt
 share/doc/clisp/impnotes.css
 share/doc/clisp/impnotes.html
 share/doc/clisp/lisp.vim
-share/emacs/site-lisp/clhs.el
-share/emacs/site-lisp/clisp-coding.el
-share/emacs/site-lisp/clisp-ffi.el
-share/emacs/site-lisp/clisp-indent.el
-share/emacs/site-lisp/clisp-indent.lisp
 share/locale/da/LC_MESSAGES/clisp.mo
 share/locale/da/LC_MESSAGES/clisplow.mo
 share/locale/de/LC_MESSAGES/clisp.mo

Reply via email to