pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/lang/sbcl



Module Name:    pkgsrc
Committed By:   rjs
Date:           Mon Aug 10 23:18:52 UTC 2020

Modified Files:
        pkgsrc/lang/sbcl: Makefile distinfo
        pkgsrc/lang/sbcl/patches: patch-ab patch-slam.sh
            patch-src_runtime_run-program.c
Removed Files:
        pkgsrc/lang/sbcl/patches: patch-src_runtime_Config.generic-bsd
            patch-src_runtime_Config.generic-netbsd
            patch-src_runtime_Config.ppc-netbsd
            patch-src_runtime_Config.sparc-netbsd
            patch-src_runtime_Config.x86-64-bsd
            patch-src_runtime_Config.x86-64-netbsd

Log Message:
Update to version 2.0.7.

Allow it to be built with lang/abcl. Remove build dependency on lang/sbcl
if bootstrapping.

Changes since version 1.5.7

New in version 2.0.7

    * minor incompatible change: SB-THREAD:THREAD-OS-TID returns NIL
      for a thread which has exited.
    * minor incompatible change: OPEN no longer calls TRUENAME
      implicitly on a string filespec prior to issuing an open()
      system call.
    * minor incompatible change: PATHNAME is no longer a STRUCTURE-OBJECT.
    * documentation: HASH-FUNCTION is a function
      designator. (#1888028, reported by Jacek Zlydach)
    * bug fix: eliminated a potential garbage-collector deadlock when
      linking with TCMalloc.
    * bug fix: foreign threads (those not made by
      SB-THREAD:MAKE-THREAD) can not crash with a "GC_PENDING, but
      why?" error when returning back from Lisp into the foreign
      caller.
    * bug fix: sb-fasteval crashed trying to install a JIT-compiled
      DEFSTRUCT accessor in a locked package.
    * bug fix: removed misuse of putwc() which caused stdio streams to
      drop characters.
    * bug fix: the "maximum interrupt nesting depth exceeded" error
      generated in the C runtime is significantly less likely to
      occur.
    * bug fix: sb-sprof should no longer segfault from calling
      pthread_kill() on a nonexistent thread.
    * bug fix: a portability issue arising from various build hosts
      (#1886255, reported by Pierre Neidhart)
    * bug fix: spurious compiler warnings from REDUCE with
      :INITIAL-VALUE. (#1885515, reported by Michael South)
    * bug fix: an inconsistency between class hierarchies and the type
      system under some circumstances involving
      redefinition. (#1886397, reported by Atilla Lendvai)
    * bug fix: the USE-VALUE restart for OPEN on non-existent files is
      more likely to function as expected. (#1886587)
    * bug fix: various invalid inputs to ROTATE-BYTE no longer cause
      compiler errors. (#1887164, #1888152)
    * optimization: PPC64 on linux uses the __thread annotation on C
      variables in preference to pthread_setspecific() and
      pthread_getspecific().

New in version 2.0.6

    * planned incompatible change: the defined symbols in the
      Metaobject Protocol, currently accessible from both SB-MOP and
      SB-PCL packages, will in a later release be no longer exported
      from SB-PCL.
    * platform support:
        * better support for dynamic-extent on the SPARC architecture.
        * bug fix for loading very large core files.
        * bug fix for logior and logxor on PPC64.
    * enhancement: EQUALP on structure instances uses code specialized
      to each structure type, inlining comparison of non-pointer
      slots.
    * enhancement: some standard operators, such as
      WITH-OUTPUT-TO-STRING and CHANGE-CLASS, have been adapted to use
      dynamic-extent temporary objects, and so cons less garbage on
      the heap.
    * enhancement: read tables are more space- and speed efficient
    * bug fix: stream conditions with dynamic-extent streams have the
      stream replaced by a stub. (reported by Matt Kaufmann)
    * bug fix: garbage collections triggered from foreign callbacks
      crashed. (#1884403, reported by Andrew Kent)
    * bug fix: compiler failure in compiling MAKE-LIST. (#1881349)
    * bug fix: using the debugger from frames with calls to functions
      with unsupplied optional arguments is less likely to cause heap
      corruption. (#1883745)

New in version 2.0.5

    * platform support:
        * experimental support for ARM32 and ARM64 on OpenBSD
        * better musl libc support. (#1768368, thanks to Eric Timmons)
        * more correct use of futexes on 64-bit Linux. (#1876825,
          reported by Ilya Perminov)
        * restore building on current Solaris. (#1881393, thanks to
          Shawn Ellis)
    * enhancement: CMUCL-style START-BLOCK and END-BLOCK declarations
      are now supported for block compiling forms at a sub-file
      granularity.
    * enhancement: IPv6 support in sb-bsd-sockets is enabled on Windows.
    * minor change: *compile-print* now makes it more clear what block
      compilation is actually doing. The default output is now
      slightly more verbose as a result.
    * bug fix: number keys in EQUALP hash tables are correctly
      hashed. (#1878653, reported by Syll)
    * bug fix: EQness is better preserved given partial sharing of
      list contents in the file compiler. (#1583753, reported by Denis
      Budyak)
    * bug fix: the peephole pass neglected to preserve jump table
      labels. (#1876485)
    * bug fix: fix compiler crash in block compilation merging of
      toplevel lambdas. (#1865336, reported by il71)
    * bug fix: sb-introspect's function-lambda-arglist is better at
      extracting default values of nested macro arguments. (#1876194)
    * bug fix: RESTART-BIND's body is an implicit progn, and so does
      not accept declarations. (#1876303, reported by Michal Herda)
    * optimization: EQUAL hash tables with keys involving
      structure-objects will have fewer systematic collisions.

New in version 2.0.4

    * platform support:
        * 32-bit RISC-V is now fully supported. Unlike other ports,
          its backend is entirely shared with 64-bit RISC-V.
        * native threads are now supported on RISC-V.
        * fix and add some x86-64 vector instructions. (reported by
          Shubhamkar Ayare)
        * improve pointer representation on ppc64 for low-level
          performance improvement.
        * threads are more stable on big-endian ppc64
    * enhancement: forward-referenced type tests can now be open-coded
      by using block compilation. The result is that mutually
      referential defstructs are now efficiently compiled in block
      compilation mode, superseding a lighter mechanism that worked in
      fewer contexts. However, that lighter mechanism has been
      removed, so for now, users who want to efficiently compile
      mutually referential defstructs must explicitly opt-in using
      block compilation.
    * bug fix: defstructs with empty initforms in the sbcl source are
      now explicitly intiialized with NIL, as that is undefined
      behavior under ANSI. This helps cross compilation hosts which do
      not implicitly initialize empty initform slots to NIL. (Thanks
      to Karsten Poeck)
    * bug fix: backtracing through assembly routines now works
      properly on RISC-V.
    * bug fix: ASH no longer gets miscompiled in certain edge cases on RISC-V.
    * bug fix: &MORE args have been slightly optimized and are more
      correct on RISC-V.
    * bug fix: unused local functions with &REST/&KEY/&OPTIONAL now
      also issue a deletion note.
    * bug fix: APPLY on a large list ("large" being in excess of 2k to
      16k items depending on the platform) can no longer crash the
      gencgc collector.
    * bug fix: sb-concurrency FRLOCK algorithm has been corrected. (#1087955)
    * bug fix: block compilation now respects inlining declarations
      better (like CMUCL).
    * optimization: hashing of structures with raw slots for EQUALP
      hash tables has been improved.

New in version 2.0.3

    * incompatible change: the external format now defaults to UTF-8
      and is not affected by LANG. SB-EXT:*DEFAULT-EXTERNAL-FORMAT* is
      now the only way to change it.
    * minor incompatible change: the undocumented :EPHEMERAL argument
      to MAKE-THREAD has been removed.
    * minor incompatible change: DECLARE type testing of structure
      types when the SAFETY optimization quality is less than SPEED
      (but greater than 0) is precise, rather than merely testing that
      an object is a (general) STRUCTURE-OBJECT.
    * platform support
        * respect sunos platform assembler flag handling
        * riscv architecture can be detected during the build
        * enabled the sb-dynamic-core feature on riscv, sparc, and
          made it unconditional everywhere
        * cheneygc is an option for arm and arm64
    * enhancement: the installed sbcl executable tree can be renamed
      or moved without risk of incorrectly referencing a '.core' file
      from an obsolete path. (#666086)
    * optimization: transform (values-list (list one-item)) to (values
      one-item) as multiple items were already recognized.

New in version 2.0.2

    * new feature: CMUCL-style block compilation support has been
      added, allowing whole program optimization. It has been
      documented in a new section of the manual entitled "Advanced
      Compiler Use and Efficiency Hints". In particular, users of
      block compilation will find a large speedup for numerical code,
      as functions which call or return floating point values will
      keep everything unboxed.
    * bug fix: in CHANGE-CLASS, handle non-standard
      slot-value-using-class for :INSTANCE and :CLASS slots
      better. (reported by Shinmera on #sbcl)
    * bug fix: REMHASH in an EQUAL or EQUALP hash-table works
      correctly on a key for which EQUAL (respectively EQUALP) is
      reduced to EQ. (#1865094)
    * bug fix: do not emit a warning for DEFCLASS slots with
      mismatched :TYPE and :INITFORM when the class has a non-standard
      metaclass.
    * bug fix: DISASSEMBLE on SPARC is less likely to spuriously
      annotate code sequences as error traps.

New in version 2.0.1

    * minor incompatible change: some symbols have been removed from
      *FEATURES* based on a determination of which should be
      impermissible to examine via #+ and #- reader macros in
      user-written code.
    * optimization: DEFSTRUCT copiers including COPY-STRUCTURE are
      able to stack-allocate the result when declared dynamic-extent.
    * bug fix: loop analysis code more robust. In particular, loop
      nesting depth is computed more accurately, improving the
      register allocation around loops.

New in version 2.0.0

    * minor incompatible change: heap relocation now works on
      Windows. Since this feature now works on all platforms, it is
      enabled unconditionally and the :RELOCATABLE-HEAP symbol no
      longer appears on *FEATURES* in any builds. (Thanks to Luís
      Borges de Oliveira)
    * enhancement: malformed type specifiers and occurrences of
      deprecated types in :TYPE initargs of DEFCLASS and
      DEFINE-CONDITION slot specifications are detected and result in
      compile-time errors and warnings respectively.
    * enhancement: parallel contrib building, controlled by
      SBCL_MAKE_JOBS=-jX the same as for the C runtime.
    * bug fix: add a walker template for WITH-SOURCE-FORM.
    * bug fix: start the summary of a compilation unit on a fresh
      line. (Thanks to Zach Beane)
    * bug fix: on Windows, PARSE-NATIVE-NAMESTRING produces an
      absolute directory when parsing a bare drive name and
      :AS-DIRECTORY is specified. (Thanks to Luís Borges de Oliveira)
    * bug fix: on RISCV, the runtime is linked with libz if the core
      compression feature is requested. (Thanks to Andreas Schwab)
    * bug fix: ADJOIN using an EQL test and a KEY function only
      transforms into an EQ test if the key function returns values
      for which EQ and EQL are guaranteed to be the same.
    * optimizations:
        * the instruction sequence for multiple-value calls is more
          efficient on x86-64.
        * the direction flag is now unused on x86 and x86-64 when
          handling an unknown number of return values. (Thanks to
          Fanael Linithien)
        * the x86-64 backend is better able to use memory operands for
          arithmetic operations.
        * compilation of TYPECASE to a jump table is enabled when all
          the types being tested are frozen.
        * compilation of CASE and ECASE into a jump table has been
          implemented on 32- and 64-bit powerpc platforms.
        * the implementation of Unicode normalization has been sped up.
        * pretty-printing dispatch on conses is faster, particularly
          with the standard pretty-print dispatch table. Deeply-nested
          forms should also pretty-print faster.

New in version 1.5.9

    * platform support:
        * a message intended to be more helpful will be displayed for
        an mmap failure on OpenBSD.
        * the soft-float ABI on ARM32 is better supported, in
          particular in returning double floats from calls into C.
    * optimizations:
        * CASE and ECASE with symbols as keys may be optimized into a
          vector lookup if all result forms are quoted or
          self-evaluating objects.
        * CASE and ECASE can be optimized into a jump table on the
          x86[-64] backends with arbitrary result forms provided that
          the clause keys are either all fixnums, all characters, or
          all symbols.
        * a number of forms are converted to use CASE in circumstances
          where that makes sense, including calls to POSITION, MEMQ
          and MEMBER, and TYPECASE where the types are MEMBER/EQL
          types.
        * POSITION of a variable symbol in a constant sequence of
          symbols is converted to CASE and thence to a jump table.
        * TYPECASE of a variable where the clauses are member types is
          converted to CASE and thence to a jump table.
        * a number of slow instructions are no longer used on x86 and
          x86-64 machines. (Thanks to Fanael Linithien)
        * the compiler is better at tracking the implications of
          branches after EQ and EQL tests.
        * parsing &KEY lists is slightly less register-intensive.
        * a pattern-based peephole optimizer pass has been added,
          running some simple transformations on the x86-64 backend.
    * enhancements: more thorough compile-time type checking of
      various initforms (defclass, &key, defstruct).
    * bug fix: unions of complicated CONS types are less likely to
      cause an infinite loop. (#1799719)
    * bug fix: DESCRIBE on functions not named by extended function
      designators no longer signals a type error. (#1850531, reported
      by Michal Herda)

New in version 1.5.8

    * platform support:
        * support for Mac OS X Catalina
        * improvements in interoperability with C code compiled with
          memory sanitization options
        * libsbcl.so links to zlib when sb-core-compression is
          enabled. (#1845763, thanks to Juan M. Bello-Rivas)
        * workarounds for BSD issues around mmap() and
          pthread_attr_setstack(). (#1845936) support SSE for bzero if
          available on OpenBSD
    * optimizations:
        * improved type understanding and translations for division
          operators (including TRUNCATE, GCD, LCM).
        * sequential comparisons and branches can elide intermediate
          comparisons. (#1847284)
        * convert EQUAL and EQUALP to EQL if either of the arguments
          is a type for which the structural equality predicate is
          identical to the simpler equality check. (#1848583)
        * internal operators implementing string comparisons produce
          simpler-to-consume values. (#1848776)
    * bug fix: inspecting adjustable arrays and vectors with fill
      pointers works better. (#1846191, reported by Yves Pagani)


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 pkgsrc/lang/sbcl/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/lang/sbcl/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/sbcl/patches/patch-ab
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/sbcl/patches/patch-slam.sh
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.generic-bsd \
    pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.x86-64-bsd \
    pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.x86-64-netbsd
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.generic-netbsd \
    pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.ppc-netbsd \
    pkgsrc/lang/sbcl/patches/patch-src_runtime_Config.sparc-netbsd
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/sbcl/patches/patch-src_runtime_run-program.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/sbcl/Makefile
diff -u pkgsrc/lang/sbcl/Makefile:1.87 pkgsrc/lang/sbcl/Makefile:1.88
--- pkgsrc/lang/sbcl/Makefile:1.87      Fri May 22 13:34:43 2020
+++ pkgsrc/lang/sbcl/Makefile   Mon Aug 10 23:18:51 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.87 2020/05/22 13:34:43 jperkin Exp $
+# $NetBSD: Makefile,v 1.88 2020/08/10 23:18:51 rjs Exp $
 
 DISTNAME=              ${PKGNAME_NOREV}-source
-PKGNAME=               sbcl-1.5.7
-PKGREVISION=           2
+PKGNAME=               sbcl-2.0.7
 CATEGORIES=            lang
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=sbcl/}
 EXTRACT_SUFX=          .tar.bz2
@@ -10,6 +9,7 @@ EXTRACT_SUFX=          .tar.bz2
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.sbcl.org/
 COMMENT=               SBCL, a Common Lisp implementation
+LICENSE=               mit
 
 # SBCL creates a new release with minor updates and fixes every
 # month.  The maintainer of this package does not have the time
@@ -28,7 +28,7 @@ WRKSRC=                       ${WRKDIR}/${PKGNAME_NOREV}
 # Bootstrap section.
 #
 # SBCL needs an existing Common Lisp system to build it...
-# Currently allowed systems are CLISP, CMUCL, OpenMCL, and SBCL itself.
+# Currently allowed systems are CLISP, CMUCL, OpenMCL, ABCL and SBCL itself.
 #
 #  If SBCL is installed in an unusual place when trying to build this
 #  package, you may need to set the full path in SBCL_BOOT_SYSTEM and
@@ -38,6 +38,7 @@ WRKSRC=                       ${WRKDIR}/${PKGNAME_NOREV}
 #SBCL_BOOT_SYSTEM=     "lisp -batch"           # CMUCL
 #SBCL_BOOT_SYSTEM=     "openmcl --batch"       # OpenMCL
 #SBCL_BOOT_SYSTEM=     sbcl                    # SBCL
+#SBCL_BOOT_SYSTEM=     abcl                    # ABCL
 
 .if !defined(SBCL_BOOT_SYSTEM)
 # Use "clisp -ansi -on-error abort" to make the build more reproducible,
@@ -45,12 +46,8 @@ WRKSRC=                      ${WRKDIR}/${PKGNAME_NOREV}
 SBCL_BOOT_SYSTEM=      clisp -norc -ansi -on-error abort
 BUILD_DEPENDS+=                clisp-[0-9]*:../../lang/clisp
 UNLIMIT_RESOURCES=     datasize
-.elif ${SBCL_BOOT_SYSTEM} == clisp
-BUILD_DEPENDS+=                clisp-[0-9]*:../../lang/clisp
-UNLIMIT_RESOURCES=     datasize
-.elif ${SBCL_BOOT_SYSTEM} == sbcl
-# Get bootstrap version:
-BUILD_DEPENDS+=                sbcl-[0-9]*:../../lang/sbcl
+.elif ${SBCL_BOOT_SYSTEM} == abcl
+BUILD_DEPENDS+=                abcl-[0-9]*:../../lang/abcl
 .endif
 
 SUBST_CLASSES+=                        fix-paths

Index: pkgsrc/lang/sbcl/distinfo
diff -u pkgsrc/lang/sbcl/distinfo:1.64 pkgsrc/lang/sbcl/distinfo:1.65
--- pkgsrc/lang/sbcl/distinfo:1.64      Sun Nov 10 16:58:31 2019
+++ pkgsrc/lang/sbcl/distinfo   Mon Aug 10 23:18:51 2020
@@ -1,24 +1,15 @@
-$NetBSD: distinfo,v 1.64 2019/11/10 16:58:31 he Exp $
+$NetBSD: distinfo,v 1.65 2020/08/10 23:18:51 rjs Exp $
 
-SHA1 (sbcl-1.5.7-source.tar.bz2) = b16ff3a0c0638bb685ff5f93106553c03a68d978
-RMD160 (sbcl-1.5.7-source.tar.bz2) = 850176b451d83daf52e7b0d2f6095015c5122494
-SHA512 (sbcl-1.5.7-source.tar.bz2) = 8dde1b0d400f93fed085f6b6c33b057c3dec4dfa83afb7431384add6628cb2f910cba006b2579cea547685aeb79fade5ad576b0a42e4f7e1f6c0c3f26acf226e
-Size (sbcl-1.5.7-source.tar.bz2) = 6438048 bytes
-SHA1 (patch-ab) = b087921f7317523fd78396518dfd2cb1c8e6d5f9
+SHA1 (sbcl-2.0.7-source.tar.bz2) = 28d34996f7ed432a7fcff027954017a14b2ed56b
+RMD160 (sbcl-2.0.7-source.tar.bz2) = ef51efc09a7aced7d7397b7ab7a7d32bbc8cd0aa
+SHA512 (sbcl-2.0.7-source.tar.bz2) = 02f39a2d643e2aebfe0e96611a9bca7cd859ff8a64d0e552cb4e39697a72a69fc51eacf40388bb49d64d851ea4005f9098100e490001d028844d0e2adc3b1490
+Size (sbcl-2.0.7-source.tar.bz2) = 6622306 bytes
+SHA1 (patch-ab) = b272bee6fc39ede638cbf71106150044a2977596
 SHA1 (patch-clean.sh) = 8dd795727c2e2cba2c4b5ca8cc4972c89eb6ecaa
 SHA1 (patch-make-genesis-2.sh) = 5d61f2662795c93aabfaa18ef686725d2ed9384a
 SHA1 (patch-make-host-1.sh) = 7ecb23bf3cd4ee091a279503668a539a533b1196
 SHA1 (patch-make-host-2.sh) = c0ac2f16a670a6db2ff69b863d1f990f7ba0bef0
 SHA1 (patch-make-target-1.sh) = 9064623b0cba2fc6869f3d29ea090d55b7bdaf17
 SHA1 (patch-make-target-2.sh) = 7b288c3c320adb89cefa78a2fc93223ea4b3b66f
-SHA1 (patch-slam.sh) = 3edb599272f8f4827b0f5edc5a67d134856ca269
-SHA1 (patch-src_runtime_Config.arm-netbsd) = d9ff13f8a6a3909a9ab9f357abde455adee0b645
-SHA1 (patch-src_runtime_Config.generic-bsd) = bafc489a5cb8096e3dd3d3677a83c2907441e8b7
-SHA1 (patch-src_runtime_Config.generic-netbsd) = 8c18ef7660e40851094b0bd6308638b844709fa2
-SHA1 (patch-src_runtime_Config.ppc-netbsd) = 3ecc105ad817badd3a8d0dc44aa0d801714b4917
-SHA1 (patch-src_runtime_Config.sparc-netbsd) = d1825a9b937c5a768b38c267c1924322a83eecdf
-SHA1 (patch-src_runtime_Config.x86-64-bsd) = 4588e0be197de4c4b9f3ef2d449a9a7bf9c38d8d
-SHA1 (patch-src_runtime_Config.x86-64-netbsd) = 79d14015db51f61226b9e848d27f90e2538a84af
-SHA1 (patch-src_runtime_Config.x86-netbsd) = 3875d12349408231d47e55c9d9bb4e77f2709790
-SHA1 (patch-src_runtime_config.arm-bsd) = 1e8f58e93fc276cb4897d19a8b0411457520326e
-SHA1 (patch-src_runtime_run-program.c) = bae41ea7509c70d0c4a0c01097a7a77d1cbd6bf8
+SHA1 (patch-slam.sh) = 2f4d28b2d1572cd624a54f493cc7e30c3c491a3f
+SHA1 (patch-src_runtime_run-program.c) = 8520dc915051747f3ce4fbe30c4672ddbb68c49d

Index: pkgsrc/lang/sbcl/patches/patch-ab
diff -u pkgsrc/lang/sbcl/patches/patch-ab:1.7 pkgsrc/lang/sbcl/patches/patch-ab:1.8
--- pkgsrc/lang/sbcl/patches/patch-ab:1.7       Wed Oct 12 11:35:48 2016
+++ pkgsrc/lang/sbcl/patches/patch-ab   Mon Aug 10 23:18:52 2020
@@ -1,24 +1,26 @@
-$NetBSD: patch-ab,v 1.7 2016/10/12 11:35:48 asau Exp $
+$NetBSD: patch-ab,v 1.8 2020/08/10 23:18:52 rjs Exp $
 
 Honor PREFIX.
 
---- doc/sbcl.1.orig    2016-04-28 14:23:40.000000000 +0000
+--- doc/sbcl.1.orig    2020-07-30 19:30:02.000000000 +0000
 +++ doc/sbcl.1
-@@ -427,7 +427,7 @@ years. See the CREDITS file in the distr
- This variable controls where files like "sbclrc", "sbcl.core", and the
- add-on "contrib" systems are searched for.  If it is not set, then
- sbcl sets it from a compile-time default location which is usually
--\fB/usr/local/lib/sbcl/\fR but may have been changed \fIe.g.\fR by a third-party
-+\fB@PREFIX@/lib/sbcl/\fR but may have been changed \fIe.g.\fR by a third-party
- packager.
+@@ -423,8 +423,8 @@ This variable controls where files like 
+ add-on "contrib" systems are searched for. If it is not set, then sbcl
+ looks in \fB../lib/sbcl/\fR relative to the location of the executable,
+ or in the current directory. If your executable is in the default
+-location \fB/usr/local/bin/\fR then it will look in
+-\fB/usr/local/lib/sbcl/\fR.
++location \fB/usr/@PREFIX@/bin/\fR then it will look in
++\fB/usr/@PREFIX@/lib/sbcl/\fR.
  
  .SH FILES
-@@ -461,7 +461,7 @@ been installed, the command
+ 
+@@ -457,7 +457,7 @@ been installed, the command
  should give you access to the complete manual. Depending on your
  installation it may also be available in HTML and PDF formats in \fIe.g.\fR
  .IP
 -.B /usr/local/share/doc/sbcl/
-+.B @PREFIX@/share/doc/sbcl/
++.B /usr/@PREFIX@/share/doc/sbcl/
  .PP
  See the SBCL homepage 
  .IP

Index: pkgsrc/lang/sbcl/patches/patch-slam.sh
diff -u pkgsrc/lang/sbcl/patches/patch-slam.sh:1.1 pkgsrc/lang/sbcl/patches/patch-slam.sh:1.2
--- pkgsrc/lang/sbcl/patches/patch-slam.sh:1.1  Sat Aug 31 20:20:42 2019
+++ pkgsrc/lang/sbcl/patches/patch-slam.sh      Mon Aug 10 23:18:52 2020
@@ -1,13 +1,13 @@
-$NetBSD: patch-slam.sh,v 1.1 2019/08/31 20:20:42 rjs Exp $
+$NetBSD: patch-slam.sh,v 1.2 2020/08/10 23:18:52 rjs Exp $
 
---- slam.sh.orig       2019-08-31 19:24:57.719485821 +0000
+--- slam.sh.orig       2020-07-30 19:30:02.000000000 +0000
 +++ slam.sh
 @@ -65,7 +65,7 @@ set -e
  #######################################################################
  
  warm_option=""
--if [ "$1" == --load ]; then
-+if [ "$1" = "--load" ]; then
-     warm_option="--load"
+-if [ "$1" == --load -o "$1" == --load-with-sb-devel ]; then
++if [ "$1" = --load -o "$1" = --load-with-sb-devel ]; then
+     warm_option="$1"
      shift
  fi

Index: pkgsrc/lang/sbcl/patches/patch-src_runtime_run-program.c
diff -u pkgsrc/lang/sbcl/patches/patch-src_runtime_run-program.c:1.2 pkgsrc/lang/sbcl/patches/patch-src_runtime_run-program.c:1.3
--- pkgsrc/lang/sbcl/patches/patch-src_runtime_run-program.c:1.2        Fri Nov  8 09:53:43 2019
+++ pkgsrc/lang/sbcl/patches/patch-src_runtime_run-program.c    Mon Aug 10 23:18:52 2020
@@ -1,20 +1,20 @@
-$NetBSD: patch-src_runtime_run-program.c,v 1.2 2019/11/08 09:53:43 he Exp $
+$NetBSD: patch-src_runtime_run-program.c,v 1.3 2020/08/10 23:18:52 rjs Exp $
 
 Try to avoid doing the "open /dev/tty, TIOCNOTTY" dance.
 Instead, do as on OpenBSD.
 
---- src/runtime/run-program.c.orig     2019-10-11 11:45:06.733855374 +0000
+--- src/runtime/run-program.c.orig     2020-07-30 19:30:03.000000000 +0000
 +++ src/runtime/run-program.c
-@@ -30,7 +30,7 @@
- #include <termios.h>
- #include <errno.h>
+@@ -29,7 +29,7 @@
+ #include <dirent.h>
+ #include "interr.h" // for lose()
  
 -#ifdef LISP_FEATURE_OPENBSD
 +#if defined(LISP_FEATURE_OPENBSD) || defined(LISP_FEATURE_NETBSD)
  #include <util.h>
  #endif
  
-@@ -58,7 +58,7 @@ int set_noecho(int fd)
+@@ -57,7 +57,7 @@ int set_noecho(int fd)
      return 1;
  }
  
@@ -23,7 +23,7 @@ Instead, do as on OpenBSD.
  
  int
  set_pty(char *pty_name)
-@@ -71,7 +71,7 @@ set_pty(char *pty_name)
+@@ -70,7 +70,7 @@ set_pty(char *pty_name)
      return (set_noecho(STDIN_FILENO));
  }
  
@@ -32,16 +32,16 @@ Instead, do as on OpenBSD.
  
  int
  set_pty(char *pty_name)
-@@ -95,7 +95,7 @@ set_pty(char *pty_name)
+@@ -94,7 +94,7 @@ set_pty(char *pty_name)
      return (0);
  }
  
 -#endif /* !LISP_FEATURE_OPENBSD */
 +#endif /* !LISP_FEATURE_OPENBSD && !LISP_FEATURE_NETBSD */
  
- int wait_for_exec(int pid, int channel[2]) {
-     if ((-1 != pid) && (-1 != channel[1])) {
-@@ -164,7 +164,8 @@ int spawn(char *program, char *argv[], i
+ void closefrom_fallback(int lowfd)
+ {
+@@ -220,7 +220,8 @@ int spawn(char *program, char *argv[], i
       * share stdin with our parent. In the latter case we claim
       * control of the terminal. */
      if (sin >= 0) {



Home | Main Index | Thread Index | Old Index