pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/inputmethod mozc: Do not try to build uim-mozc module ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0229fe472137
branches:  trunk
changeset: 449493:0229fe472137
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Wed Mar 31 16:45:35 2021 +0000

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

Fix build, reported by tsutsui@. Thank you.

diffstat:

 inputmethod/ibus-mozc/Makefile     |  5 ++++-
 inputmethod/mozc-elisp/Makefile    |  5 ++++-
 inputmethod/mozc-renderer/Makefile |  5 ++++-
 inputmethod/mozc-server/Makefile   |  5 ++++-
 inputmethod/mozc-tool/Makefile     |  5 ++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diffs (94 lines):

diff -r b147a26318e6 -r 0229fe472137 inputmethod/ibus-mozc/Makefile
--- a/inputmethod/ibus-mozc/Makefile    Wed Mar 31 16:45:08 2021 +0000
+++ b/inputmethod/ibus-mozc/Makefile    Wed Mar 31 16:45:35 2021 +0000
@@ -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-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} \
diff -r b147a26318e6 -r 0229fe472137 inputmethod/mozc-elisp/Makefile
--- a/inputmethod/mozc-elisp/Makefile   Wed Mar 31 16:45:08 2021 +0000
+++ b/inputmethod/mozc-elisp/Makefile   Wed Mar 31 16:45:35 2021 +0000
@@ -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 @@
 
 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 \
diff -r b147a26318e6 -r 0229fe472137 inputmethod/mozc-renderer/Makefile
--- a/inputmethod/mozc-renderer/Makefile        Wed Mar 31 16:45:08 2021 +0000
+++ b/inputmethod/mozc-renderer/Makefile        Wed Mar 31 16:45:35 2021 +0000
@@ -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 @@
 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} \
diff -r b147a26318e6 -r 0229fe472137 inputmethod/mozc-server/Makefile
--- a/inputmethod/mozc-server/Makefile  Wed Mar 31 16:45:08 2021 +0000
+++ b/inputmethod/mozc-server/Makefile  Wed Mar 31 16:45:35 2021 +0000
@@ -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 \
diff -r b147a26318e6 -r 0229fe472137 inputmethod/mozc-tool/Makefile
--- a/inputmethod/mozc-tool/Makefile    Wed Mar 31 16:45:08 2021 +0000
+++ b/inputmethod/mozc-tool/Makefile    Wed Mar 31 16:45:35 2021 +0000
@@ -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 @@
 
 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} \



Home | Main Index | Thread Index | Old Index