CVS commit: pkgsrc/inputmethod

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Mar 31 16:45:35 UTC 2021

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

Log Message:
mozc: Do not try to build uim-mozc module for non-uim-mozc packages

Fix build, reported by tsutsui@. Thank you.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/inputmethod/ibus-mozc/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/inputmethod/mozc-elisp/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/inputmethod/mozc-renderer/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/inputmethod/mozc-server/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/inputmethod/mozc-tool/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.65 pkgsrc/inputmethod/ibus-mozc/Makefile:1.66
--- pkgsrc/inputmethod/ibus-mozc/Makefile:1.65  Sat Feb 27 04:19:46 2021
+++ pkgsrc/inputmethod/ibus-mozc/Makefile       Wed Mar 31 16:45:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2021/02/27 04:19:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.66 2021/03/31 16:45:35 ryoon Exp $
 
 PKGNAME=       ibus-${DISTNAME}
 PKGREVISION=   1
@@ -11,6 +11,9 @@ DEPENDS+=     mozc-renderer-[0-9]*:../../inp
 DEPENDS+=      mozc-server-[0-9]*:../../inputmethod/mozc-server
 DEPENDS+=      mozc-tool-[0-9]*:../../inputmethod/mozc-tool
 
+pre-configure:
+       ${RM} ${WRKSRC}/unix/uim/uim.gyp
+
 do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
                ${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} \

Index: pkgsrc/inputmethod/mozc-elisp/Makefile
diff -u pkgsrc/inputmethod/mozc-elisp/Makefile:1.54 pkgsrc/inputmethod/mozc-elisp/Makefile:1.55
--- pkgsrc/inputmethod/mozc-elisp/Makefile:1.54 Sat Feb 27 04:19:46 2021
+++ pkgsrc/inputmethod/mozc-elisp/Makefile      Wed Mar 31 16:45:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2021/02/27 04:19:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.55 2021/03/31 16:45:35 ryoon Exp $
 
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
 PKGREVISION=   1
@@ -10,6 +10,9 @@ EMACS_MODULES=        base leim
 
 INSTALLATION_DIRS=     ${EMACS_LISPPREFIX} bin
 
+pre-configure:
+       ${RM} ${WRKSRC}/unix/uim/uim.gyp
+
 do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
                ${PYTHONBIN} build_mozc.py build -c Release \

Index: pkgsrc/inputmethod/mozc-renderer/Makefile
diff -u pkgsrc/inputmethod/mozc-renderer/Makefile:1.46 pkgsrc/inputmethod/mozc-renderer/Makefile:1.47
--- pkgsrc/inputmethod/mozc-renderer/Makefile:1.46      Sat Feb 27 04:19:46 2021
+++ pkgsrc/inputmethod/mozc-renderer/Makefile   Wed Mar 31 16:45:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2021/02/27 04:19:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.47 2021/03/31 16:45:35 ryoon Exp $
 
 PKGNAME=       ${DISTNAME:S/mozc-/mozc-renderer-/}
 PKGREVISION=   1
@@ -10,6 +10,9 @@ INSTALLATION_DIRS+=   libexec share/icons
 DEPENDS+=      xdg-utils-[0-9]*:../../misc/xdg-utils
 DEPENDS+=      mozc-server-[0-9]*:../../inputmethod/mozc-server
 
+pre-configure:
+       ${RM} ${WRKSRC}/unix/uim/uim.gyp
+
 do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
                ${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} \

Index: pkgsrc/inputmethod/mozc-server/Makefile
diff -u pkgsrc/inputmethod/mozc-server/Makefile:1.63 pkgsrc/inputmethod/mozc-server/Makefile:1.64
--- pkgsrc/inputmethod/mozc-server/Makefile:1.63        Sat Feb 27 04:19:46 2021
+++ pkgsrc/inputmethod/mozc-server/Makefile     Wed Mar 31 16:45:35 2021
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.63 2021/02/27 04:19:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.64 2021/03/31 16:45:35 ryoon Exp $
 
 PKGNAME=       ${DISTNAME:S/mozc-/mozc-server-/}
 PKGREVISION=   1
 
 INSTALLATION_DIRS+=    libexec
 
+pre-configure:
+       ${RM} ${WRKSRC}/unix/uim/uim.gyp
+
 do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
                ${PYTHONBIN} build_mozc.py build \

Index: pkgsrc/inputmethod/mozc-tool/Makefile
diff -u pkgsrc/inputmethod/mozc-tool/Makefile:1.60 pkgsrc/inputmethod/mozc-tool/Makefile:1.61
--- pkgsrc/inputmethod/mozc-tool/Makefile:1.60  Sat Feb 27 04:19:46 2021
+++ pkgsrc/inputmethod/mozc-tool/Makefile       Wed Mar 31 16:45:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2021/02/27 04:19:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.61 2021/03/31 16:45:35 ryoon Exp $
 
 PKGNAME=       ${DISTNAME:S/mozc-/mozc-tool-/}
 PKGREVISION=   1
@@ -7,6 +7,9 @@ INSTALLATION_DIRS+=     libexec
 
 ALL_ENV+=      qt_dir=${QTDIR}
 
+pre-configure:
+       ${RM} ${WRKSRC}/unix/uim/uim.gyp
+
 do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
                ${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} \