[pkgsrc/trunk]: pkgsrc/inputmethod/skkserv inputmethod/skkserv: fix accidenta...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/944ac2415b01
branches:  trunk
changeset: 431419:944ac2415b01
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed May 13 04:14:48 2020 +0000

description:
inputmethod/skkserv: fix accidental patch for version number

The version number is supposed to be substituted in pre-configure, not in
the patch itself.  To ensure this in the future, fail fast by setting
SUBST_NOOP_OK=no.

diffstat:

 inputmethod/skkserv/Makefile                        |  7 ++++---
 inputmethod/skkserv/distinfo                        |  4 ++--
 inputmethod/skkserv/patches/patch-skkserv_skkserv.c |  5 ++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diffs (58 lines):

diff -r 2d25ca1fc70d -r 944ac2415b01 inputmethod/skkserv/Makefile
--- a/inputmethod/skkserv/Makefile      Wed May 13 04:02:34 2020 +0000
+++ b/inputmethod/skkserv/Makefile      Wed May 13 04:14:48 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2019/11/02 22:56:55 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2020/05/13 04:14:48 rillig Exp $
 
 DISTNAME=      skk9.6
 PKGNAME=       skkserv-3.9.4
-PKGREVISION=   7
-CATEGORIES=    japanese inputmethod
+PKGREVISION=   8
+CATEGORIES=    inputmethod japanese
 MASTER_SITES=  ftp://skk.kuis.kyoto-u.ac.jp/skk/9.6/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -44,6 +44,7 @@
 SUBST_MESSAGE.ver-num= Fixing version number and its comments.
 SUBST_FILES.ver-num=   skkserv/skkserv.c
 SUBST_SED.ver-num=     -e 's,"${PKGVERSION_NOREV} ","${PKGVERSION} (binary search) ",g'
+SUBST_NOOP_OK.ver-num= no # to prevent this from appearing in the patch
 
 INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX}
 
diff -r 2d25ca1fc70d -r 944ac2415b01 inputmethod/skkserv/distinfo
--- a/inputmethod/skkserv/distinfo      Wed May 13 04:02:34 2020 +0000
+++ b/inputmethod/skkserv/distinfo      Wed May 13 04:14:48 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 22:13:40 agc Exp $
+$NetBSD: distinfo,v 1.8 2020/05/13 04:14:48 rillig Exp $
 
 SHA1 (skk/skk9.6.tar.gz) = f462b4586dff6e36bfe331a526e054c3f6c3aad9
 RMD160 (skk/skk9.6.tar.gz) = af182063e92f993cd2d9a69d7f89109ef0631526
@@ -9,4 +9,4 @@
 SHA1 (patch-ad) = 27abe12b627e8e5c5de0a78fab3a5f4551f3c0f7
 SHA1 (patch-ae) = 356b3bab93365bb769a340b99979161f07f60de4
 SHA1 (patch-ai) = 38f6169507d12c500298cba555a57b77cafa19c4
-SHA1 (patch-skkserv_skkserv.c) = eacd2ad95f1288301ef09d4b2dd9e73a7d3ef576
+SHA1 (patch-skkserv_skkserv.c) = 4baef77153da6c05683bfa599f40bb512848bf74
diff -r 2d25ca1fc70d -r 944ac2415b01 inputmethod/skkserv/patches/patch-skkserv_skkserv.c
--- a/inputmethod/skkserv/patches/patch-skkserv_skkserv.c       Wed May 13 04:02:34 2020 +0000
+++ b/inputmethod/skkserv/patches/patch-skkserv_skkserv.c       Wed May 13 04:14:48 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-skkserv_skkserv.c,v 1.1 2013/03/10 18:53:32 hiramatsu Exp $
+$NetBSD: patch-skkserv_skkserv.c,v 1.2 2020/05/13 04:14:48 rillig Exp $
 
 Add IPv6 support and binary search capability.
 
@@ -18,8 +18,7 @@
   *    Global Variables
   */
  
--char  pgmver[] = "3.9.4 ";    /* version number */
-+char  pgmver[] = "3.9.4nb7 (binary search) "; /* version number */
+ char  pgmver[] = "3.9.4 ";    /* version number */
  
  char  *pgmnm;         /* program name */
  char  *jname;         /* name of shared dictionary */