CVS commit: [pkgsrc-2023Q4] pkgsrc/inputmethod

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Thu Jan 11 16:45:40 UTC 2024

Modified Files:
        pkgsrc/inputmethod/ibus-mozc [pkgsrc-2023Q4]: Makefile
        pkgsrc/inputmethod/mozc-elisp [pkgsrc-2023Q4]: Makefile
        pkgsrc/inputmethod/mozc-renderer [pkgsrc-2023Q4]: Makefile
        pkgsrc/inputmethod/mozc-server [pkgsrc-2023Q4]: Makefile
            Makefile.common
        pkgsrc/inputmethod/mozc-tool [pkgsrc-2023Q4]: Makefile
        pkgsrc/inputmethod/uim-mozc [pkgsrc-2023Q4]: Makefile

Log Message:
Pullup ticket #6831 - requested by ryoon
inputmethod/mozc-server: build fix

Revisions pulled up:
- inputmethod/ibus-mozc/Makefile                                1.91
- inputmethod/mozc-elisp/Makefile                               1.81
- inputmethod/mozc-renderer/Makefile                            1.72
- inputmethod/mozc-server/Makefile                              1.89
- inputmethod/mozc-server/Makefile.common                       1.39-1.40
- inputmethod/mozc-tool/Makefile                                1.86
- inputmethod/uim-mozc/Makefile                                 1.72

---
   Module Name: pkgsrc
   Committed By:        ryoon
   Date:                Mon Jan  1 11:53:13 UTC 2024

   Modified Files:
        pkgsrc/inputmethod/mozc-server: Makefile.common

   Log Message:
   mozc-server: Fix build failure

   * Use internal protobuf and abseil.

---
   Module Name: pkgsrc
   Committed By:        ryoon
   Date:                Mon Jan  1 16:05:23 UTC 2024

   Modified Files:
        pkgsrc/inputmethod/ibus-mozc: Makefile
        pkgsrc/inputmethod/mozc-elisp: Makefile
        pkgsrc/inputmethod/mozc-renderer: Makefile
        pkgsrc/inputmethod/mozc-server: Makefile Makefile.common
        pkgsrc/inputmethod/mozc-tool: Makefile
        pkgsrc/inputmethod/uim-mozc: Makefile

   Log Message:
   mozc-*, ibus-mozc, uim-mozc: Remove unused protobuf dependency

   * Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.90.2.1 pkgsrc/inputmethod/ibus-mozc/Makefile
cvs rdiff -u -r1.80 -r1.80.2.1 pkgsrc/inputmethod/mozc-elisp/Makefile
cvs rdiff -u -r1.71 -r1.71.2.1 pkgsrc/inputmethod/mozc-renderer/Makefile
cvs rdiff -u -r1.88 -r1.88.2.1 pkgsrc/inputmethod/mozc-server/Makefile
cvs rdiff -u -r1.38 -r1.38.4.1 pkgsrc/inputmethod/mozc-server/Makefile.common
cvs rdiff -u -r1.85 -r1.85.2.1 pkgsrc/inputmethod/mozc-tool/Makefile
cvs rdiff -u -r1.71 -r1.71.2.1 pkgsrc/inputmethod/uim-mozc/Makefile

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

Modified files:

Index: pkgsrc/inputmethod/ibus-mozc/Makefile
diff -u pkgsrc/inputmethod/ibus-mozc/Makefile:1.90 pkgsrc/inputmethod/ibus-mozc/Makefile:1.90.2.1
--- pkgsrc/inputmethod/ibus-mozc/Makefile:1.90  Wed Nov 15 18:14:43 2023
+++ pkgsrc/inputmethod/ibus-mozc/Makefile       Thu Jan 11 16:45:39 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2023/11/15 18:14:43 wiz Exp $
+# $NetBSD: Makefile,v 1.90.2.1 2024/01/11 16:45:39 bsiegert Exp $
 
 PKGNAME=       ibus-${DISTNAME}
-PKGREVISION=   24
+PKGREVISION=   25
 
 INSTALLATION_DIRS+=    libexec share/ibus share/ibus/component \
                        share/ibus-mozc

Index: pkgsrc/inputmethod/mozc-elisp/Makefile
diff -u pkgsrc/inputmethod/mozc-elisp/Makefile:1.80 pkgsrc/inputmethod/mozc-elisp/Makefile:1.80.2.1
--- pkgsrc/inputmethod/mozc-elisp/Makefile:1.80 Wed Nov 15 18:14:43 2023
+++ pkgsrc/inputmethod/mozc-elisp/Makefile      Thu Jan 11 16:45:39 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2023/11/15 18:14:43 wiz Exp $
+# $NetBSD: Makefile,v 1.80.2.1 2024/01/11 16:45:39 bsiegert Exp $
 
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
-PKGREVISION=   25
+PKGREVISION=   26
 CATEGORIES=    inputmethod editors
 
 EMACS_MODULES= base leim

Index: pkgsrc/inputmethod/mozc-renderer/Makefile
diff -u pkgsrc/inputmethod/mozc-renderer/Makefile:1.71 pkgsrc/inputmethod/mozc-renderer/Makefile:1.71.2.1
--- pkgsrc/inputmethod/mozc-renderer/Makefile:1.71      Wed Nov 15 18:14:43 2023
+++ pkgsrc/inputmethod/mozc-renderer/Makefile   Thu Jan 11 16:45:40 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2023/11/15 18:14:43 wiz Exp $
+# $NetBSD: Makefile,v 1.71.2.1 2024/01/11 16:45:40 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/mozc-/mozc-renderer-/}
-PKGREVISION=   24
+PKGREVISION=   25
 
 CONFLICTS+=    ibus-mozc<=1.13.1651.102
 

Index: pkgsrc/inputmethod/mozc-server/Makefile
diff -u pkgsrc/inputmethod/mozc-server/Makefile:1.88 pkgsrc/inputmethod/mozc-server/Makefile:1.88.2.1
--- pkgsrc/inputmethod/mozc-server/Makefile:1.88        Wed Nov 15 18:14:43 2023
+++ pkgsrc/inputmethod/mozc-server/Makefile     Thu Jan 11 16:45:40 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.88 2023/11/15 18:14:43 wiz Exp $
+# $NetBSD: Makefile,v 1.88.2.1 2024/01/11 16:45:40 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/mozc-/mozc-server-/}
-PKGREVISION=   24
+PKGREVISION=   25
 
 INSTALLATION_DIRS+=    libexec
 

Index: pkgsrc/inputmethod/mozc-server/Makefile.common
diff -u pkgsrc/inputmethod/mozc-server/Makefile.common:1.38 pkgsrc/inputmethod/mozc-server/Makefile.common:1.38.4.1
--- pkgsrc/inputmethod/mozc-server/Makefile.common:1.38 Tue Jul 18 18:22:11 2023
+++ pkgsrc/inputmethod/mozc-server/Makefile.common      Thu Jan 11 16:45:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2023/07/18 18:22:11 nia Exp $
+# $NetBSD: Makefile.common,v 1.38.4.1 2024/01/11 16:45:40 bsiegert Exp $
 
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
@@ -78,13 +78,12 @@ BUILDLINK_TRANSFORM+=       rm:-Werror=char-su
 
 do-configure:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-               GYP_DEFINES="use_libprotobuf=1" \
                ${PYTHONBIN} build_mozc.py \
                gyp \
                --gypdir=${LOCALBASE}/bin
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/protobuf/buildlink3.mk"
+#.include "../../devel/protobuf/buildlink3.mk"
 # gmock is not used yet...
 #.include "../../devel/gmock/buildlink3.mk"
 .include "../../inputmethod/zinnia/buildlink3.mk"

Index: pkgsrc/inputmethod/mozc-tool/Makefile
diff -u pkgsrc/inputmethod/mozc-tool/Makefile:1.85 pkgsrc/inputmethod/mozc-tool/Makefile:1.85.2.1
--- pkgsrc/inputmethod/mozc-tool/Makefile:1.85  Wed Nov 15 18:14:43 2023
+++ pkgsrc/inputmethod/mozc-tool/Makefile       Thu Jan 11 16:45:40 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.85 2023/11/15 18:14:43 wiz Exp $
+# $NetBSD: Makefile,v 1.85.2.1 2024/01/11 16:45:40 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/mozc-/mozc-tool-/}
-PKGREVISION=   24
+PKGREVISION=   25
 
 INSTALLATION_DIRS+=    libexec
 

Index: pkgsrc/inputmethod/uim-mozc/Makefile
diff -u pkgsrc/inputmethod/uim-mozc/Makefile:1.71 pkgsrc/inputmethod/uim-mozc/Makefile:1.71.2.1
--- pkgsrc/inputmethod/uim-mozc/Makefile:1.71   Wed Nov 15 18:14:43 2023
+++ pkgsrc/inputmethod/uim-mozc/Makefile        Thu Jan 11 16:45:40 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2023/11/15 18:14:43 wiz Exp $
+# $NetBSD: Makefile,v 1.71.2.1 2024/01/11 16:45:40 bsiegert Exp $
 
 PKGNAME=       uim-${DISTNAME}
-PKGREVISION=   23
+PKGREVISION=   24
 
 CONFLICTS+=    ibus-mozc<=1.13.1651.102