Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/clisp/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile 16 Sep 2007 00:27:05 -0000 1.27
+++ Makefile 18 Nov 2007 23:18:59 -0000
@@ -4,8 +4,7 @@
COMMENT= ANSI Common Lisp compiler
-DISTNAME= clisp-2.33.2
-PKGNAME= ${DISTNAME}p1
+DISTNAME= clisp-2.42
CATEGORIES= lang
HOMEPAGE= http://clisp.cons.org/
@@ -14,15 +13,15 @@
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c ncurses readline
+
+LIB_DEPENDS= sigsegv.=0::devel/libsigsegv
+WANTLIB= c m ncurses readline
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clisp/}
EXTRACT_SUFX= .tar.bz2
-MODULES= devel/gettext
-
CONFIGURE_STYLE=gnu old
-CONFIGURE_ARGS= --srcdir=${WRKSRC} ${WRKBUILD}
+CONFIGURE_ARGS= --with-gmalloc --srcdir=${WRKSRC} ${WRKBUILD}
SEPARATE_BUILD= simple
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/src/autoconf \
${WRKSRC}/ffcall/autoconf \
@@ -35,7 +34,8 @@
post-configure:
@cd ${WRKBUILD} && \
./makemake --fsstnd=openbsd --prefix=${PREFIX} \
- --with-dynamic-ffi >Makefile && \
+ --with-dynamic-ffi --with-gmalloc \
+ --mandir=${PREFIX}/man >Makefile && \
make config.lisp
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/clisp/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 5 Apr 2007 16:19:59 -0000 1.6
+++ distinfo 18 Nov 2007 23:18:59 -0000
@@ -1,5 +1,5 @@
-MD5 (clisp-2.33.2.tar.bz2) = 7k6jFtsehD3LFglL9QABLw==
-RMD160 (clisp-2.33.2.tar.bz2) = LsvY8hXhSFxj+Ad27jegK3cPmMc=
-SHA1 (clisp-2.33.2.tar.bz2) = skAyV/JEoVAtYygKJiYpeVgh7a4=
-SHA256 (clisp-2.33.2.tar.bz2) = uT84r1os7v8eMU2tKg/uPB/VXgkwtGH/4Q5rSYVk3RQ=
-SIZE (clisp-2.33.2.tar.bz2) = 6091273
+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
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 18 Nov 2007 23:18:59 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- 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
+ # need 3 separate test calls because of "integer expression expected" errors
+ # when $stacksizelimit is "" or "unlimited" (no short-circuiting!)
+-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
+
+ if test -z "$do_build"; then
+
Index: patches/patch-ffcall_autoconf_ltmain_sh
===================================================================
RCS file: patches/patch-ffcall_autoconf_ltmain_sh
diff -N patches/patch-ffcall_autoconf_ltmain_sh
--- patches/patch-ffcall_autoconf_ltmain_sh 18 Jun 2002 16:11:30 -0000
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-$OpenBSD: patch-ffcall_autoconf_ltmain_sh,v 1.4 2002/06/18 16:11:30 naddy Exp $
---- ffcall/autoconf/ltmain.sh.orig Sat Jun 9 00:24:34 2001
-+++ ffcall/autoconf/ltmain.sh Tue Jun 18 18:07:43 2002
-@@ -1032,6 +1032,13 @@ compiler."
- test "X$arg" = "X-lc" && continue
- ;;
- esac
-+ elif test "$arg" = "-lc_r"; then
-+ case "$host" in
-+ *-*-openbsd*)
-+ # Do not include libc_r directly, use -pthread flag.
-+ continue
-+ ;;
-+ esac
- fi
- deplibs="$deplibs $arg"
- continue
-@@ -4412,40 +4419,6 @@ relink_command=\"$relink_command\""
- # Exit here if they wanted silent mode.
- test "$show" = ":" && exit 0
-
-- echo "----------------------------------------------------------------------"
-- echo "Libraries have been installed in:"
-- for libdir in $libdirs; do
-- echo " $libdir"
-- done
-- echo
-- echo "If you ever happen to want to link against installed libraries"
-- echo "in a given directory, LIBDIR, you must either use libtool, and"
-- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-- echo "flag during linking and do at least one of the following:"
-- if test -n "$shlibpath_var"; then
-- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
-- echo " during execution"
-- fi
-- if test -n "$runpath_var"; then
-- echo " - add LIBDIR to the \`$runpath_var' environment variable"
-- echo " during linking"
-- fi
-- if test -n "$hardcode_libdir_flag_spec"; then
-- libdir=LIBDIR
-- eval flag=\"$hardcode_libdir_flag_spec\"
--
-- echo " - use the \`$flag' linker flag"
-- fi
-- if test -n "$admincmds"; then
-- echo " - have your system administrator run these commands:$admincmds"
-- fi
-- if test -f /etc/ld.so.conf; then
-- echo " - have your system administrator add LIBDIR to
\`/etc/ld.so.conf'"
-- fi
-- echo
-- echo "See any operating system documentation about shared libraries for"
-- echo "more information, such as the ld(1) and ld.so(8) manual pages."
-- echo
"----------------------------------------------------------------------"
- exit 0
- ;;
-
Index: patches/patch-src_configure
===================================================================
RCS file: patches/patch-src_configure
diff -N patches/patch-src_configure
--- patches/patch-src_configure 27 Feb 2006 17:22:09 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-src_configure,v 1.2 2006/02/27 17:22:09 pvalchev Exp $
---- src/configure.orig Wed Jun 2 15:56:55 2004
-+++ src/configure Mon Feb 27 09:46:34 2006
-@@ -11437,7 +11437,7 @@ if test $cross_compiling = no; then
- # Both are broken. When used with CLISP, the one in the default libc.a
- # leads to a SIGSEGV, the one in libmalloc.a leads to a SIGBUS.
- case "$host_os" in
-- hpux*) cl_cv_func_malloc_broken=yes ;;
-+ hpux*|openbsd*) cl_cv_func_malloc_broken=yes ;;
- *) cl_cv_func_malloc_broken=no ;;
- esac
- else
-@@ -24255,7 +24255,7 @@ s,@host@,$host,;t t
- s,@host_cpu@,$host_cpu,;t t
- s,@host_vendor@,$host_vendor,;t t
- s,@host_os@,$host_os,;t t
--s,@LIBICONV@,$LIBICONV,;t t
-+s,@LIBICONV@,$LTLIBICONV,;t t
- s,@LTLIBICONV@,$LTLIBICONV,;t t
- s,@SET_MAKE@,$SET_MAKE,;t t
- s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-@@ -24266,7 +24266,7 @@ s,@XGETTEXT@,$XGETTEXT,;t t
- s,@MSGMERGE@,$MSGMERGE,;t t
- s,@USE_NLS@,$USE_NLS,;t t
- s,@INTLLIBS@,$INTLLIBS,;t t
--s,@LIBINTL@,$LIBINTL,;t t
-+s,@LIBINTL@,$LTLIBINTL,;t t
- s,@LTLIBINTL@,$LTLIBINTL,;t t
- s,@POSUB@,$POSUB,;t t
- s,@LIBSIGSEGV@,$LIBSIGSEGV,;t t
Index: patches/patch-src_makemake_in
===================================================================
RCS file: /cvs/ports/lang/clisp/patches/patch-src_makemake_in,v
retrieving revision 1.7
diff -u -r1.7 patch-src_makemake_in
--- patches/patch-src_makemake_in 27 Feb 2006 16:45:37 -0000 1.7
+++ patches/patch-src_makemake_in 18 Nov 2007 23:18:59 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_makemake_in,v 1.7 2006/02/27 16:45:37 pvalchev Exp $
---- src/makemake.in.orig Thu May 27 08:43:39 2004
-+++ src/makemake.in Mon Feb 27 09:37:50 2006
-@@ -1550,7 +1550,7 @@ echol "prefix = ${PREFIX}"
- echol "exec_prefix = ${EXEC_PREFIX}"
- echol "bindir = \$(exec_prefix)${NEXT_}bin"
- echol "shared = \$(prefix)${NEXT_}share"
--echol "mandir = \$(shared)${NEXT_}man"
-+echol "mandir = \$(prefix)${NEXT_}man"
- echol "docdir = \$(shared)${NEXT_}doc"
- case "$fsstnd" in
- suse)
+$OpenBSD$
+--- 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
+ echol "# make distrib VERSION_SUFFIX=pre"
+ echol "VERSION_SUFFIX="
+ echol "# The distribution's top directory"
+-echol 'TOPDIR=clisp-$(VERSION)$(VERSION_SUFFIX)'
++echol 'TOPDIR=clisp'
+ echol
+ echol '# Directories used by "make install":'
+ echol "prefix = ${PREFIX}"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/clisp/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 3 Nov 2004 19:30:37 -0000 1.7
+++ pkg/PLIST 18 Nov 2007 23:18:59 -0000
@@ -2,6 +2,8 @@
bin/clisp
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/libcharset.a
@@ -12,11 +14,17 @@
lib/clisp/base/makevars
lib/clisp/base/modules.h
lib/clisp/base/modules.o
+lib/clisp/base/readline.o
+lib/clisp/base/regex.o
+lib/clisp/base/regexi.o
+lib/clisp/base/regexp.dvi
lib/clisp/clisp-link
lib/clisp/data/
+lib/clisp/data/Symbol-Table.text
lib/clisp/data/UnicodeDataFull.txt
-lib/clisp/data/clhs.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/libcharset.a
@@ -27,9 +35,12 @@
lib/clisp/full/makevars
lib/clisp/full/modules.h
lib/clisp/full/modules.o
+lib/clisp/full/readline.o
+lib/clisp/full/regex.o
+lib/clisp/full/regexi.o
+lib/clisp/full/regexp.dvi
lib/clisp/linkkit/
lib/clisp/linkkit/clisp.h
-lib/clisp/linkkit/exporting.lisp
lib/clisp/linkkit/modprep.lisp
lib/clisp/linkkit/modules.c
lib/clisp/linkkit/modules.d
@@ -54,6 +65,8 @@
share/doc/clisp/editors.txt
share/doc/clisp/impnotes.css
share/doc/clisp/impnotes.html
+share/locale/da/LC_MESSAGES/clisp.mo
+share/locale/da/LC_MESSAGES/clisplow.mo
share/locale/de/LC_MESSAGES/clisp.mo
share/locale/de/LC_MESSAGES/clisplow.mo
share/locale/en/LC_MESSAGES/clisp.mo