From 17518d6c854820be0d5cb2795d5429be620dcd53 Mon Sep 17 00:00:00 2001 From: shell Date: Fri, 25 May 2001 19:40:05 +0000 Subject: [PATCH] - Upgrade to 2.26 - Regen patches --- lang/clisp/Makefile | 6 +- lang/clisp/files/md5 | 6 +- .../patches/patch-ffcall_autoconf_ltconfig | 33 +++---- .../patches/patch-ffcall_autoconf_ltmain_sh | 74 +++++---------- .../patches/patch-libiconv_autoconf_ltconfig | 32 +++---- .../patches/patch-libiconv_autoconf_ltmain_sh | 27 +++--- ...atch-libiconv_libcharset_autoconf_ltconfig | 28 +++--- ...tch-libiconv_libcharset_autoconf_ltmain_sh | 23 ++--- .../patches/patch-sigsegv_autoconf_ltconfig | 33 +++---- .../patches/patch-sigsegv_autoconf_ltmain_sh | 94 +++++++++---------- lang/clisp/pkg/PLIST | 2 +- 11 files changed, 155 insertions(+), 203 deletions(-) diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index 037229ab68d..3ed91eb4689 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -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 $ 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 NEED_VERSION= 1.378 HOMEPAGE= http://clisp.cons.org/ diff --git a/lang/clisp/files/md5 b/lang/clisp/files/md5 index 45ee3884e86..18729e781ec 100644 --- a/lang/clisp/files/md5 +++ b/lang/clisp/files/md5 @@ -1,3 +1,3 @@ -MD5 (clisp-2.25.tar.bz2) = ee23622c2e9c645a3a15c334b109510c -RMD160 (clisp-2.25.tar.bz2) = 7fe40c13fea51791f542cc65e4f7fbec3ddfd2d5 -SHA1 (clisp-2.25.tar.bz2) = 20ab00b6036e4c07f6a3d58b2477ab606ff34bcf +MD5 (clisp-2.26.tar.bz2) = c933df9f6b22ea09f27221a3a58de90b +RMD160 (clisp-2.26.tar.bz2) = 514d0a839fd1829a9a995781ddcce5fe2a9b770c +SHA1 (clisp-2.26.tar.bz2) = 69d2423ed72f8363cd85ae4c06e9a63800e9d7d9 diff --git a/lang/clisp/patches/patch-ffcall_autoconf_ltconfig b/lang/clisp/patches/patch-ffcall_autoconf_ltconfig index 52332a9a117..50476eeb5ef 100644 --- a/lang/clisp/patches/patch-ffcall_autoconf_ltconfig +++ b/lang/clisp/patches/patch-ffcall_autoconf_ltconfig @@ -1,34 +1,25 @@ -$OpenBSD: patch-ffcall_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09 naddy Exp $ ---- ffcall/autoconf/ltconfig.orig Tue Jul 4 14:05:20 2000 -+++ ffcall/autoconf/ltconfig Sat Mar 31 19:58:00 2001 -@@ -703,7 +703,7 @@ hardcode_shlibpath_var=unsupported - 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: patch-ffcall_autoconf_ltconfig,v 1.2 2001/05/25 19:40:06 shell Exp $ +--- ffcall/autoconf/ltconfig.orig Fri May 25 13:02:38 2001 ++++ ffcall/autoconf/ltconfig Fri May 25 13:04:03 2001 +@@ -1396,10 +1396,21 @@ ;; openbsd*) -- archive_cmds='$LD -Bshareable -o $lib$libobjs' +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' - hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no + case "$host_os" in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds='$LD -Bshareable -o $lib$libobjs' -+ hardcode_libdir_flag_spec='-R$libdir' ++ archive_cmds='$LD -Bshareable -o $lib$libobjs' ++ hardcode_libdir_flag_spec='-R$libdir' + ;; + *) -+ archive_cmds='$CC -shared $pic_flag -o $lib$libobjs' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi ++ archive_cmds='$CC -shared $pic_flag -o $lib$libobjs' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then ++ export_dynamic_flag_spec='${wl}-E' ++ fi + ;; + esac ;; diff --git a/lang/clisp/patches/patch-ffcall_autoconf_ltmain_sh b/lang/clisp/patches/patch-ffcall_autoconf_ltmain_sh index f26f630f17d..213905edec4 100644 --- a/lang/clisp/patches/patch-ffcall_autoconf_ltmain_sh +++ b/lang/clisp/patches/patch-ffcall_autoconf_ltmain_sh @@ -1,19 +1,10 @@ -$OpenBSD: patch-ffcall_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $ ---- ffcall/autoconf/ltmain.sh.orig Tue Jun 1 00:08:00 1999 -+++ ffcall/autoconf/ltmain.sh Sat Mar 31 19:58:27 2001 -@@ -507,7 +507,28 @@ if test -z "$show_help"; then - deplibs="$deplibs $arg" - ;; - -- -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 +$OpenBSD: patch-ffcall_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:06 shell Exp $ +--- ffcall/autoconf/ltmain.sh.orig Fri May 25 13:05:26 2001 ++++ ffcall/autoconf/ltmain.sh Sat May 26 01:06:23 2001 +@@ -1080,6 +1080,13 @@ + continue + ;; + esac + elif test "$arg" = "-lc_r"; then + case "$host" in + *-*-openbsd*) @@ -21,47 +12,23 @@ $OpenBSD: patch-ffcall_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $ + continue + ;; + esac -+ fi -+ deplibs="$deplibs $arg" -+ ;; -+ -+ -?thread) -+ deplibs="$deplibs $arg" -+ ;; + elif test "$arg" = "-lm"; then + case "$host" in + *-*-cygwin* | *-*-beos*) +@@ -3567,40 +3574,6 @@ + # Exit here if they wanted silent mode. + test "$show" = : && exit 0 - -no-undefined) - 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 "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - echo " $libdir" - done - echo -- echo "To link against installed libraries in a given directory, LIBDIR," -- echo "you must use the \`-LLIBDIR' flag during linking." -- echo -- echo " You will also need to do one of the following:" +- 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 \`-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" @@ -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" - 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 "------------------------------------------------------------------------------" +- echo "----------------------------------------------------------------------" exit 0 ;; diff --git a/lang/clisp/patches/patch-libiconv_autoconf_ltconfig b/lang/clisp/patches/patch-libiconv_autoconf_ltconfig index cc6aac9b672..3c00f33a7eb 100644 --- a/lang/clisp/patches/patch-libiconv_autoconf_ltconfig +++ b/lang/clisp/patches/patch-libiconv_autoconf_ltconfig @@ -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 13:52:17 2001 -+++ libiconv/autoconf/ltconfig Sat Mar 31 20:01:41 2001 -@@ -1099,6 +1099,9 @@ cygwin* | mingw*) +--- libiconv/autoconf/ltconfig.orig Mon Feb 26 20:54:30 2001 ++++ libiconv/autoconf/ltconfig Sat May 26 01:53:24 2001 +@@ -1099,7 +1099,9 @@ with_gnu_ld=no fi ;; +- +openbsd*) -+ with_gnu_ld=no ++ with_gnu_ld=no + ;; - esac -@@ -1396,10 +1399,21 @@ else + ld_shlibs=yes +@@ -1396,10 +1398,21 @@ ;; openbsd*) @@ -21,21 +21,21 @@ $OpenBSD: patch-libiconv_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09 naddy Exp $ hardcode_shlibpath_var=no + case "$host_os" in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='-R$libdir' ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='-R$libdir' + ;; -+ *) -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then ++ export_dynamic_flag_spec='${wl}-E' ++ fi + ;; + esac ;; os2*) -@@ -2016,13 +2030,10 @@ netbsd*) +@@ -2016,13 +2029,10 @@ openbsd*) version_type=sunos diff --git a/lang/clisp/patches/patch-libiconv_autoconf_ltmain_sh b/lang/clisp/patches/patch-libiconv_autoconf_ltmain_sh index c9a843a1ef9..92e6a63dcc5 100644 --- a/lang/clisp/patches/patch-libiconv_autoconf_ltmain_sh +++ b/lang/clisp/patches/patch-libiconv_autoconf_ltmain_sh @@ -1,14 +1,13 @@ -$OpenBSD: patch-libiconv_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $ ---- libiconv/autoconf/ltmain.sh.orig Wed Feb 21 15:13:29 2001 -+++ libiconv/autoconf/ltmain.sh Sat Mar 31 20:01:53 2001 -@@ -1079,7 +1079,18 @@ compiler." +$OpenBSD: patch-libiconv_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:06 shell Exp $ +--- libiconv/autoconf/ltmain.sh.orig Sat May 26 01:03:04 2001 ++++ libiconv/autoconf/ltmain.sh Sat May 26 01:05:22 2001 +@@ -1079,7 +1079,17 @@ # These systems don't actually have c library (as such) continue ;; -+ *-*-openbsd*) -+ # Do not include libc due to us having libc/libc_r. -+ continue -+ ;; ++ *-*-openbsd*) ++ continue ++ ;; esac + elif test "$arg" = "-lc_r"; then + case "$host" in @@ -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 case "$host" in *-*-cygwin* | *-*-beos*) -@@ -1091,6 +1102,10 @@ compiler." +@@ -1091,6 +1101,10 @@ deplibs="$deplibs $arg" ;; @@ -31,17 +30,17 @@ $OpenBSD: patch-libiconv_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp -module) module=yes continue -@@ -1799,6 +1814,9 @@ compiler." +@@ -1799,6 +1813,9 @@ # rhapsody is a little odd... deplibs="$deplibs -framework System" ;; -+ *-*-openbsd*) -+ # do not include libc due to us having libc/libc_r. -+ ;; ++ *-*-openbsd*) ++ # do not include libc due to us having libc/libc_r. ++ ;; *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" -@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\ +@@ -3567,40 +3584,6 @@ # Exit here if they wanted silent mode. test "$show" = : && exit 0 diff --git a/lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltconfig b/lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltconfig index adb6223197c..81a91899881 100644 --- a/lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltconfig +++ b/lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltconfig @@ -1,7 +1,7 @@ -$OpenBSD: patch-libiconv_libcharset_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09 naddy Exp $ ---- libiconv/libcharset/autoconf/ltconfig.orig Mon Feb 26 13:49:31 2001 -+++ libiconv/libcharset/autoconf/ltconfig Sat Mar 31 20:02:19 2001 -@@ -1105,6 +1105,9 @@ cygwin* | mingw*) +$OpenBSD: patch-libiconv_libcharset_autoconf_ltconfig,v 1.2 2001/05/25 19:40:06 shell Exp $ +--- libiconv/libcharset/autoconf/ltconfig.orig Sat May 26 01:07:07 2001 ++++ libiconv/libcharset/autoconf/ltconfig Sat May 26 01:08:10 2001 +@@ -1105,6 +1105,9 @@ with_gnu_ld=no fi ;; @@ -11,7 +11,7 @@ $OpenBSD: patch-libiconv_libcharset_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09 esac -@@ -1402,10 +1405,21 @@ else +@@ -1402,10 +1405,21 @@ ;; openbsd*) @@ -21,21 +21,21 @@ $OpenBSD: patch-libiconv_libcharset_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09 hardcode_shlibpath_var=no + case "$host_os" in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='-R$libdir' ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='-R$libdir' + ;; -+ *) -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then ++ export_dynamic_flag_spec='${wl}-E' ++ fi + ;; + esac ;; os2*) -@@ -2021,13 +2035,10 @@ netbsd*) +@@ -2021,13 +2035,10 @@ openbsd*) version_type=sunos diff --git a/lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltmain_sh b/lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltmain_sh index 602fa91e6ac..f8e1e41f4ce 100644 --- a/lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltmain_sh +++ b/lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltmain_sh @@ -1,15 +1,16 @@ -$OpenBSD: patch-libiconv_libcharset_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $ ---- libiconv/libcharset/autoconf/ltmain.sh.orig Wed Feb 21 15:09:19 2001 -+++ libiconv/libcharset/autoconf/ltmain.sh Sat Mar 31 20:02:13 2001 -@@ -1079,7 +1079,18 @@ compiler." +$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 22:13:49 2001 ++++ libiconv/libcharset/autoconf/ltmain.sh Sat May 26 02:17:25 2001 +@@ -1079,7 +1079,18 @@ # These systems don't actually have c library (as such) continue ;; +- esac + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. + continue + ;; - esac ++ esac + elif test "$arg" = "-lc_r"; then + case "$host" in + *-*-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 case "$host" in *-*-cygwin* | *-*-beos*) -@@ -1091,6 +1102,10 @@ compiler." +@@ -1091,6 +1102,10 @@ deplibs="$deplibs $arg" ;; @@ -31,17 +32,17 @@ $OpenBSD: patch-libiconv_libcharset_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 -module) module=yes continue -@@ -1799,6 +1814,9 @@ compiler." +@@ -1799,6 +1814,9 @@ # rhapsody is a little odd... deplibs="$deplibs -framework System" ;; -+ *-*-openbsd*) -+ # do not include libc due to us having libc/libc_r. -+ ;; ++ *-*-openbsd*) ++ # do not include libc due to us having libc/libc_r. ++ ;; *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" -@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\ +@@ -3567,40 +3585,6 @@ # Exit here if they wanted silent mode. test "$show" = : && exit 0 diff --git a/lang/clisp/patches/patch-sigsegv_autoconf_ltconfig b/lang/clisp/patches/patch-sigsegv_autoconf_ltconfig index 30641a1dca0..58dc7414a08 100644 --- a/lang/clisp/patches/patch-sigsegv_autoconf_ltconfig +++ b/lang/clisp/patches/patch-sigsegv_autoconf_ltconfig @@ -1,34 +1,25 @@ -$OpenBSD: patch-sigsegv_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09 naddy Exp $ ---- sigsegv/autoconf/ltconfig.orig Tue Jul 4 14:05:20 2000 -+++ sigsegv/autoconf/ltconfig Sat Mar 31 19:59:32 2001 -@@ -703,7 +703,7 @@ hardcode_shlibpath_var=unsupported - 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: patch-sigsegv_autoconf_ltconfig,v 1.2 2001/05/25 19:40:06 shell Exp $ +--- sigsegv/autoconf/ltconfig.orig Sat May 26 01:10:53 2001 ++++ sigsegv/autoconf/ltconfig Sat May 26 01:12:20 2001 +@@ -1396,10 +1396,21 @@ ;; openbsd*) -- archive_cmds='$LD -Bshareable -o $lib$libobjs' +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' - hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no + case "$host_os" in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds='$LD -Bshareable -o $lib$libobjs' -+ hardcode_libdir_flag_spec='-R$libdir' ++ archive_cmds='$LD -Bshareable -o $lib$libobjs' ++ hardcode_libdir_flag_spec='-R$libdir' + ;; + *) -+ archive_cmds='$CC -shared $pic_flag -o $lib$libobjs' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi ++ archive_cmds='$CC -shared $pic_flag -o $lib$libobjs' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then ++ export_dynamic_flag_spec='${wl}-E' ++ fi + ;; + esac ;; diff --git a/lang/clisp/patches/patch-sigsegv_autoconf_ltmain_sh b/lang/clisp/patches/patch-sigsegv_autoconf_ltmain_sh index 6180a58f2de..52fce2b3969 100644 --- a/lang/clisp/patches/patch-sigsegv_autoconf_ltmain_sh +++ b/lang/clisp/patches/patch-sigsegv_autoconf_ltmain_sh @@ -1,19 +1,15 @@ -$OpenBSD: patch-sigsegv_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $ ---- sigsegv/autoconf/ltmain.sh.orig Tue May 18 22:26:51 1999 -+++ sigsegv/autoconf/ltmain.sh Sat Mar 31 19:59:38 2001 -@@ -507,7 +507,28 @@ if test -z "$show_help"; then - deplibs="$deplibs $arg" - ;; - -- -l*) deplibs="$deplibs $arg" ;; -+ -l*) -+ if test "$arg" = "-lc"; then -+ case "$host" in +$OpenBSD: patch-sigsegv_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:07 shell Exp $ +--- sigsegv/autoconf/ltmain.sh.orig Tue Mar 20 04:52:26 2001 ++++ sigsegv/autoconf/ltmain.sh Sat May 26 03:24:13 2001 +@@ -1079,7 +1079,18 @@ + # These systems don't actually have c library (as such) + continue + ;; + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. + continue + ;; -+ esac + esac + elif test "$arg" = "-lc_r"; then + case "$host" in + *-*-openbsd*) @@ -21,47 +17,48 @@ $OpenBSD: patch-sigsegv_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $ + continue + ;; + esac -+ fi -+ deplibs="$deplibs $arg" -+ ;; -+ + elif test "$arg" = "-lm"; then + case "$host" in + *-*-cygwin* | *-*-beos*) +@@ -1091,6 +1102,10 @@ + deplibs="$deplibs $arg" + ;; + + -?thread) -+ deplibs="$deplibs $arg" -+ ;; ++ deplibs="$deplibs $arg" ++ ;; ++ + -module) + module=yes + continue +@@ -1799,9 +1814,12 @@ + # rhapsody is a little odd... + deplibs="$deplibs -framework System" + ;; ++ *-*-openbsd*) ++ # do not include libc due to us having libc/libc_r. ++ ;; + *) + # Add libc to deplibs on all other systems. +- deplibs="$deplibs -lc" ++ deplibs="$deplibs -lc" + ;; + esac + fi +@@ -3567,40 +3585,6 @@ + # Exit here if they wanted silent mode. + test "$show" = : && exit 0 - -no-undefined) - 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 "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - echo " $libdir" - done - echo -- echo "To link against installed libraries in a given directory, LIBDIR," -- echo "you must use the \`-LLIBDIR' flag during linking." -- echo -- echo " You will also need to do one of the following:" +- 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 \`-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" @@ -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" - 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 "------------------------------------------------------------------------------" +- echo "----------------------------------------------------------------------" exit 0 ;; diff --git a/lang/clisp/pkg/PLIST b/lang/clisp/pkg/PLIST index 4f6191d5fa0..04029e5c2f6 100644 --- a/lang/clisp/pkg/PLIST +++ b/lang/clisp/pkg/PLIST @@ -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 lib/clisp/base/libavcall.a lib/clisp/base/libcallback.a