pkgsrc-WIP-changes archive

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

espeak: Delete (probably superfluous) ESPEAK_{VERSION,MINOR}



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun May 27 13:23:57 2018 +0200
Changeset:	8e799f7a900ead3ba0600046a1c619e1e0d9153f

Modified Files:
	espeak/Makefile
	espeak/PLIST
	espeak/TODO

Log Message:
espeak: Delete (probably superfluous) ESPEAK_{VERSION,MINOR}

Maintaining such variables sounds like an overengineering, they
are not used anywhere and just setting the version directly in
${DISTNAME} is enough.

Adjust TODO accordingly removing the entry about PLIST for the same reason.

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

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

diffstat:
 espeak/Makefile | 5 +----
 espeak/PLIST    | 2 +-
 espeak/TODO     | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diffs:
diff --git a/espeak/Makefile b/espeak/Makefile
index fc99269fce..ba212e7b5f 100644
--- a/espeak/Makefile
+++ b/espeak/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2015/08/25 13:41:23 leot1990 Exp $
 #
 
-DISTNAME=	espeak-${ESPEAK_VERSION}${ESPEAK_MINOR}-source
+DISTNAME=	espeak-1.48.04-source
 PKGNAME=	${DISTNAME:S/-source//}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=espeak/}
@@ -18,9 +18,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 MAKE_FLAGS+=	PREFIX=${PREFIX}
 
-ESPEAK_VERSION=	1.48
-ESPEAK_MINOR=	.04
-
 SUBST_CLASSES+=		datadir
 SUBST_MESSAGE.datadir=	Replacing hardcoded DATADIR path
 SUBST_STAGE.datadir=	post-patch
diff --git a/espeak/PLIST b/espeak/PLIST
index 90e2d23690..741ca97cdd 100644
--- a/espeak/PLIST
+++ b/espeak/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/08/25 13:41:23 leot1990 Exp $
+@comment $NetBSD$
 bin/espeak
 include/espeak/speak_lib.h
 lib/libespeak.a
diff --git a/espeak/TODO b/espeak/TODO
index b2505ab997..263c4f9399 100644
--- a/espeak/TODO
+++ b/espeak/TODO
@@ -1,4 +1,3 @@
 - Adjust permission of data files (probably they do not need execute
   permissions!)
-- ESPEAK_VERSION in PLIST is hardcoded now
 - Function is tested only on 6.0-ish/i386 for now.


Home | Main Index | Thread Index | Old Index