ding: Update to 1.9

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed Sep 7 19:34:59 2022 +0200
Changeset:	7b9493eb8a06314cab2dee310b60bacc45d23471

Modified Files:
	ding/Makefile
	ding/distinfo
Added Files:
	ding/patches/patch-ding
Removed Files:
	ding/patches/patch-aa

Log Message:
ding: Update to 1.9

Modify COMMENT.
Use subdir for distfiles.
Regenerate patch.

Changes in version 1.9:
- Enhanced English-German dictionary (380,000 entries)
- Bugfixes

Changes in version 1.8.1:
- Enhanced English-German dictionary (345,000 entries)
- Bugfixes

Changes in version 1.8:
- Bugfixes
- Enhanced English-German dictionary (326,000 entries)

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

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

diffstat:
 ding/Makefile           | 15 ++++++++-------
 ding/distinfo           | 14 ++++++++------
 ding/patches/patch-aa   | 15 ---------------
 ding/patches/patch-ding | 15 +++++++++++++++
 4 files changed, 31 insertions(+), 28 deletions(-)

diffs:
diff --git a/ding/Makefile b/ding/Makefile
index 3d6a6ccf16..520cdb3b07 100644
--- a/ding/Makefile
+++ b/ding/Makefile
@@ -1,15 +1,16 @@
 # $NetBSD: Makefile,v 1.14 2013/04/21 17:54:56 kristerw Exp $
 
-DISTNAME=	ding-1.7
+DISTNAME=	ding-1.9
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.tu-chemnitz.de/pub/Local/urz/ding/	\
-		ftp://ftp.tu-chemnitz.de/pub/Local/urz/ding/de-en/
-DISTFILES=	ding-1.7.tar.gz \
-		de-en.txt.gz
+MASTER_SITES=	ftp://ftp.tu-chemnitz.de/pub/Local/urz/ding/
+MASTER_SITES+=	ftp://ftp.tu-chemnitz.de/pub/Local/urz/ding/de-en/
+DIST_SUBDIR=	${PKGNAME_NOREV}
+DISTFILES=	${DISTNAME}.tar.gz
+DISTFILES+=	de-en.txt.gz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://www-user.tu-chemnitz.de/~fri/ding/
-COMMENT=	Ding is a Dictionary lookup program for the X window system
+COMMENT=	Dictionary lookup program for the X window system
 LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	tk>=8.3.2:../../x11/tk
@@ -25,7 +26,7 @@ SUBST_CLASSES+=		prefix
 SUBST_FILES.prefix=	ding
 SUBST_MESSAGE.prefix=	Fixing PREFIX path.
 SUBST_SED.prefix=	-e "s|PFIX|${PREFIX}|1"
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-build
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1 share/dict
 
diff --git a/ding/distinfo b/ding/distinfo
index 447042910c..1adf23a1d9 100644
--- a/ding/distinfo
+++ b/ding/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.5 2013/01/20 14:18:58 othyro Exp $
+$NetBSD$
 
-RMD160 (de-en.txt.gz) = ac014d44f0900bad276fd73701309f8603535fe1
-Size (de-en.txt.gz) = 3977453 bytes
-RMD160 (ding-1.7.tar.gz) = 0ce34510d4855d74167d4256de041bb42736b094
-Size (ding-1.7.tar.gz) = 4037214 bytes
-SHA1 (patch-aa) = 9361c2b87b0c2009bf51d7e3d3b5d3ca14c6ebe7
+BLAKE2s (ding-1.9/de-en.txt.gz) = f26aa52abd4865d36eb5ed72680a2d1bb6d396a82ac4c5383bc339005bf9dc79
+SHA512 (ding-1.9/de-en.txt.gz) = 172b61d4ee52ea14385608cca62891ecab22a4136aa5967654f56b5ef4c77c9f4feeb294396be43b7787133fabdfb2ace8648d2ee4fa877cf21ec566a0ef2b77
+Size (ding-1.9/de-en.txt.gz) = 7804867 bytes
+BLAKE2s (ding-1.9/ding-1.9.tar.gz) = f0daa95ad4c51777ada41da8ea92298e133a040558bb420240ee33cfb79b4e72
+SHA512 (ding-1.9/ding-1.9.tar.gz) = fa5500d1ced311ba21ef8a16a25f3a3cdcebc24daacff79c05351a46cc2a1d466891caa1dec3a77ae9a4d7e59332d991974917875f967d93ac1358f5532e8a72
+Size (ding-1.9/ding-1.9.tar.gz) = 7864078 bytes
+SHA1 (patch-ding) = 2a6168cca9ff51c7db07d90ed98afa768fbbf8ed
diff --git a/ding/patches/patch-aa b/ding/patches/patch-aa
deleted file mode 100644
index 141836b4dd..0000000000
--- a/ding/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2013/01/20 14:18:58 othyro Exp $
-
-Fix PREFIX (replaced in SUBST_*.
-
---- ding.orig	2005-04-27 13:28:29.000000000 +0000
-+++ ding
-@@ -85,7 +85,7 @@ set param(noticefile) [expr {$param(isun
- # The provided German-English dictionary:
- set default_searchmeth(0,name) {Dictionary}
- set default_searchmeth(0,grepcmds) {agrep egrep internal_search}
--set default_searchmeth(0,dictfile) [expr {$param(isunix) ?  "/usr/share/dict/de-en.txt" : "[file dirname argv0]/de-en.txt"}]
-+set default_searchmeth(0,dictfile) [expr {$param(isunix) ?  "PFIX/share/dict/de-en.txt" : "[file dirname argv0]/de-en.txt"}]
- set default_searchmeth(0,separator) { :: }
- set default_searchmeth(0,language1) {Deutsch}
- set default_searchmeth(0,language2) {English}
diff --git a/ding/patches/patch-ding b/ding/patches/patch-ding
new file mode 100644
index 0000000000..3cf44681b9
--- /dev/null
+++ b/ding/patches/patch-ding
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix PREFIX (replaced in SUBST_*.
+
+--- ding.orig	2020-12-22 12:16:18.000000000 +0000
++++ ding
+@@ -85,7 +85,7 @@ set param(noticefile) [expr {$param(isun
+ # The provided German-English dictionary:
+ set default_searchmeth(0,name) {Dictionary}
+ set default_searchmeth(0,grepcmds) {tre-agrep agrep egrep internal_search}
+-set default_searchmeth(0,dictfile) [expr {$param(isunix) ?  "/usr/share/dict/de-en.txt" : "[file dirname argv0]/de-en.txt"}]
++set default_searchmeth(0,dictfile) [expr {$param(isunix) ?  "PFIX/share/dict/de-en.txt" : "[file dirname argv0]/de-en.txt"}]
+ set default_searchmeth(0,separator) { :: }
+ set default_searchmeth(0,language1) {Deutsch}
+ set default_searchmeth(0,language2) {English}