From: Matt Birkholz Date: Wed, 7 Aug 2019 20:25:26 +0000 (-0700) Subject: Merge branch 'master' into pucked. X-Git-Tag: mit-scheme-pucked-10.1.20~17 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=5c55e0c9f249bbbbb2bf170970ef4f14134b72db;p=mit-scheme.git Merge branch 'master' into pucked. --- 5c55e0c9f249bbbbb2bf170970ef4f14134b72db diff --cc src/blowfish/NEWS index 8e51e1e3c,dacbfcf50..b9c4d34d5 --- a/src/blowfish/NEWS +++ b/src/blowfish/NEWS @@@ -1,10 -1,4 +1,9 @@@ -mit-scheme-blowfish NEWS -- history of user-visible changes. +mit-scheme-pucked-blowfish NEWS -- history of user-visible changes. + +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of a blowfish plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of a blowfish plugin for MIT/GNU Scheme Pucked. Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, diff --cc src/blowfish/configure.ac index 3330fccef,9ad8f1ab7..c0af020ef --- a/src/blowfish/configure.ac +++ b/src/blowfish/configure.ac @@@ -10,13 -10,7 +10,12 @@@ AC_CONFIG_HEADERS([config.h] AC_CONFIG_MACRO_DIR([m4]) AC_COPYRIGHT( -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of a blowfish plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of a blowfish plugin for MIT/GNU Scheme Pucked. + +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Massachusetts Institute of Technology @@@ -39,12 -35,6 +38,11 @@@ USA AH_TOP([/* +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of a blowfish plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of a blowfish plugin for MIT/GNU Scheme Pucked. + Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, diff --cc src/edwin/NEWS index db5ec8f64,bd1d1254a..76691092c --- a/src/edwin/NEWS +++ b/src/edwin/NEWS @@@ -1,10 -1,4 +1,9 @@@ -mit-scheme-edwin NEWS -- history of user-visible changes. +mit-scheme-pucked-edwin NEWS -- history of user-visible changes. + +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of an Edwin plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of an Edwin plugin for MIT/GNU Scheme Pucked. Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, diff --cc src/edwin/configure.ac index 47cdb516d,838d22700..313766b48 --- a/src/edwin/configure.ac +++ b/src/edwin/configure.ac @@@ -7,13 -7,7 +7,12 @@@ AC_INIT([MIT/GNU Scheme Pucked edwin pl AC_CONFIG_SRCDIR([edwin.pkg]) AC_COPYRIGHT( -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of an Edwin plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of an Edwin plugin for MIT/GNU Scheme Pucked. + +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Massachusetts Institute of Technology diff --cc src/gdbm/NEWS index fefdbfe9b,44d8c202e..49472008d --- a/src/gdbm/NEWS +++ b/src/gdbm/NEWS @@@ -1,10 -1,4 +1,9 @@@ -mit-scheme-gdbm NEWS -- history of user-visible changes. +mit-scheme-pucked-gdbm NEWS -- history of user-visible changes. + +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of a gdbm plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of a gdbm plugin for MIT/GNU Scheme Pucked. Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, diff --cc src/gdbm/configure.ac index 04d98700b,22bc4a9b2..6a10e3fd3 --- a/src/gdbm/configure.ac +++ b/src/gdbm/configure.ac @@@ -9,13 -9,7 +9,12 @@@ AC_CONFIG_SRCDIR([gdbm.pkg] AC_CONFIG_MACRO_DIR([m4]) AC_COPYRIGHT( -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of a gdbm plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of a gdbm plugin for MIT/GNU Scheme Pucked. + +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Massachusetts Institute of Technology diff --cc src/imail/NEWS index 0d6dfda6e,63db3b323..288f2a101 --- a/src/imail/NEWS +++ b/src/imail/NEWS @@@ -1,10 -1,4 +1,9 @@@ -mit-scheme-imail NEWS -- history of user-visible changes. +mit-scheme-pucked-imail NEWS -- history of user-visible changes. + +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of an Imail plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of an Imail plugin for MIT/GNU Scheme Pucked. Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, diff --cc src/imail/configure.ac index 159f854b9,b89ca6426..de82e5926 --- a/src/imail/configure.ac +++ b/src/imail/configure.ac @@@ -7,13 -7,7 +7,12 @@@ AC_INIT([MIT/GNU Scheme Pucked imail pl AC_CONFIG_SRCDIR([imail.pkg]) AC_COPYRIGHT( -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of an Imail plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of an Imail plugin for MIT/GNU Scheme Pucked. + +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Massachusetts Institute of Technology @@@ -53,12 -41,16 +52,13 @@@ if test x"${MIT_SCHEME_LIBDIR}" = x; th echo " (system-library-directory-pathname)))" ) \ | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi - if test x"${MIT_SCHEME_PKD}" = x; then - os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` - MIT_SCHEME_PKD="imail-${os_suffix}.pkd" + if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then + MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi + MIT_SCHEME_PKD="imail-${MIT_SCHEME_OS_SUFFIX}.pkd" + -# Install plugin docs in Scheme's docdir. -docdir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)' - AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_SCHEME_TOOLCHAIN_EXE]) AC_SUBST([MIT_SCHEME_LIBDIR]) diff --cc src/mcrypt/NEWS index 84c4beabc,26f7d4549..2a5c130dc --- a/src/mcrypt/NEWS +++ b/src/mcrypt/NEWS @@@ -1,10 -1,4 +1,9 @@@ -mit-scheme-mcrypt NEWS -- history of user-visible changes. +mit-scheme-pucked-mcrypt NEWS -- history of user-visible changes. + +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of an mcrypt plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of an mcrypt plugin for MIT/GNU Scheme Pucked. Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, diff --cc src/mcrypt/configure.ac index 3ee1ae8e2,3c2c3ee5d..a759a14a9 --- a/src/mcrypt/configure.ac +++ b/src/mcrypt/configure.ac @@@ -10,13 -10,7 +10,12 @@@ AC_CONFIG_HEADERS([config.h] AC_CONFIG_MACRO_DIR([m4]) AC_COPYRIGHT( -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of an mcrypt plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of an mcrypt plugin for MIT/GNU Scheme Pucked. + +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Massachusetts Institute of Technology @@@ -39,12 -35,6 +38,11 @@@ USA AH_TOP([/* +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of an mcrypt plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of an mcrypt plugin for MIT/GNU Scheme Pucked. + Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, diff --cc src/mcrypt/make.scm index 6a2baa193,4a0a47253..898ac1d27 --- a/src/mcrypt/make.scm +++ b/src/mcrypt/make.scm @@@ -6,7 -6,4 +6,4 @@@ (lambda () (load-package-set "mcrypt"))) - (add-subsystem-identification! "mcrypt" '(1 0 5)) - - (if (name->package '(runtime crypto)) - ((access mcrypt-link! (->environment '(runtime crypto))))) -(add-subsystem-identification! "Mcrypt" '(0 2)) ++(add-subsystem-identification! "Mcrypt" '(1 0 5)) diff --cc src/pgsql/compile.scm index 32e7bc73c,f26bd7568..6107d6bd2 --- a/src/pgsql/compile.scm +++ b/src/pgsql/compile.scm @@@ -1,9 -1,12 +1,9 @@@ #| -*-Scheme-*- |# - ;;;; Compile the PGSQL option. + ;;;; Compile the PostgreSQL option. -(load-option 'cref) -(with-working-directory-pathname (directory-pathname (current-load-pathname)) - (lambda () - (with-working-directory-pathname (merge-pathnames "../ffi") - (lambda () - (load "make"))) - (compile-file "pgsql" '() (->environment '())) - (cref/generate-constructors "pgsql"))) +(for-each load-option '(cref ffi)) + +(compile-file "pgsql" '() (->environment '())) + +(cref/generate-constructors "pgsql") diff --cc src/pgsql/configure.ac index 4b795ca98,e7952a234..0b946683f --- a/src/pgsql/configure.ac +++ b/src/pgsql/configure.ac @@@ -10,13 -10,7 +10,12 @@@ AC_CONFIG_HEADERS([config.h] AC_CONFIG_MACRO_DIR([m4]) AC_COPYRIGHT( -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of a pgsql plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of a pgsql plugin for MIT/GNU Scheme Pucked. + +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Massachusetts Institute of Technology @@@ -39,12 -35,6 +38,11 @@@ USA AH_TOP([/* +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of a pgsql plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of a pgsql plugin for MIT/GNU Scheme Pucked. + Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, diff --cc src/x11-screen/NEWS index eafe91194,f0343f918..39c02dfa4 --- a/src/x11-screen/NEWS +++ b/src/x11-screen/NEWS @@@ -1,18 -1,12 +1,15 @@@ -mit-scheme-x11-screen NEWS -- history of user-visible changes. +mit-scheme-pucked-x11-screen NEWS -- history of user-visible changes. + +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of an X11 screen plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of an X11 screen plugin for MIT/GNU Scheme Pucked. Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Massachusetts Institute of Technology - This file is part of an x11-screen plugin for MIT/GNU Scheme. -This file is part of MIT/GNU Scheme. -- MIT/GNU Scheme is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at diff --cc src/x11-screen/configure.ac index 4c8207399,70997b39f..b6fbcc28f --- a/src/x11-screen/configure.ac +++ b/src/x11-screen/configure.ac @@@ -7,13 -7,7 +7,12 @@@ AC_INIT([MIT/GNU Scheme Pucked Edwin X1 AC_CONFIG_SRCDIR([x11-screen.pkg]) AC_COPYRIGHT( -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of an X11 screen plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of an X11 screen plugin for MIT/GNU Scheme Pucked. + +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Massachusetts Institute of Technology diff --cc src/x11-screen/debian/mit-scheme-pucked.svg index a8c1c545c,000000000..ffd35990f mode 100644,000000..100644 --- a/src/x11-screen/debian/mit-scheme-pucked.svg +++ b/src/x11-screen/debian/mit-scheme-pucked.svg @@@ -1,320 -1,0 +1,319 @@@ + +image/svg+xml diff --cc src/x11/NEWS index 41754cbc3,15d816b8a..d3e83a696 --- a/src/x11/NEWS +++ b/src/x11/NEWS @@@ -1,10 -1,4 +1,9 @@@ -mit-scheme-x11 NEWS -- history of user-visible changes. +mit-scheme-pucked-x11 NEWS -- history of user-visible changes. + +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of an X11 plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of an X11 plugin for MIT/GNU Scheme Pucked. Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, diff --cc src/x11/configure.ac index 47b22f8db,cf08194a2..7f52d1e5d --- a/src/x11/configure.ac +++ b/src/x11/configure.ac @@@ -9,13 -9,7 +9,12 @@@ AC_CONFIG_SRCDIR([x11.pkg] AC_CONFIG_MACRO_DIR([m4]) AC_COPYRIGHT( -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2017, 2018, 2019 Matthew Birkholz + - This file is part of an X11 plugin for MIT/GNU Scheme Pucked, - an experimental version of MIT/GNU Scheme. ++This file is part of an X11 plugin for MIT/GNU Scheme Pucked. + +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Massachusetts Institute of Technology