CVS commit: pkgsrc/inputmethod

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Apr 24 22:19:16 UTC 2022

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-*: move include bsd.pkg.mk to the correct place


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 pkgsrc/inputmethod/ibus-mozc/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/inputmethod/mozc-elisp/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/inputmethod/mozc-renderer/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/inputmethod/mozc-server/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/inputmethod/mozc-server/Makefile.common
cvs rdiff -u -r1.69 -r1.70 pkgsrc/inputmethod/mozc-tool/Makefile
cvs rdiff -u -r1.55 -r1.56 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.74 pkgsrc/inputmethod/ibus-mozc/Makefile:1.75
--- pkgsrc/inputmethod/ibus-mozc/Makefile:1.74  Mon Apr 18 19:11:28 2022
+++ pkgsrc/inputmethod/ibus-mozc/Makefile       Sun Apr 24 22:19:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2022/04/18 19:11:28 adam Exp $
+# $NetBSD: Makefile,v 1.75 2022/04/24 22:19:15 tnn Exp $
 
 PKGNAME=       ibus-${DISTNAME}
 PKGREVISION=   9
@@ -30,3 +30,4 @@ do-install:
 
 .include "../../inputmethod/ibus/buildlink3.mk"
 .include "../../inputmethod/mozc-server/Makefile.common"
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/inputmethod/mozc-elisp/Makefile
diff -u pkgsrc/inputmethod/mozc-elisp/Makefile:1.63 pkgsrc/inputmethod/mozc-elisp/Makefile:1.64
--- pkgsrc/inputmethod/mozc-elisp/Makefile:1.63 Mon Apr 18 19:11:29 2022
+++ pkgsrc/inputmethod/mozc-elisp/Makefile      Sun Apr 24 22:19:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2022/04/18 19:11:29 adam Exp $
+# $NetBSD: Makefile,v 1.64 2022/04/24 22:19:15 tnn Exp $
 
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
 PKGREVISION=   9
@@ -30,3 +30,4 @@ do-install:
                ${DESTDIR}${EMACS_LISPPREFIX}
 
 .include "../../inputmethod/mozc-server/Makefile.common"
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/inputmethod/mozc-renderer/Makefile
diff -u pkgsrc/inputmethod/mozc-renderer/Makefile:1.55 pkgsrc/inputmethod/mozc-renderer/Makefile:1.56
--- pkgsrc/inputmethod/mozc-renderer/Makefile:1.55      Mon Apr 18 19:11:29 2022
+++ pkgsrc/inputmethod/mozc-renderer/Makefile   Sun Apr 24 22:19:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2022/04/18 19:11:29 adam Exp $
+# $NetBSD: Makefile,v 1.56 2022/04/24 22:19:15 tnn Exp $
 
 PKGNAME=       ${DISTNAME:S/mozc-/mozc-renderer-/}
 PKGREVISION=   9
@@ -30,3 +30,4 @@ do-install:
                ${DESTDIR}${PREFIX}/share/icons/mozc.png
 
 .include "../../inputmethod/mozc-server/Makefile.common"
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/inputmethod/mozc-server/Makefile
diff -u pkgsrc/inputmethod/mozc-server/Makefile:1.72 pkgsrc/inputmethod/mozc-server/Makefile:1.73
--- pkgsrc/inputmethod/mozc-server/Makefile:1.72        Mon Apr 18 19:11:29 2022
+++ pkgsrc/inputmethod/mozc-server/Makefile     Sun Apr 24 22:19:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2022/04/18 19:11:29 adam Exp $
+# $NetBSD: Makefile,v 1.73 2022/04/24 22:19:15 tnn Exp $
 
 PKGNAME=       ${DISTNAME:S/mozc-/mozc-server-/}
 PKGREVISION=   9
@@ -20,3 +20,4 @@ do-install:
                ${DESTDIR}${PREFIX}/libexec/mozc_server
 
 .include "../../inputmethod/mozc-server/Makefile.common"
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/inputmethod/mozc-server/Makefile.common
diff -u pkgsrc/inputmethod/mozc-server/Makefile.common:1.35 pkgsrc/inputmethod/mozc-server/Makefile.common:1.36
--- pkgsrc/inputmethod/mozc-server/Makefile.common:1.35 Sun Apr 24 22:16:03 2022
+++ pkgsrc/inputmethod/mozc-server/Makefile.common      Sun Apr 24 22:19:15 2022
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.35 2022/04/24 22:16:03 tnn Exp $
+# $NetBSD: Makefile.common,v 1.36 2022/04/24 22:19:15 tnn Exp $
+
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
 # used by inputmethod/mozc-server/Makefile
 # used by inputmethod/mozc-tool/Makefile
 # used by inputmethod/mozc-renderer/Makefile
 # used by inputmethod/uim-mozc/Makefile
-#
 
 DISTNAME=      mozc-2.26.4282.100
 CATEGORIES=    inputmethod
@@ -93,4 +93,3 @@ do-configure:
 
 .include "../../lang/python/tool.mk"
 .include "../../mk/atomic64.mk"
-.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/inputmethod/mozc-tool/Makefile
diff -u pkgsrc/inputmethod/mozc-tool/Makefile:1.69 pkgsrc/inputmethod/mozc-tool/Makefile:1.70
--- pkgsrc/inputmethod/mozc-tool/Makefile:1.69  Mon Apr 18 19:11:29 2022
+++ pkgsrc/inputmethod/mozc-tool/Makefile       Sun Apr 24 22:19:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2022/04/18 19:11:29 adam Exp $
+# $NetBSD: Makefile,v 1.70 2022/04/24 22:19:15 tnn Exp $
 
 PKGNAME=       ${DISTNAME:S/mozc-/mozc-tool-/}
 PKGREVISION=   9
@@ -20,3 +20,4 @@ do-install:
                ${DESTDIR}${PREFIX}/libexec
 
 .include "../../inputmethod/mozc-server/Makefile.common"
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/inputmethod/uim-mozc/Makefile
diff -u pkgsrc/inputmethod/uim-mozc/Makefile:1.55 pkgsrc/inputmethod/uim-mozc/Makefile:1.56
--- pkgsrc/inputmethod/uim-mozc/Makefile:1.55   Mon Apr 18 19:11:30 2022
+++ pkgsrc/inputmethod/uim-mozc/Makefile        Sun Apr 24 22:19:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2022/04/18 19:11:30 adam Exp $
+# $NetBSD: Makefile,v 1.56 2022/04/24 22:19:15 tnn Exp $
 
 PKGNAME=       uim-${DISTNAME}
 PKGREVISION=   8
@@ -49,3 +49,4 @@ UIM_MODULES=  mozc
 
 .include "../../inputmethod/uim/buildlink3.mk"
 .include "../../inputmethod/mozc-server/Makefile.common"
+.include "../../mk/bsd.pkg.mk"