wip/slime - upgrade to v2.20

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wip/slime - upgrade to v2.20
From: Hauke Fath <hauke%NetBSD.org@localhost>
Date: Thu, 21 Sep 2017 14:54:31 +0000
Module Name:	pkgsrc-wip
Committed By:	Hauke Fath <hauke%NetBSD.org@localhost>
Pushed By:	hauke
Date:		Thu Sep 21 16:54:31 2017 +0200
Changeset:	602f8bcbfc149037cb516f3af42cef2be1e5f9af

Modified Files:
	slime/MESSAGE
	slime/Makefile
	slime/PLIST
	slime/distinfo
Added Files:
	slime/gnu-llgpl
	slime/patches/patch-doc_slime.texi
Removed Files:
	slime/TODO

Log Message:
wip/slime - upgrade to v2.20

Upgrade to v2.20
List supported emacsen (xemacs was desupported with v2.2)
Patch texi file to not require texinfo v5
Add lisp-lgpl text from <http://opensource.franz.com/preamble.html>
Render and remove TODO list

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=602f8bcbfc149037cb516f3af42cef2be1e5f9af

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

diffstat:
 slime/MESSAGE                      |  3 +-
 slime/Makefile                     | 33 ++++++++++++--------
 slime/PLIST                        | 41 +++++++++++++-----------
 slime/TODO                         |  6 ----
 slime/distinfo                     |  9 +++---
 slime/gnu-llgpl                    | 64 ++++++++++++++++++++++++++++++++++++++
 slime/patches/patch-doc_slime.texi | 16 ++++++++++
 7 files changed, 129 insertions(+), 43 deletions(-)

diffs:
diff --git a/slime/MESSAGE b/slime/MESSAGE
index 21cddfc546..effd94263c 100644
--- a/slime/MESSAGE
+++ b/slime/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2014/04/06 23:57:44 othyro Exp $
+$NetBSD$
 
 To use SLIME you need one of the many known-to-work Lisp implementations out
 there, such as lang/clisp or lang/sbcl. Add the following to your Emacs
@@ -11,6 +11,7 @@ configuration file:
 
 ;; Set your lisp system and, optionally, some contribs
 (setq inferior-lisp-program "the path to your Lisp binary")
+
 (slime-setup)
 
 Start it with 'M-x slime'.
diff --git a/slime/Makefile b/slime/Makefile
index 14345a036a..a1594d986f 100644
--- a/slime/Makefile
+++ b/slime/Makefile
@@ -1,45 +1,52 @@
-# $NetBSD: Makefile,v 1.8 2014/04/06 23:57:44 othyro Exp $
+# $NetBSD$
 #
 
 DISTNAME=		v${PKGVER}
-PKGVER=			2.5
+PKGVER=			2.20
 PKGNAME=		${EMACS_PKGNAME_PREFIX}slime-${PKGVER}
-PKGREVISION=		2
+#PKGREVISION=		1
 CATEGORIES=		editors
-MASTER_SITES=		https://github.com/slime/slime/archive/
+MASTER_SITES=		${MASTER_SITE_GITHUB:=slime}/slime/archive/
 DIST_SUBDIR=		${PKGBASE}
 
 MAINTAINER=		jfranz%bsdprojects.net@localhost
 HOMEPAGE=		http://common-lisp.net/project/slime/
 COMMENT=		Superior Lisp Interaction Mode for Emacs
-LICENSE=		gnu-gpl-v2 AND gnu-gpl-v3 AND mit AND public-domain # AND LLGPL
+LICENSE=		gnu-gpl-v2 AND gnu-gpl-v3 AND \
+			mit AND public-domain AND gnu-llgpl
 
 WRKSRC=			${WRKDIR}/slime-${PKGVER}
 USE_TOOLS+=		gmake makeinfo
 NO_CONFIGURE=		yes
 INFO_FILES=		yes
 
-INSTALLATION_DIRS+=	${EMACS_INFOPREFIX} ${EMACS_LISPPREFIX}/slime/lib
+EMACS_VERSIONS_ACCEPTED= \
+			emacs25 emacs25nox \
+			emacs24 emacs24nox \
+			emacs23 emacs23nox
+
+INSTALLATION_DIRS+=	${EMACS_INFOPREFIX}
+INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}/slime
+INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}/slime/lib
+INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}/slime/swank
+
 SLIME_LISPDIR=		${EMACS_LISPPREFIX}/slime
 
 do-build:
 	cd ${WRKSRC}/doc && ${GMAKE} slime.info
-	cd ${WRKSRC} && ${EMACS_BIN} -batch \
+	cd ${WRKSRC} && ${EMACS_BIN} --batch --no-init-file --no-site-lisp \
 		-eval '(setq load-path (cons nil load-path))' \
 		-f batch-byte-compile *.el
 
-pre-install:
-	${MKDIR} ${SLIME_LISPDIR}
-
 do-install:
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ChangeLog ${DESTDIR}${SLIME_LISPDIR}; \
 		${INSTALL_DATA} *.el ${DESTDIR}${SLIME_LISPDIR}; \
 		${INSTALL_DATA} *.elc ${DESTDIR}${SLIME_LISPDIR}; \
 		${INSTALL_DATA} *.lisp ${DESTDIR}${SLIME_LISPDIR}; \
-		${INSTALL_DATA} lib/*.el ${DESTDIR}${SLIME_LISPDIR}/lib
-		${INSTALL_DATA} ${WRKSRC}/doc/slime.info \
-			${DESTDIR}${EMACS_INFOPREFIX}
+		${INSTALL_DATA} swank/*.lisp ${DESTDIR}${SLIME_LISPDIR}/swank; \
+		${INSTALL_DATA} lib/*.el ${DESTDIR}${SLIME_LISPDIR}/lib; \
+		${INSTALL_DATA} doc/slime.info ${DESTDIR}${EMACS_INFOPREFIX}
 
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/slime/PLIST b/slime/PLIST
index 96adf98f89..8fa5511e3b 100644
--- a/slime/PLIST
+++ b/slime/PLIST
@@ -1,12 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2014/04/06 23:57:44 othyro Exp $
-${EMACS_INFOPREFIX}/slime.info
-${EMACS_LISPPREFIX}/slime/ChangeLog
+@comment $NetBSD$
+info/slime.info
 ${EMACS_LISPPREFIX}/slime/lib/cl-lib.el
 ${EMACS_LISPPREFIX}/slime/lib/ert-x.el
 ${EMACS_LISPPREFIX}/slime/lib/ert.el
 ${EMACS_LISPPREFIX}/slime/lib/hyperspec.el
+${EMACS_LISPPREFIX}/slime/lib/macrostep.el
 ${EMACS_LISPPREFIX}/slime/metering.lisp
 ${EMACS_LISPPREFIX}/slime/nregex.lisp
+${EMACS_LISPPREFIX}/slime/packages.lisp
 ${EMACS_LISPPREFIX}/slime/sbcl-pprint-patch.lisp
 ${EMACS_LISPPREFIX}/slime/slime-autoloads.el
 ${EMACS_LISPPREFIX}/slime/slime-tests.el
@@ -14,22 +15,24 @@ ${EMACS_LISPPREFIX}/slime/slime-tests.elc
 ${EMACS_LISPPREFIX}/slime/slime.el
 ${EMACS_LISPPREFIX}/slime/slime.elc
 ${EMACS_LISPPREFIX}/slime/start-swank.lisp
-${EMACS_LISPPREFIX}/slime/swank-abcl.lisp
-${EMACS_LISPPREFIX}/slime/swank-allegro.lisp
-${EMACS_LISPPREFIX}/slime/swank-backend.lisp
-${EMACS_LISPPREFIX}/slime/swank-ccl.lisp
-${EMACS_LISPPREFIX}/slime/swank-clisp.lisp
-${EMACS_LISPPREFIX}/slime/swank-cmucl.lisp
-${EMACS_LISPPREFIX}/slime/swank-corman.lisp
-${EMACS_LISPPREFIX}/slime/swank-ecl.lisp
-${EMACS_LISPPREFIX}/slime/swank-gray.lisp
-${EMACS_LISPPREFIX}/slime/swank-lispworks.lisp
 ${EMACS_LISPPREFIX}/slime/swank-loader.lisp
-${EMACS_LISPPREFIX}/slime/swank-match.lisp
-${EMACS_LISPPREFIX}/slime/swank-rpc.lisp
-${EMACS_LISPPREFIX}/slime/swank-sbcl.lisp
-${EMACS_LISPPREFIX}/slime/swank-scl.lisp
-${EMACS_LISPPREFIX}/slime/swank-source-file-cache.lisp
-${EMACS_LISPPREFIX}/slime/swank-source-path-parser.lisp
 ${EMACS_LISPPREFIX}/slime/swank.lisp
+${EMACS_LISPPREFIX}/slime/swank/abcl.lisp
+${EMACS_LISPPREFIX}/slime/swank/allegro.lisp
+${EMACS_LISPPREFIX}/slime/swank/backend.lisp
+${EMACS_LISPPREFIX}/slime/swank/ccl.lisp
+${EMACS_LISPPREFIX}/slime/swank/clasp.lisp
+${EMACS_LISPPREFIX}/slime/swank/clisp.lisp
+${EMACS_LISPPREFIX}/slime/swank/cmucl.lisp
+${EMACS_LISPPREFIX}/slime/swank/corman.lisp
+${EMACS_LISPPREFIX}/slime/swank/ecl.lisp
+${EMACS_LISPPREFIX}/slime/swank/gray.lisp
+${EMACS_LISPPREFIX}/slime/swank/lispworks.lisp
+${EMACS_LISPPREFIX}/slime/swank/match.lisp
+${EMACS_LISPPREFIX}/slime/swank/mkcl.lisp
+${EMACS_LISPPREFIX}/slime/swank/rpc.lisp
+${EMACS_LISPPREFIX}/slime/swank/sbcl.lisp
+${EMACS_LISPPREFIX}/slime/swank/scl.lisp
+${EMACS_LISPPREFIX}/slime/swank/source-file-cache.lisp
+${EMACS_LISPPREFIX}/slime/swank/source-path-parser.lisp
 ${EMACS_LISPPREFIX}/slime/xref.lisp
diff --git a/slime/TODO b/slime/TODO
deleted file mode 100644
index d5ba276a42..0000000000
--- a/slime/TODO
+++ /dev/null
@@ -1,6 +0,0 @@
-Important:
-
- * Make this work for other versions and flavors of Emacs (emacs-nox11, xemacs,
-   etc);
- * Add LLGPL (Lesser Lisp General Public License) to pkgsrc/licenses;
- * Finish LICENSE;
diff --git a/slime/distinfo b/slime/distinfo
index c17eee63d5..3c91ba2fa4 100644
--- a/slime/distinfo
+++ b/slime/distinfo
@@ -1,6 +1,7 @@
 $NetBSD: distinfo,v 1.2 2014/04/06 16:13:01 othyro Exp $
 
-SHA1 (xemacs-slime/v2.5.tar.gz) = f17ea85242963869a3fa0852495f84784e4c00bc
-RMD160 (xemacs-slime/v2.5.tar.gz) = 36c4da6a30359a20597b80bea6581463b0b1625e
-SHA512 (xemacs-slime/v2.5.tar.gz) = 695d365ca115bcd4a858ef0d63c134d068dc6cd07b0eff9350f337b1f0a5e374711cc72eba1aa882955fc34b4c2b8a644163b82fb0a07cc3a844dcad6f5b5107
-Size (xemacs-slime/v2.5.tar.gz) = 1032135 bytes
+SHA1 (slime/v2.20.tar.gz) = 34d339e141599953e0a396e3c81af3b3b65187c0
+RMD160 (slime/v2.20.tar.gz) = b924551d2e5a87109566130773e648cb9ba32c4b
+SHA512 (slime/v2.20.tar.gz) = 994dbffb54ee1ab4ca529771451724c83ff83992a6d495e06cdca5cd94f0c098e48d7914489278e3015f18ea094d58c469e57301492087a33087562f69506b46
+Size (slime/v2.20.tar.gz) = 803127 bytes
+SHA1 (patch-doc_slime.texi) = fbe0096560dde65d8585414bdf856cf749f0d1cf
diff --git a/slime/gnu-llgpl b/slime/gnu-llgpl
new file mode 100644
index 0000000000..ff8cb3f875
--- /dev/null
+++ b/slime/gnu-llgpl
@@ -0,0 +1,64 @@
+
+Preamble to the Gnu Lesser General Public License
+
+Copyright (c) 2000 Franz Incorporated, Berkeley, CA 94704
+
+The concept of the GNU Lesser General Public License version 2.1
+("LGPL") has been adopted to govern the use and distribution of
+above-mentioned application. However, the LGPL uses terminology that
+is more appropriate for a program written in C than one written in
+Lisp. Nevertheless, the LGPL can still be applied to a Lisp program if
+certain clarifications are made. This document details those
+clarifications. Accordingly, the license for the open-source Lisp
+applications consists of this document plus the LGPL. Wherever there
+is a conflict between this document and the LGPL, this document takes
+precedence over the LGPL.
+
+A "Library" in Lisp is a collection of Lisp functions, data and
+foreign modules. The form of the Library can be Lisp source code (for
+processing by an interpreter) or object code (usually the result of
+compilation of source code or built with some other
+mechanisms). Foreign modules are object code in a form that can be
+linked into a Lisp executable. When we speak of functions we do so in
+the most general way to include, in addition, methods and unnamed
+functions. Lisp "data" is also a general term that includes the data
+structures resulting from defining Lisp classes. A Lisp application
+may include the same set of Lisp objects as does a Library, but this
+does not mean that the application is necessarily a "work based on the
+Library" it contains.
+
+The Library consists of everything in the distribution file set before
+any modifications are made to the files. If any of the functions or
+classes in the Library are redefined in other files, then those
+redefinitions ARE considered a work based on the Library. If
+additional methods are added to generic functions in the Library,
+those additional methods are NOT considered a work based on the
+Library. If Library classes are subclassed, these subclasses are NOT
+considered a work based on the Library. If the Library is modified to
+explicitly call other functions that are neither part of Lisp itself
+nor an available add-on module to Lisp, then the functions called by
+the modified Library ARE considered a work based on the Library. The
+goal is to ensure that the Library will compile and run without
+getting undefined function errors.
+
+It is permitted to add proprietary source code to the Library, but it
+must be done in a way such that the Library will still run without
+that proprietary code present. Section 5 of the LGPL distinguishes
+between the case of a library being dynamically linked at runtime and
+one being statically linked at build time. Section 5 of the LGPL
+states that the former results in an executable that is a "work that
+uses the Library." Section 5 of the LGPL states that the latter
+results in one that is a "derivative of the Library", which is
+therefore covered by the LGPL. Since Lisp only offers one choice,
+which is to link the Library into an executable at build time, we
+declare that, for the purpose applying the LGPL to the Library, an
+executable that results from linking a "work that uses the Library"
+with the Library is considered a "work that uses the Library" and is
+therefore NOT covered by the LGPL.
+
+Because of this declaration, section 6 of LGPL is not applicable to
+the Library. However, in connection with each distribution of this
+executable, you must also deliver, in accordance with the terms and
+conditions of the LGPL, the source code of Library (or your derivative
+thereof) that is incorporated into this executable.
+
diff --git a/slime/patches/patch-doc_slime.texi b/slime/patches/patch-doc_slime.texi
new file mode 100644
index 0000000000..883ea87d9b
--- /dev/null
+++ b/slime/patches/patch-doc_slime.texi
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Typographically correct apostrophes in the pdf version are not worth
+the hassle of installing texinfo v5 over using the base texinfo.
+
+--- doc/slime.texi.orig	2017-08-28 11:51:57.000000000 +0000
++++ doc/slime.texi
+@@ -3,8 +3,6 @@
+ @setfilename slime.info
+ 
+ @documentencoding UTF-8
+-@codequoteundirected on
+-@codequotebacktick on
+ 
+ @dircategory Emacs
+ @direntry
Prev by Date: libretro-beetle-sgx: Update to 20170917 (Do not initialize too many ports)
Next by Date: py-quadprog: Add a missing dependency on py-cython
Previous by Thread: libretro-beetle-sgx: Update to 20170917 (Do not initialize too many ports)
Next by Thread: py-quadprog: Add a missing dependency on py-cython
Indexes:
Home | Main Index | Thread Index | Old Index