summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2020-05-13 04:14:48 +0000
committerrillig <rillig@pkgsrc.org>2020-05-13 04:14:48 +0000
commit583df4a1725a206fdfba8471c9f138461b07058b (patch)
tree1bf5480014f6e0d9a98e1af8afd16417fcdc55be
parent0a02f2ff985a97be48d6ff2be28ff05f9dadf184 (diff)
downloadpkgsrc-583df4a1725a206fdfba8471c9f138461b07058b.tar.gz
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.
-rw-r--r--inputmethod/skkserv/Makefile7
-rw-r--r--inputmethod/skkserv/distinfo4
-rw-r--r--inputmethod/skkserv/patches/patch-skkserv_skkserv.c5
3 files changed, 8 insertions, 8 deletions
diff --git a/inputmethod/skkserv/Makefile b/inputmethod/skkserv/Makefile
index 22544610e85..ca01472a78d 100644
--- a/inputmethod/skkserv/Makefile
+++ b/inputmethod/skkserv/Makefile
@@ -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
@@ -44,6 +44,7 @@ SUBST_STAGE.ver-num= pre-configure
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 --git a/inputmethod/skkserv/distinfo b/inputmethod/skkserv/distinfo
index 0959552f412..40671d7343e 100644
--- a/inputmethod/skkserv/distinfo
+++ b/inputmethod/skkserv/distinfo
@@ -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-ac) = 3a1818c3bb453b69eb23154ed0daa6909275774b
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 --git a/inputmethod/skkserv/patches/patch-skkserv_skkserv.c b/inputmethod/skkserv/patches/patch-skkserv_skkserv.c
index c0fe2713481..7a6ff241a58 100644
--- a/inputmethod/skkserv/patches/patch-skkserv_skkserv.c
+++ b/inputmethod/skkserv/patches/patch-skkserv_skkserv.c
@@ -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 @@ Add IPv6 support and binary search capability.
* 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 */