wip/slime straighten out version info

[Hauke Fath <hauke%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Hauke Fath <hauke%NetBSD.org@localhost>
Pushed By:	hauke
Date:		Wed Sep 13 16:45:51 2017 +0200
Changeset:	01d8485a059b14b2f58f3ab5f8f3a8571cd1d6ac

Modified Files:
	slime/Makefile
	slime/distinfo

Log Message:
wip/slime	straighten out version info

Simplify version info and fix WRKSRC setup

Does not currently work with XEmacs, which does not know about a
three-argument require function call.

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

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

diffstat:
 slime/Makefile | 11 ++++++-----
 slime/distinfo |  7 ++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diffs:
diff --git a/slime/Makefile b/slime/Makefile
index f3f1a1db8c..14345a036a 100644
--- a/slime/Makefile
+++ b/slime/Makefile
@@ -1,9 +1,10 @@
 # $NetBSD: Makefile,v 1.8 2014/04/06 23:57:44 othyro Exp $
 #
 
-DISTNAME=		v2.5
-PKGNAME=		${EMACS_PKGNAME_PREFIX}slime${DISTNAME:S/v/-/1}
-PKGREVISION=		1
+DISTNAME=		v${PKGVER}
+PKGVER=			2.5
+PKGNAME=		${EMACS_PKGNAME_PREFIX}slime-${PKGVER}
+PKGREVISION=		2
 CATEGORIES=		editors
 MASTER_SITES=		https://github.com/slime/slime/archive/
 DIST_SUBDIR=		${PKGBASE}
@@ -13,7 +14,7 @@ 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
 
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC=			${WRKDIR}/slime-${PKGVER}
 USE_TOOLS+=		gmake makeinfo
 NO_CONFIGURE=		yes
 INFO_FILES=		yes
@@ -31,7 +32,7 @@ pre-install:
 	${MKDIR} ${SLIME_LISPDIR}
 
 do-install:
-	cd ${WRKSRC}; \
+	cd ${WRKSRC} && \
 		${INSTALL_DATA} ChangeLog ${DESTDIR}${SLIME_LISPDIR}; \
 		${INSTALL_DATA} *.el ${DESTDIR}${SLIME_LISPDIR}; \
 		${INSTALL_DATA} *.elc ${DESTDIR}${SLIME_LISPDIR}; \
diff --git a/slime/distinfo b/slime/distinfo
index 07a8d18bac..c17eee63d5 100644
--- a/slime/distinfo
+++ b/slime/distinfo
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.2 2014/04/06 16:13:01 othyro Exp $
 
-SHA1 (slime/v2.5.tar.gz) = f17ea85242963869a3fa0852495f84784e4c00bc
-RMD160 (slime/v2.5.tar.gz) = 36c4da6a30359a20597b80bea6581463b0b1625e
-Size (slime/v2.5.tar.gz) = 1032135 bytes
+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