- Upgrade to 2.26

- Regen patches
This commit is contained in:
shell 2001-05-25 19:40:05 +00:00
parent a295f9e310
commit 17518d6c85
11 changed files with 155 additions and 203 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.6 2001/04/17 06:26:54 shell Exp $ # $OpenBSD: Makefile,v 1.7 2001/05/25 19:40:05 shell Exp $
# $FreeBSD: ports/lang/clisp/Makefile,v 1.4 2000/05/14 05:40:46 billf Exp $ # $FreeBSD: ports/lang/clisp/Makefile,v 1.4 2000/05/14 05:40:46 billf Exp $
NOT_FOR_ARCHS= powerpc sparc NOT_FOR_ARCHS= powerpc sparc
COMMENT= 'ANSI Common Lisp compiler' COMMENT= "ANSI Common Lisp compiler"
DISTNAME= clisp-2.25 DISTNAME= clisp-2.26
CATEGORIES= lang CATEGORIES= lang
NEED_VERSION= 1.378 NEED_VERSION= 1.378
HOMEPAGE= http://clisp.cons.org/ HOMEPAGE= http://clisp.cons.org/

View File

@ -1,3 +1,3 @@
MD5 (clisp-2.25.tar.bz2) = ee23622c2e9c645a3a15c334b109510c MD5 (clisp-2.26.tar.bz2) = c933df9f6b22ea09f27221a3a58de90b
RMD160 (clisp-2.25.tar.bz2) = 7fe40c13fea51791f542cc65e4f7fbec3ddfd2d5 RMD160 (clisp-2.26.tar.bz2) = 514d0a839fd1829a9a995781ddcce5fe2a9b770c
SHA1 (clisp-2.25.tar.bz2) = 20ab00b6036e4c07f6a3d58b2477ab606ff34bcf SHA1 (clisp-2.26.tar.bz2) = 69d2423ed72f8363cd85ae4c06e9a63800e9d7d9

View File

@ -1,20 +1,11 @@
$OpenBSD: patch-ffcall_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09 naddy Exp $ $OpenBSD: patch-ffcall_autoconf_ltconfig,v 1.2 2001/05/25 19:40:06 shell Exp $
--- ffcall/autoconf/ltconfig.orig Tue Jul 4 14:05:20 2000 --- ffcall/autoconf/ltconfig.orig Fri May 25 13:02:38 2001
+++ ffcall/autoconf/ltconfig Sat Mar 31 19:58:00 2001 +++ ffcall/autoconf/ltconfig Fri May 25 13:04:03 2001
@@ -703,7 +703,7 @@ hardcode_shlibpath_var=unsupported @@ -1396,10 +1396,21 @@
runpath_var=
case "$host_os" in
-amigaos* | beos* | sunos4*)
+amigaos* | beos* | sunos4* | openbsd*)
# On these operating systems, we should treat GNU ld like the system ld.
gnu_ld_acts_native=yes
;;
@@ -826,10 +826,21 @@ else
;; ;;
openbsd*) openbsd*)
- archive_cmds='$LD -Bshareable -o $lib$libobjs' - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir' - hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes hardcode_direct=yes
hardcode_shlibpath_var=no hardcode_shlibpath_var=no

View File

@ -1,19 +1,10 @@
$OpenBSD: patch-ffcall_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $ $OpenBSD: patch-ffcall_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:06 shell Exp $
--- ffcall/autoconf/ltmain.sh.orig Tue Jun 1 00:08:00 1999 --- ffcall/autoconf/ltmain.sh.orig Fri May 25 13:05:26 2001
+++ ffcall/autoconf/ltmain.sh Sat Mar 31 19:58:27 2001 +++ ffcall/autoconf/ltmain.sh Sat May 26 01:06:23 2001
@@ -507,7 +507,28 @@ if test -z "$show_help"; then @@ -1080,6 +1080,13 @@
deplibs="$deplibs $arg" continue
;; ;;
esac
- -l*) deplibs="$deplibs $arg" ;;
+ -l*)
+ if test "$arg" = "-lc"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
+ esac
+ elif test "$arg" = "-lc_r"; then + elif test "$arg" = "-lc_r"; then
+ case "$host" in + case "$host" in
+ *-*-openbsd*) + *-*-openbsd*)
@ -21,47 +12,23 @@ $OpenBSD: patch-ffcall_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $
+ continue + continue
+ ;; + ;;
+ esac + esac
+ fi elif test "$arg" = "-lm"; then
+ deplibs="$deplibs $arg" case "$host" in
+ ;; *-*-cygwin* | *-*-beos*)
+ @@ -3567,40 +3574,6 @@
+ -?thread) # Exit here if they wanted silent mode.
+ deplibs="$deplibs $arg" test "$show" = : && exit 0
+ ;;
-no-undefined) - echo "----------------------------------------------------------------------"
allow_undefined=no
@@ -1004,7 +1025,15 @@ if test -z "$show_help"; then
# Add libc to deplibs on all systems.
dependency_libs="$deplibs"
- deplibs="$deplibs -lc"
+ case "$host_os" in
+ openbsd*)
+ # do not include libc due to us having libc/libc_r.
+ ;;
+ *)
+ # Add libc to deplibs on all other systems.
+ deplibs="$deplibs -lc"
+ ;;
+ esac
if test "$build_libtool_libs" = yes; then
# Get the real and link names of the library.
@@ -2025,37 +2054,6 @@ libdir='$install_libdir'\
done
fi
- echo "------------------------------------------------------------------------------"
- echo "Libraries have been installed in:" - echo "Libraries have been installed in:"
- for libdir in $libdirs; do - for libdir in $libdirs; do
- echo " $libdir" - echo " $libdir"
- done - done
- echo - echo
- echo "To link against installed libraries in a given directory, LIBDIR," - echo "If you ever happen to want to link against installed libraries"
- echo "you must use the \`-LLIBDIR' flag during linking." - echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo - echo "specify the full pathname of the library, or use \`-LLIBDIR'"
- echo " You will also need to do one of the following:" - echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then - if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution" - echo " during execution"
@ -76,13 +43,16 @@ $OpenBSD: patch-ffcall_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $
- -
- echo " - use the \`$flag' linker flag" - echo " - use the \`$flag' linker flag"
- fi - fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then - if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi - fi
- echo - echo
- echo "See any operating system documentation about shared libraries for" - 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 "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "------------------------------------------------------------------------------" - echo "----------------------------------------------------------------------"
exit 0 exit 0
;; ;;

View File

@ -1,17 +1,17 @@
$OpenBSD: patch-libiconv_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09 naddy Exp $ --- libiconv/autoconf/ltconfig.orig Mon Feb 26 20:54:30 2001
--- libiconv/autoconf/ltconfig.orig Mon Feb 26 13:52:17 2001 +++ libiconv/autoconf/ltconfig Sat May 26 01:53:24 2001
+++ libiconv/autoconf/ltconfig Sat Mar 31 20:01:41 2001 @@ -1099,7 +1099,9 @@
@@ -1099,6 +1099,9 @@ cygwin* | mingw*)
with_gnu_ld=no with_gnu_ld=no
fi fi
;; ;;
-
+openbsd*) +openbsd*)
+ with_gnu_ld=no + with_gnu_ld=no
+ ;; + ;;
esac esac
@@ -1396,10 +1399,21 @@ else ld_shlibs=yes
@@ -1396,10 +1398,21 @@
;; ;;
openbsd*) openbsd*)
@ -35,7 +35,7 @@ $OpenBSD: patch-libiconv_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09 naddy Exp $
;; ;;
os2*) os2*)
@@ -2016,13 +2030,10 @@ netbsd*) @@ -2016,13 +2029,10 @@
openbsd*) openbsd*)
version_type=sunos version_type=sunos

View File

@ -1,12 +1,11 @@
$OpenBSD: patch-libiconv_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $ $OpenBSD: patch-libiconv_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:06 shell Exp $
--- libiconv/autoconf/ltmain.sh.orig Wed Feb 21 15:13:29 2001 --- libiconv/autoconf/ltmain.sh.orig Sat May 26 01:03:04 2001
+++ libiconv/autoconf/ltmain.sh Sat Mar 31 20:01:53 2001 +++ libiconv/autoconf/ltmain.sh Sat May 26 01:05:22 2001
@@ -1079,7 +1079,18 @@ compiler." @@ -1079,7 +1079,17 @@
# These systems don't actually have c library (as such) # These systems don't actually have c library (as such)
continue continue
;; ;;
+ *-*-openbsd*) + *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue + continue
+ ;; + ;;
esac esac
@ -20,7 +19,7 @@ $OpenBSD: patch-libiconv_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp
elif test "$arg" = "-lm"; then elif test "$arg" = "-lm"; then
case "$host" in case "$host" in
*-*-cygwin* | *-*-beos*) *-*-cygwin* | *-*-beos*)
@@ -1091,6 +1102,10 @@ compiler." @@ -1091,6 +1101,10 @@
deplibs="$deplibs $arg" deplibs="$deplibs $arg"
;; ;;
@ -31,7 +30,7 @@ $OpenBSD: patch-libiconv_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp
-module) -module)
module=yes module=yes
continue continue
@@ -1799,6 +1814,9 @@ compiler." @@ -1799,6 +1813,9 @@
# rhapsody is a little odd... # rhapsody is a little odd...
deplibs="$deplibs -framework System" deplibs="$deplibs -framework System"
;; ;;
@ -41,7 +40,7 @@ $OpenBSD: patch-libiconv_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp
*) *)
# Add libc to deplibs on all other systems. # Add libc to deplibs on all other systems.
deplibs="$deplibs -lc" deplibs="$deplibs -lc"
@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\ @@ -3567,40 +3584,6 @@
# Exit here if they wanted silent mode. # Exit here if they wanted silent mode.
test "$show" = : && exit 0 test "$show" = : && exit 0

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libiconv_libcharset_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09 naddy Exp $ $OpenBSD: patch-libiconv_libcharset_autoconf_ltconfig,v 1.2 2001/05/25 19:40:06 shell Exp $
--- libiconv/libcharset/autoconf/ltconfig.orig Mon Feb 26 13:49:31 2001 --- libiconv/libcharset/autoconf/ltconfig.orig Sat May 26 01:07:07 2001
+++ libiconv/libcharset/autoconf/ltconfig Sat Mar 31 20:02:19 2001 +++ libiconv/libcharset/autoconf/ltconfig Sat May 26 01:08:10 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*) @@ -1105,6 +1105,9 @@
with_gnu_ld=no with_gnu_ld=no
fi fi
;; ;;
@ -11,7 +11,7 @@ $OpenBSD: patch-libiconv_libcharset_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09
esac esac
@@ -1402,10 +1405,21 @@ else @@ -1402,10 +1405,21 @@
;; ;;
openbsd*) openbsd*)
@ -35,7 +35,7 @@ $OpenBSD: patch-libiconv_libcharset_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09
;; ;;
os2*) os2*)
@@ -2021,13 +2035,10 @@ netbsd*) @@ -2021,13 +2035,10 @@
openbsd*) openbsd*)
version_type=sunos version_type=sunos

View File

@ -1,15 +1,16 @@
$OpenBSD: patch-libiconv_libcharset_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $ $OpenBSD: patch-libiconv_libcharset_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:06 shell Exp $
--- libiconv/libcharset/autoconf/ltmain.sh.orig Wed Feb 21 15:09:19 2001 --- libiconv/libcharset/autoconf/ltmain.sh.orig Wed Feb 21 22:13:49 2001
+++ libiconv/libcharset/autoconf/ltmain.sh Sat Mar 31 20:02:13 2001 +++ libiconv/libcharset/autoconf/ltmain.sh Sat May 26 02:17:25 2001
@@ -1079,7 +1079,18 @@ compiler." @@ -1079,7 +1079,18 @@
# These systems don't actually have c library (as such) # These systems don't actually have c library (as such)
continue continue
;; ;;
- esac
+ *-*-openbsd*) + *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r. + # Do not include libc due to us having libc/libc_r.
+ continue + continue
+ ;; + ;;
esac + esac
+ elif test "$arg" = "-lc_r"; then + elif test "$arg" = "-lc_r"; then
+ case "$host" in + case "$host" in
+ *-*-openbsd*) + *-*-openbsd*)
@ -20,7 +21,7 @@ $OpenBSD: patch-libiconv_libcharset_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09
elif test "$arg" = "-lm"; then elif test "$arg" = "-lm"; then
case "$host" in case "$host" in
*-*-cygwin* | *-*-beos*) *-*-cygwin* | *-*-beos*)
@@ -1091,6 +1102,10 @@ compiler." @@ -1091,6 +1102,10 @@
deplibs="$deplibs $arg" deplibs="$deplibs $arg"
;; ;;
@ -31,7 +32,7 @@ $OpenBSD: patch-libiconv_libcharset_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09
-module) -module)
module=yes module=yes
continue continue
@@ -1799,6 +1814,9 @@ compiler." @@ -1799,6 +1814,9 @@
# rhapsody is a little odd... # rhapsody is a little odd...
deplibs="$deplibs -framework System" deplibs="$deplibs -framework System"
;; ;;
@ -41,7 +42,7 @@ $OpenBSD: patch-libiconv_libcharset_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09
*) *)
# Add libc to deplibs on all other systems. # Add libc to deplibs on all other systems.
deplibs="$deplibs -lc" deplibs="$deplibs -lc"
@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\ @@ -3567,40 +3585,6 @@
# Exit here if they wanted silent mode. # Exit here if they wanted silent mode.
test "$show" = : && exit 0 test "$show" = : && exit 0

View File

@ -1,20 +1,11 @@
$OpenBSD: patch-sigsegv_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09 naddy Exp $ $OpenBSD: patch-sigsegv_autoconf_ltconfig,v 1.2 2001/05/25 19:40:06 shell Exp $
--- sigsegv/autoconf/ltconfig.orig Tue Jul 4 14:05:20 2000 --- sigsegv/autoconf/ltconfig.orig Sat May 26 01:10:53 2001
+++ sigsegv/autoconf/ltconfig Sat Mar 31 19:59:32 2001 +++ sigsegv/autoconf/ltconfig Sat May 26 01:12:20 2001
@@ -703,7 +703,7 @@ hardcode_shlibpath_var=unsupported @@ -1396,10 +1396,21 @@
runpath_var=
case "$host_os" in
-amigaos* | beos* | sunos4*)
+amigaos* | beos* | sunos4* | openbsd*)
# On these operating systems, we should treat GNU ld like the system ld.
gnu_ld_acts_native=yes
;;
@@ -826,10 +826,21 @@ else
;; ;;
openbsd*) openbsd*)
- archive_cmds='$LD -Bshareable -o $lib$libobjs' - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir' - hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes hardcode_direct=yes
hardcode_shlibpath_var=no hardcode_shlibpath_var=no

View File

@ -1,19 +1,15 @@
$OpenBSD: patch-sigsegv_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $ $OpenBSD: patch-sigsegv_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:07 shell Exp $
--- sigsegv/autoconf/ltmain.sh.orig Tue May 18 22:26:51 1999 --- sigsegv/autoconf/ltmain.sh.orig Tue Mar 20 04:52:26 2001
+++ sigsegv/autoconf/ltmain.sh Sat Mar 31 19:59:38 2001 +++ sigsegv/autoconf/ltmain.sh Sat May 26 03:24:13 2001
@@ -507,7 +507,28 @@ if test -z "$show_help"; then @@ -1079,7 +1079,18 @@
deplibs="$deplibs $arg" # These systems don't actually have c library (as such)
continue
;; ;;
- -l*) deplibs="$deplibs $arg" ;;
+ -l*)
+ if test "$arg" = "-lc"; then
+ case "$host" in
+ *-*-openbsd*) + *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r. + # Do not include libc due to us having libc/libc_r.
+ continue + continue
+ ;; + ;;
+ esac esac
+ elif test "$arg" = "-lc_r"; then + elif test "$arg" = "-lc_r"; then
+ case "$host" in + case "$host" in
+ *-*-openbsd*) + *-*-openbsd*)
@ -21,47 +17,48 @@ $OpenBSD: patch-sigsegv_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $
+ continue + continue
+ ;; + ;;
+ esac + esac
+ fi elif test "$arg" = "-lm"; then
+ deplibs="$deplibs $arg" case "$host" in
+ ;; *-*-cygwin* | *-*-beos*)
+ @@ -1091,6 +1102,10 @@
deplibs="$deplibs $arg"
;;
+ -?thread) + -?thread)
+ deplibs="$deplibs $arg" + deplibs="$deplibs $arg"
+ ;; + ;;
+
-no-undefined) -module)
allow_undefined=no module=yes
@@ -1004,7 +1025,15 @@ if test -z "$show_help"; then continue
@@ -1799,9 +1814,12 @@
# Add libc to deplibs on all systems. # rhapsody is a little odd...
dependency_libs="$deplibs" deplibs="$deplibs -framework System"
- deplibs="$deplibs -lc" ;;
+ case "$host_os" in + *-*-openbsd*)
+ openbsd*)
+ # do not include libc due to us having libc/libc_r. + # do not include libc due to us having libc/libc_r.
+ ;; + ;;
+ *) *)
+ # Add libc to deplibs on all other systems. # Add libc to deplibs on all other systems.
- deplibs="$deplibs -lc"
+ deplibs="$deplibs -lc" + deplibs="$deplibs -lc"
+ ;; ;;
+ esac esac
if test "$build_libtool_libs" = yes; then
# Get the real and link names of the library.
@@ -2025,37 +2054,6 @@ libdir='$install_libdir'\
done
fi fi
@@ -3567,40 +3585,6 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
- echo "------------------------------------------------------------------------------" - echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:" - echo "Libraries have been installed in:"
- for libdir in $libdirs; do - for libdir in $libdirs; do
- echo " $libdir" - echo " $libdir"
- done - done
- echo - echo
- echo "To link against installed libraries in a given directory, LIBDIR," - echo "If you ever happen to want to link against installed libraries"
- echo "you must use the \`-LLIBDIR' flag during linking." - echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo - echo "specify the full pathname of the library, or use \`-LLIBDIR'"
- echo " You will also need to do one of the following:" - echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then - if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution" - echo " during execution"
@ -76,13 +73,16 @@ $OpenBSD: patch-sigsegv_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $
- -
- echo " - use the \`$flag' linker flag" - echo " - use the \`$flag' linker flag"
- fi - fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then - if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi - fi
- echo - echo
- echo "See any operating system documentation about shared libraries for" - 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 "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "------------------------------------------------------------------------------" - echo "----------------------------------------------------------------------"
exit 0 exit 0
;; ;;

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2001/03/31 11:51:09 naddy Exp $ @comment $OpenBSD: PLIST,v 1.3 2001/05/25 19:40:07 shell Exp $
bin/clisp bin/clisp
lib/clisp/base/libavcall.a lib/clisp/base/libavcall.a
lib/clisp/base/libcallback.a lib/clisp/base/libcallback.a