cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to clisp-2.49

Browse Source 
Dynamic modules have been disabled so that the port looks like
clisp-2.48.  People willing to enable and test them are welcome.

Build can fail on i386 but clisp-2.48 has the same problem.  clisp
makes bad assumptions about adress space layout.

Tests by krw@ joshe@ and Markus Lude, ok krw@ joshe@ (ex. maintainer)
This commit is contained in:
jca 2015-10-06 11:37:06 +00:00
parent 33ff8a91b4
commit 03ba6a2315
7 changed files with 69 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lang/clisp/Makefile
View File

@ -1,14 +1,12 @@
# $OpenBSD: Makefile,v 1.43 2013/03/21 08:46:32 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.44 2015/10/06 11:37:06 jca Exp $
ONLY_FOR_ARCHS = amd64 i386 powerpc sparc64
COMMENT = ANSI Common Lisp implementation
DISTNAME= clisp-2.48
REVISION = 3
DISTNAME= clisp-2.49
CATEGORIES= lang
HOMEPAGE= http://clisp.cons.org/
MAINTAINER = Joshua Elsasser <joshe@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -35,7 +33,9 @@ CONFIGURE_ARGS= --fsstnd=openbsd \
--docdir=${PREFIX}/share/doc/clisp \
--elispdir=${PREFIX}/share/emacs/site-lisp \
--vimdir=${PREFIX}/share/doc/clisp \
--srcdir=${WRKSRC} ${WRKBUILD}
--srcdir=${WRKSRC} ${WRKBUILD} \
--without-dynamic-modules
CONFIGURE_ENV = ac_cv_prog_DVIPDF=''
.if ${MACHINE_ARCH} == "sparc64"
@ -50,4 +50,7 @@ LDFLAGS += -nopie
CONFIGURE_ARGS += --without-gmalloc
.endif
pre-build:
ln -sf ${LOCALBASE}/bin/gmake ${WRKDIR}/bin/make
.include <bsd.port.mk>

4
lang/clisp/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (clisp-2.48.tar.bz2) = Bbg/VghZojZ5zPwHOhKKU3f+lInXNEMaPcMu+I8MPcI=
SIZE (clisp-2.48.tar.bz2) = 7885098
SHA256 (clisp-2.49.tar.bz2) = gTL/NTr6pw5rGTZ6Ja49WkNicnnCVkfCIGQf7QD46JA=
SIZE (clisp-2.49.tar.bz2) = 8091011

12
lang/clisp/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2010/01/07 10:55:28 edd Exp $
--- configure.orig Thu Jan 15 08:37:34 2009
+++ configure Wed Dec 30 01:35:49 2009
@@ -389,7 +389,7 @@ do
$OpenBSD: patch-configure,v 1.4 2015/10/06 11:37:06 jca Exp $
--- configure.orig Mon Dec 14 15:37:22 2009
+++ configure Tue Sep 29 01:08:02 2015
@@ -383,7 +383,7 @@ do
passnext=both ;;
--elispdir=* | --elispdi=* | --elispd=* | --elisp=* | --elis=* | --eli=* | --el=*)
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.3 2010/01/07 10:55:28 edd Exp $
makemake_args="$makemake_args --elispdir="`getarg "$arg"` ;;
--elispdir | --elispdi | --elispd | --elisp | --elis | --eli | --el)
@@ -399,7 +399,7 @@ do
@@ -393,7 +393,7 @@ do
passnext=both ;;
--vimdir=* | --vimdi=* | --vimd=* | --vim=* | --vi=*)
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.3 2010/01/07 10:55:28 edd Exp $
makemake_args="$makemake_args --vimdir="`getarg "$arg"` ;;
--vimdir | --vimdi | --vimd | --vim | --vi)
@@ -744,8 +744,7 @@ stacksizelimit=`ulimit -s 2>/dev/null || :` # cygwin /
@@ -723,8 +723,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;

14
lang/clisp/patches/patch-src_clisp-link_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_clisp-link_in,v 1.1 2010/01/07 10:55:28 edd Exp $
--- src/clisp-link.in.orig Wed Jun 17 19:30:31 2009
+++ src/clisp-link.in Sat Jan 2 19:08:19 2010
@@ -336,6 +336,7 @@ case "$1" in
link_some "$sourcedir" "$destinationdir" ${LISPRUN} lispinit.mem modules.h modules.o makevars ${FILES};
$OpenBSD: patch-src_clisp-link_in,v 1.2 2015/10/06 11:37:06 jca Exp $
--- src/clisp-link.in.orig Tue May 25 21:54:54 2010
+++ src/clisp-link.in Mon Sep 28 20:59:27 2015
@@ -382,6 +382,7 @@ case "$1" in
lncp_some "$sourcedir" "$destinationdir" ${LISPRUN} lispinit.mem modules.h modules.o makevars ${FILES};
else
cp "$sourcedir"/modules.h "$destinationdir"/modules.h
+ chmod +w "$destinationdir"/modules.h
FILES=`link_some "$sourcedir" "$destinationdir" ${FILES}`
+ chmod +w ""$destinationdir"/modules.h"
FILES=`lncp_some "$sourcedir" "$destinationdir" ${FILES}`
# Prepare the module directories and read their variables
PRELOAD=''

47
lang/clisp/patches/patch-src_configure
View File

@ -1,47 +0,0 @@
$OpenBSD: patch-src_configure,v 1.5 2010/01/07 10:55:28 edd Exp $
--- 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
-{ $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
- $as_echo_n "(cached) " >&6
-else
- if test -n "$DVIPDF"; then
- ac_cv_prog_DVIPDF="$DVIPDF" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- 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"
- $as_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
- { $as_echo "$as_me:$LINENO: result: $DVIPDF" >&5
-$as_echo "$DVIPDF" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
for ac_prog in gzip zip compress
do
# Extract the first word of "$ac_prog", so it can be a program name with args.

34
lang/clisp/patches/patch-src_makemake_in
View File

@ -1,20 +1,34 @@
$OpenBSD: patch-src_makemake_in,v 1.11 2010/09/23 13:42:22 joshe Exp $
$OpenBSD: patch-src_makemake_in,v 1.12 2015/10/06 11:37:06 jca Exp $
Override broken compiler test, attempting to build 32-bit clisp on a
64-bit patform will not work out very well.
--- src/makemake.in.orig Tue Jul 28 06:58:03 2009
+++ src/makemake.in Mon Sep 20 16:32:15 2010
@@ -1108,6 +1108,8 @@ esac
# cpu=hppa ;;
Use the correct recipe to build shared modules on OpenBSD.
--- src/makemake.in.orig Wed Jul 7 17:15:35 2010
+++ src/makemake.in Tue Sep 29 00:28:57 2015
@@ -1150,6 +1150,7 @@ esac
# esac
test -z "$cpu" && cpu=${host_cpu}
+test "$cpu" = "${host_cpu%*64}" && cpu=${host_cpu}
+
if [ "${verbose}" = true -o "${verbose}" = yes ]; then
test "${verbose}" = true -o "${verbose}" = yes && \
cat <<EOF >&2
# host system:
@@ -1916,7 +1918,7 @@ echol "# This can also be used for pre-test and post-r
@@ -1421,10 +1422,10 @@ if [ "${with_dynamic_modules}" != no ]; then
freebsd2.2*)
XCC_CREATESHARED='ld -Bshareable -o $lib $libs /usr/lib/c++rt0.o'
;;
- freebsd2* | netbsd* | openbsd*)
+ freebsd2* | netbsd* )
XCC_CREATESHARED='ld -Bshareable -o $lib $libs'
;;
- freebsd3* | gnu* | linux* | cygwin* | mingw* | k*bsd* | dragonfly*)
+ freebsd3* | gnu* | linux* | cygwin* | mingw* | k*bsd* | dragonfly* | openbsd* )
XCC_CREATESHARED='${CC} ${CFLAGS} ${CLFLAGS} -shared -o $lib $libs'
;;
hpux9* | hpux10*)
@@ -1904,7 +1905,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"
@ -23,7 +37,7 @@ Override broken compiler test, attempting to build 32-bit clisp on a
echol
echol '# Directories used by "make install":'
echol "prefix = ${PREFIX}"
@@ -3002,7 +3004,7 @@ fi
@@ -2931,7 +2932,7 @@ fi
CLISP_="${HERE_}lisp${LEXE} -M ${HERE_}lispinit.mem ${localeflags}${someflags}"
if [ $CROSS = false ] ; then

35
lang/clisp/pkg/PLIST
View File

@ -1,48 +1,55 @@
@comment $OpenBSD: PLIST,v 1.15 2010/11/09 21:28:36 naddy Exp $
@comment $OpenBSD: PLIST,v 1.16 2015/10/06 11:37:06 jca Exp $
@bin bin/clisp
bin/clisp-link
lib/clisp/
lib/clisp/base/
lib/clisp/base/bogomips.o
lib/clisp/base/calls.o
lib/clisp/base/gettext.o
lib/clisp/base/libgnu_cl.a
lib/clisp/base/libgnu_rx.a
lib/clisp/base/libgnu_sc.a
lib/clisp/base/libnoreadline.a
lib/clisp/base/lisp.a
@bin 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
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/build-aux/
lib/clisp/build-aux/arg-nonnull.h
lib/clisp/build-aux/c++defs.h
lib/clisp/build-aux/config.guess
lib/clisp/build-aux/config.rpath
lib/clisp/build-aux/config.sub
lib/clisp/build-aux/depcomp
lib/clisp/build-aux/warn-on-use.h
lib/clisp/data/
lib/clisp/data/Symbol-Table.text
lib/clisp/data/UnicodeDataFull.txt
lib/clisp/full/
lib/clisp/full/bogomips.o
lib/clisp/full/calls.o
lib/clisp/full/gettext.o
lib/clisp/full/libgnu_cl.a
lib/clisp/full/libgnu_rx.a
lib/clisp/full/libgnu_sc.a
lib/clisp/full/libnoreadline.a
lib/clisp/full/lisp.a
@bin 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
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
lib/clisp/linkkit/modules.c
@man man/man1/clisp-link.1
@man man/man1/clisp.1
share/aclocal/clisp.m4
share/doc/clisp/
@ -57,8 +64,10 @@ share/doc/clisp/README
share/doc/clisp/README.de
share/doc/clisp/README.es
share/doc/clisp/SUMMARY
share/doc/clisp/clisp-link.1
share/doc/clisp/clisp-link.html
share/doc/clisp/clisp-link.ps
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