CVS commit: pkgsrc/inputmethod/kinput2
"Thomas Klausner" <[email protected]>
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module Name: pkgsrc
Committed By: wiz
Date: Sat Jul 25 12:57:02 UTC 2026
Modified Files:
pkgsrc/inputmethod/kinput2: Makefile distinfo options.mk
Added Files:
pkgsrc/inputmethod/kinput2: PLIST.common PLIST.freewnn PLIST.sj3
Removed Files:
pkgsrc/inputmethod/kinput2: PLIST-common PLIST-freewnn PLIST-sj3
Log Message:
kinput2: make PLIST* files match standard pattern
while here, clean up some pkglint
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/inputmethod/kinput2/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/inputmethod/kinput2/PLIST-common \
pkgsrc/inputmethod/kinput2/PLIST-sj3
cvs rdiff -u -r1.3 -r0 pkgsrc/inputmethod/kinput2/PLIST-freewnn
cvs rdiff -u -r0 -r1.1 pkgsrc/inputmethod/kinput2/PLIST.common \
pkgsrc/inputmethod/kinput2/PLIST.freewnn \
pkgsrc/inputmethod/kinput2/PLIST.sj3
cvs rdiff -u -r1.10 -r1.11 pkgsrc/inputmethod/kinput2/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/inputmethod/kinput2/options.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
(unnamed)
(text/x-diff, 4.7 KB)
Modified files:
Index: pkgsrc/inputmethod/kinput2/Makefile
diff -u pkgsrc/inputmethod/kinput2/Makefile:1.26 pkgsrc/inputmethod/kinput2/Makefile:1.27
--- pkgsrc/inputmethod/kinput2/Makefile:1.26 Sat Jul 4 08:27:43 2026
+++ pkgsrc/inputmethod/kinput2/Makefile Sat Jul 25 12:57:02 2026
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2026/07/04 08:27:43 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2026/07/25 12:57:02 wiz Exp $
DISTNAME= kinput2-v3.1
PKGNAME= kinput2-3.1
PKGREVISION= 5
-CATEGORIES= japanese inputmethod
+CATEGORIES= inputmethod japanese
MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/
PATCH_SITES= http://canna.osdn.jp/canna37patches/
@@ -16,7 +16,7 @@ COMMENT= Input server of Japanese text
MAKE_JOBS_SAFE= NO
USE_IMAKE= YES
-PLIST_SRC= ${PKGDIR}/PLIST-common
+PLIST_SRC= ${PKGDIR}/PLIST.common
.include "options.mk"
Index: pkgsrc/inputmethod/kinput2/distinfo
diff -u pkgsrc/inputmethod/kinput2/distinfo:1.10 pkgsrc/inputmethod/kinput2/distinfo:1.11
--- pkgsrc/inputmethod/kinput2/distinfo:1.10 Tue Oct 26 10:49:36 2021
+++ pkgsrc/inputmethod/kinput2/distinfo Sat Jul 25 12:57:02 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:49:36 nia Exp $
+$NetBSD: distinfo,v 1.11 2026/07/25 12:57:02 wiz Exp $
BLAKE2s (kinput2-v3.1-canna37.diff) = 38ea3d379d9e1be74286295481aebca098254ec430971ba4796f6db7f8821847
SHA512 (kinput2-v3.1-canna37.diff) = d7047eb1861b68abe9265a6b99b7953ea3405e01c2d24899e7da925b9781b1e318fd9d5262b03e3c54f4b7e85cceb2c295decad8287c337f173e986c1b1e1584
@@ -6,7 +6,6 @@ Size (kinput2-v3.1-canna37.diff) = 993 b
BLAKE2s (kinput2-v3.1.tar.gz) = 2ae561f3637389f1df53a609e97dc7cb90f05ee04cc42e745130fb4eac69f260
SHA512 (kinput2-v3.1.tar.gz) = 5950f7294fa2bf915e6591290a3deb2c95f27706f3a180a084d14fbc008f3cf363b155b29c8103a8b999e44ae98182ff35bcfda85725b2c565f3e37f54788731
Size (kinput2-v3.1.tar.gz) = 512177 bytes
-SHA1 (patch-Imakefile) = 2ec731b5ff7ef4cac3497c60b179e0f1ce0a4a05
SHA1 (patch-aa) = 3eaca25000c756d71fcafbb09a8ad8fd15142437
SHA1 (patch-ab) = a084421f399e753f25040fd0cba6d43a391fc15b
SHA1 (patch-ac) = 83d74ddffa6ddb870b3de1755a94e1258e06f793
Index: pkgsrc/inputmethod/kinput2/options.mk
diff -u pkgsrc/inputmethod/kinput2/options.mk:1.3 pkgsrc/inputmethod/kinput2/options.mk:1.4
--- pkgsrc/inputmethod/kinput2/options.mk:1.3 Sat Nov 2 22:56:54 2019
+++ pkgsrc/inputmethod/kinput2/options.mk Sat Jul 25 12:57:02 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/11/02 22:56:54 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2026/07/25 12:57:02 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.kinput2
PKG_OPTIONS_NONEMPTY_SETS= inputmethod
@@ -25,13 +25,13 @@ KINPUT2_DEFS+= -Dport_CANNALIB="${LDFLAG
KINPUT2_DEFS+= -DUseWnn
KINPUT2_DEFS+= -Dport_WNNINCDIR=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/wnn
KINPUT2_DEFS+= -Dport_WNNLIB="${LDFLAGS} -lwnn -lcrypt"
-PLIST_SRC+= ${PKGDIR}/PLIST-freewnn
+PLIST_SRC+= ${PKGDIR}/PLIST.freewnn
.endif
.if !empty(PKG_OPTIONS:Msj3)
.include "../../inputmethod/sj3-client/buildlink3.mk"
KINPUT2_DEFS+= -DUseSj3
-KINPUT2_DEFS+= -Dport_SJ3SRC=${BUILDLINK_PREFIX.sj3-lib}/include
+KINPUT2_DEFS+= -Dport_SJ3SRC=${BUILDLINK_PREFIX.sj3-client}/include
KINPUT2_DEFS+= -Dport_SJ3LIB="${LDFLAGS} -lsj3lib"
-PLIST_SRC+= ${PKGDIR}/PLIST-sj3
+PLIST_SRC+= ${PKGDIR}/PLIST.sj3
.endif
Added files:
Index: pkgsrc/inputmethod/kinput2/PLIST.common
diff -u /dev/null pkgsrc/inputmethod/kinput2/PLIST.common:1.1
--- /dev/null Sat Jul 25 12:57:02 2026
+++ pkgsrc/inputmethod/kinput2/PLIST.common Sat Jul 25 12:57:02 2026
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.common,v 1.1 2026/07/25 12:57:02 wiz Exp $
+bin/kinput2
+lib/X11/app-defaults/Kinput2
+${IMAKE_MAN_DIR}/kinput2.${IMAKE_MANNEWSUFFIX}
Index: pkgsrc/inputmethod/kinput2/PLIST.freewnn
diff -u /dev/null pkgsrc/inputmethod/kinput2/PLIST.freewnn:1.1
--- /dev/null Sat Jul 25 12:57:02 2026
+++ pkgsrc/inputmethod/kinput2/PLIST.freewnn Sat Jul 25 12:57:02 2026
@@ -0,0 +1,14 @@
+@comment $NetBSD: PLIST.freewnn,v 1.1 2026/07/25 12:57:02 wiz Exp $
+lib/X11/ccdef/ccdef.kinput2
+lib/X11/ccdef/ccdef.kinput2.egg
+lib/X11/ccdef/rule.eggfunc
+lib/X11/ccdef/rule.func
+lib/X11/ccdef/rule.greek
+lib/X11/ccdef/rule.hiragana.egg
+lib/X11/ccdef/rule.kana
+lib/X11/ccdef/rule.kana2
+lib/X11/ccdef/rule.katakana.egg
+lib/X11/ccdef/rule.kigou.egg
+lib/X11/ccdef/rule.roma
+lib/X11/ccdef/rule.wnnroma
+lib/X11/ccdef/rule.zascii
Index: pkgsrc/inputmethod/kinput2/PLIST.sj3
diff -u /dev/null pkgsrc/inputmethod/kinput2/PLIST.sj3:1.1
--- /dev/null Sat Jul 25 12:57:02 2026
+++ pkgsrc/inputmethod/kinput2/PLIST.sj3 Sat Jul 25 12:57:02 2026
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST.sj3,v 1.1 2026/07/25 12:57:02 wiz Exp $
+lib/X11/sj3def/sjhk
+lib/X11/sj3def/sjrc
+lib/X11/sj3def/sjrk
+lib/X11/sj3def/sjsb
+lib/X11/sj3def/sjzh