Sun Apr 24 22:19:16 2022 UTC ()
mozc-*: move include bsd.pkg.mk to the correct place


(tnn)
diff -r1.74 -r1.75 pkgsrc/inputmethod/ibus-mozc/Makefile
diff -r1.63 -r1.64 pkgsrc/inputmethod/mozc-elisp/Makefile
diff -r1.55 -r1.56 pkgsrc/inputmethod/mozc-renderer/Makefile
diff -r1.72 -r1.73 pkgsrc/inputmethod/mozc-server/Makefile
diff -r1.35 -r1.36 pkgsrc/inputmethod/mozc-server/Makefile.common
diff -r1.69 -r1.70 pkgsrc/inputmethod/mozc-tool/Makefile
diff -r1.55 -r1.56 pkgsrc/inputmethod/uim-mozc/Makefile
cvs diff -r1.74 -r1.75 pkgsrc/inputmethod/ibus-mozc/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus-mozc/Makefile 2022/04/18 19:11:28 1.74
+++ pkgsrc/inputmethod/ibus-mozc/Makefile 2022/04/24 22:19:15 1.75
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.74 2022/04/18 19:11:28 adam Exp $ 1# $NetBSD: Makefile,v 1.75 2022/04/24 22:19:15 tnn Exp $
2 2
3PKGNAME= ibus-${DISTNAME} 3PKGNAME= ibus-${DISTNAME}
4PKGREVISION= 9 4PKGREVISION= 9
5 5
6INSTALLATION_DIRS+= libexec share/ibus share/ibus/component \ 6INSTALLATION_DIRS+= libexec share/ibus share/ibus/component \
7 share/ibus-mozc 7 share/ibus-mozc
8 8
9DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 9DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
10DEPENDS+= mozc-renderer-[0-9]*:../../inputmethod/mozc-renderer 10DEPENDS+= mozc-renderer-[0-9]*:../../inputmethod/mozc-renderer
11DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server 11DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server
12DEPENDS+= mozc-tool-[0-9]*:../../inputmethod/mozc-tool 12DEPENDS+= mozc-tool-[0-9]*:../../inputmethod/mozc-tool
13 13
14pre-configure: 14pre-configure:
@@ -20,13 +20,14 @@ do-build: @@ -20,13 +20,14 @@ do-build:
20 unix/ibus/ibus.gyp:ibus_mozc_lib \ 20 unix/ibus/ibus.gyp:ibus_mozc_lib \
21 unix/ibus/ibus.gyp:ibus_mozc 21 unix/ibus/ibus.gyp:ibus_mozc
22 22
23do-install: 23do-install:
24 ${INSTALL_PROGRAM} ${WRKSRC}/out_${OSDEST}/${MOZC_BUILD_MODE}/ibus_mozc \ 24 ${INSTALL_PROGRAM} ${WRKSRC}/out_${OSDEST}/${MOZC_BUILD_MODE}/ibus_mozc \
25 ${DESTDIR}${PREFIX}/libexec/ibus-engine-mozc 25 ${DESTDIR}${PREFIX}/libexec/ibus-engine-mozc
26 ${INSTALL_DATA} ${WRKSRC}/out_${OSDEST}/${MOZC_BUILD_MODE}/gen/unix/ibus/mozc.xml \ 26 ${INSTALL_DATA} ${WRKSRC}/out_${OSDEST}/${MOZC_BUILD_MODE}/gen/unix/ibus/mozc.xml \
27 ${DESTDIR}${PREFIX}/share/ibus/component 27 ${DESTDIR}${PREFIX}/share/ibus/component
28 ${INSTALL_DATA} ${WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \ 28 ${INSTALL_DATA} ${WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \
29 ${DESTDIR}${PREFIX}/share/ibus-mozc/product_icon.png 29 ${DESTDIR}${PREFIX}/share/ibus-mozc/product_icon.png
30 30
31.include "../../inputmethod/ibus/buildlink3.mk" 31.include "../../inputmethod/ibus/buildlink3.mk"
32.include "../../inputmethod/mozc-server/Makefile.common" 32.include "../../inputmethod/mozc-server/Makefile.common"
 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.63 -r1.64 pkgsrc/inputmethod/mozc-elisp/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/mozc-elisp/Makefile 2022/04/18 19:11:29 1.63
+++ pkgsrc/inputmethod/mozc-elisp/Makefile 2022/04/24 22:19:15 1.64
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.63 2022/04/18 19:11:29 adam Exp $ 1# $NetBSD: Makefile,v 1.64 2022/04/24 22:19:15 tnn Exp $
2 2
3PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/} 3PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
4PKGREVISION= 9 4PKGREVISION= 9
5CATEGORIES= inputmethod editors 5CATEGORIES= inputmethod editors
6 6
7EMACS_MODULES= base leim 7EMACS_MODULES= base leim
8 8
9.include "../../editors/emacs/modules.mk" 9.include "../../editors/emacs/modules.mk"
10 10
11INSTALLATION_DIRS= ${EMACS_LISPPREFIX} bin 11INSTALLATION_DIRS= ${EMACS_LISPPREFIX} bin
12 12
13pre-configure: 13pre-configure:
14 ${RM} ${WRKSRC}/unix/uim/uim.gyp 14 ${RM} ${WRKSRC}/unix/uim/uim.gyp
@@ -20,13 +20,14 @@ do-build: @@ -20,13 +20,14 @@ do-build:
20 cd ${WRKSRC}/unix/emacs && \ 20 cd ${WRKSRC}/unix/emacs && \
21 ${EMACS_BIN} -q -batch -no-site-file -no-init-file \ 21 ${EMACS_BIN} -q -batch -no-site-file -no-init-file \
22 -f batch-byte-compile mozc.el 22 -f batch-byte-compile mozc.el
23 23
24do-install: 24do-install:
25 ${INSTALL_PROGRAM} ${WRKSRC}/out_${OSDEST}/Release/mozc_emacs_helper \ 25 ${INSTALL_PROGRAM} ${WRKSRC}/out_${OSDEST}/Release/mozc_emacs_helper \
26 ${DESTDIR}${PREFIX}/bin 26 ${DESTDIR}${PREFIX}/bin
27 ${INSTALL_DATA} ${WRKSRC}/unix/emacs/mozc.el \ 27 ${INSTALL_DATA} ${WRKSRC}/unix/emacs/mozc.el \
28 ${DESTDIR}${EMACS_LISPPREFIX} 28 ${DESTDIR}${EMACS_LISPPREFIX}
29 ${INSTALL_DATA} ${WRKSRC}/unix/emacs/mozc.elc \ 29 ${INSTALL_DATA} ${WRKSRC}/unix/emacs/mozc.elc \
30 ${DESTDIR}${EMACS_LISPPREFIX} 30 ${DESTDIR}${EMACS_LISPPREFIX}
31 31
32.include "../../inputmethod/mozc-server/Makefile.common" 32.include "../../inputmethod/mozc-server/Makefile.common"
 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.55 -r1.56 pkgsrc/inputmethod/mozc-renderer/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/mozc-renderer/Makefile 2022/04/18 19:11:29 1.55
+++ pkgsrc/inputmethod/mozc-renderer/Makefile 2022/04/24 22:19:15 1.56
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.55 2022/04/18 19:11:29 adam Exp $ 1# $NetBSD: Makefile,v 1.56 2022/04/24 22:19:15 tnn Exp $
2 2
3PKGNAME= ${DISTNAME:S/mozc-/mozc-renderer-/} 3PKGNAME= ${DISTNAME:S/mozc-/mozc-renderer-/}
4PKGREVISION= 9 4PKGREVISION= 9
5 5
6CONFLICTS+= ibus-mozc<=1.13.1651.102 6CONFLICTS+= ibus-mozc<=1.13.1651.102
7 7
8INSTALLATION_DIRS+= libexec share/icons 8INSTALLATION_DIRS+= libexec share/icons
9 9
10DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 10DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
11DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server 11DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server
12 12
13pre-configure: 13pre-configure:
14 ${RM} ${WRKSRC}/unix/uim/uim.gyp 14 ${RM} ${WRKSRC}/unix/uim/uim.gyp
@@ -20,13 +20,14 @@ do-build: @@ -20,13 +20,14 @@ do-build:
20 20
21do-install: 21do-install:
22 ${INSTALL_PROGRAM} ${WRKSRC}/out_${OSDEST}/${MOZC_BUILD_MODE}/mozc_renderer \ 22 ${INSTALL_PROGRAM} ${WRKSRC}/out_${OSDEST}/${MOZC_BUILD_MODE}/mozc_renderer \
23 ${DESTDIR}${PREFIX}/libexec 23 ${DESTDIR}${PREFIX}/libexec
24.for f in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \ 24.for f in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \
25 ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool 25 ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool
26 ${INSTALL_DATA} ${WRKSRC}/data/images/unix/${f}.png \ 26 ${INSTALL_DATA} ${WRKSRC}/data/images/unix/${f}.png \
27 ${DESTDIR}${PREFIX}/share/icons/${f:S/^ui-/mozc-/}.png 27 ${DESTDIR}${PREFIX}/share/icons/${f:S/^ui-/mozc-/}.png
28.endfor 28.endfor
29 ${INSTALL_DATA} ${WRKSRC}/data/images/product_icon_32bpp-128.png \ 29 ${INSTALL_DATA} ${WRKSRC}/data/images/product_icon_32bpp-128.png \
30 ${DESTDIR}${PREFIX}/share/icons/mozc.png 30 ${DESTDIR}${PREFIX}/share/icons/mozc.png
31 31
32.include "../../inputmethod/mozc-server/Makefile.common" 32.include "../../inputmethod/mozc-server/Makefile.common"
 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.72 -r1.73 pkgsrc/inputmethod/mozc-server/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/mozc-server/Makefile 2022/04/18 19:11:29 1.72
+++ pkgsrc/inputmethod/mozc-server/Makefile 2022/04/24 22:19:15 1.73
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1# $NetBSD: Makefile,v 1.72 2022/04/18 19:11:29 adam Exp $ 1# $NetBSD: Makefile,v 1.73 2022/04/24 22:19:15 tnn Exp $
2 2
3PKGNAME= ${DISTNAME:S/mozc-/mozc-server-/} 3PKGNAME= ${DISTNAME:S/mozc-/mozc-server-/}
4PKGREVISION= 9 4PKGREVISION= 9
5 5
6INSTALLATION_DIRS+= libexec 6INSTALLATION_DIRS+= libexec
7 7
8pre-configure: 8pre-configure:
9 ${RM} ${WRKSRC}/unix/uim/uim.gyp 9 ${RM} ${WRKSRC}/unix/uim/uim.gyp
10 10
11do-build: 11do-build:
12 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ 12 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
13 ${PYTHONBIN} build_mozc.py build \ 13 ${PYTHONBIN} build_mozc.py build \
14 -c ${MOZC_BUILD_MODE} \ 14 -c ${MOZC_BUILD_MODE} \
15 dictionary/dictionary_base.gyp:text_dictionary_loader \ 15 dictionary/dictionary_base.gyp:text_dictionary_loader \
16 server/server.gyp:mozc_server 16 server/server.gyp:mozc_server
17 17
18do-install: 18do-install:
19 ${INSTALL_PROGRAM} ${WRKSRC}/out_${OSDEST}/${MOZC_BUILD_MODE}/mozc_server \ 19 ${INSTALL_PROGRAM} ${WRKSRC}/out_${OSDEST}/${MOZC_BUILD_MODE}/mozc_server \
20 ${DESTDIR}${PREFIX}/libexec/mozc_server 20 ${DESTDIR}${PREFIX}/libexec/mozc_server
21 21
22.include "../../inputmethod/mozc-server/Makefile.common" 22.include "../../inputmethod/mozc-server/Makefile.common"
 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.35 -r1.36 pkgsrc/inputmethod/mozc-server/Makefile.common (expand / switch to unified diff)

--- pkgsrc/inputmethod/mozc-server/Makefile.common 2022/04/24 22:16:03 1.35
+++ pkgsrc/inputmethod/mozc-server/Makefile.common 2022/04/24 22:19:15 1.36
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile.common,v 1.35 2022/04/24 22:16:03 tnn Exp $ 1# $NetBSD: Makefile.common,v 1.36 2022/04/24 22:19:15 tnn Exp $
 2
2# used by inputmethod/ibus-mozc/Makefile 3# used by inputmethod/ibus-mozc/Makefile
3# used by inputmethod/mozc-elisp/Makefile 4# used by inputmethod/mozc-elisp/Makefile
4# used by inputmethod/mozc-server/Makefile 5# used by inputmethod/mozc-server/Makefile
5# used by inputmethod/mozc-tool/Makefile 6# used by inputmethod/mozc-tool/Makefile
6# used by inputmethod/mozc-renderer/Makefile 7# used by inputmethod/mozc-renderer/Makefile
7# used by inputmethod/uim-mozc/Makefile 8# used by inputmethod/uim-mozc/Makefile
8# 
9 9
10DISTNAME= mozc-2.26.4282.100 10DISTNAME= mozc-2.26.4282.100
11CATEGORIES= inputmethod 11CATEGORIES= inputmethod
12MASTER_SITES= ${MASTER_SITE_LOCAL} 12MASTER_SITES= ${MASTER_SITE_LOCAL}
13EXTRACT_SUFX= .tar.xz 13EXTRACT_SUFX= .tar.xz
14 14
15MAINTAINER= ryoon@NetBSD.org 15MAINTAINER= ryoon@NetBSD.org
16HOMEPAGE= https://github.com/google/mozc/ 16HOMEPAGE= https://github.com/google/mozc/
17COMMENT= Japanese inputmethod Mozc engine 17COMMENT= Japanese inputmethod Mozc engine
18LICENSE= modified-bsd 18LICENSE= modified-bsd
19 19
20UIM_MOZC= uim-mozc-321.3ea28b1 20UIM_MOZC= uim-mozc-321.3ea28b1
21DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \ 21DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \
@@ -83,14 +83,13 @@ do-configure: @@ -83,14 +83,13 @@ do-configure:
83 --gypdir=${LOCALBASE}/bin 83 --gypdir=${LOCALBASE}/bin
84 84
85.include "../../devel/glib2/buildlink3.mk" 85.include "../../devel/glib2/buildlink3.mk"
86.include "../../devel/protobuf/buildlink3.mk" 86.include "../../devel/protobuf/buildlink3.mk"
87# gmock is not used yet... 87# gmock is not used yet...
88#.include "../../devel/gmock/buildlink3.mk" 88#.include "../../devel/gmock/buildlink3.mk"
89.include "../../inputmethod/zinnia/buildlink3.mk" 89.include "../../inputmethod/zinnia/buildlink3.mk"
90.include "../../www/curl/buildlink3.mk" 90.include "../../www/curl/buildlink3.mk"
91.include "../../x11/gtk2/buildlink3.mk" 91.include "../../x11/gtk2/buildlink3.mk"
92.include "../../x11/qt5-qtbase/buildlink3.mk" 92.include "../../x11/qt5-qtbase/buildlink3.mk"
93 93
94.include "../../lang/python/tool.mk" 94.include "../../lang/python/tool.mk"
95.include "../../mk/atomic64.mk" 95.include "../../mk/atomic64.mk"
96.include "../../mk/bsd.pkg.mk" 
cvs diff -r1.69 -r1.70 pkgsrc/inputmethod/mozc-tool/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/mozc-tool/Makefile 2022/04/18 19:11:29 1.69
+++ pkgsrc/inputmethod/mozc-tool/Makefile 2022/04/24 22:19:15 1.70
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1# $NetBSD: Makefile,v 1.69 2022/04/18 19:11:29 adam Exp $ 1# $NetBSD: Makefile,v 1.70 2022/04/24 22:19:15 tnn Exp $
2 2
3PKGNAME= ${DISTNAME:S/mozc-/mozc-tool-/} 3PKGNAME= ${DISTNAME:S/mozc-/mozc-tool-/}
4PKGREVISION= 9 4PKGREVISION= 9
5 5
6INSTALLATION_DIRS+= libexec 6INSTALLATION_DIRS+= libexec
7 7
8ALL_ENV+= qt_dir=${QTDIR} 8ALL_ENV+= qt_dir=${QTDIR}
9 9
10pre-configure: 10pre-configure:
11 ${RM} ${WRKSRC}/unix/uim/uim.gyp 11 ${RM} ${WRKSRC}/unix/uim/uim.gyp
12 12
13do-build: 13do-build:
14 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ 14 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
15 ${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} \ 15 ${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} \
16 gui/gui.gyp:mozc_tool 16 gui/gui.gyp:mozc_tool
17 17
18do-install: 18do-install:
19 ${INSTALL_PROGRAM} ${WRKSRC}/out_${OSDEST}/${MOZC_BUILD_MODE}/mozc_tool \ 19 ${INSTALL_PROGRAM} ${WRKSRC}/out_${OSDEST}/${MOZC_BUILD_MODE}/mozc_tool \
20 ${DESTDIR}${PREFIX}/libexec 20 ${DESTDIR}${PREFIX}/libexec
21 21
22.include "../../inputmethod/mozc-server/Makefile.common" 22.include "../../inputmethod/mozc-server/Makefile.common"
 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.55 -r1.56 pkgsrc/inputmethod/uim-mozc/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim-mozc/Makefile 2022/04/18 19:11:30 1.55
+++ pkgsrc/inputmethod/uim-mozc/Makefile 2022/04/24 22:19:15 1.56
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.55 2022/04/18 19:11:30 adam Exp $ 1# $NetBSD: Makefile,v 1.56 2022/04/24 22:19:15 tnn Exp $
2 2
3PKGNAME= uim-${DISTNAME} 3PKGNAME= uim-${DISTNAME}
4PKGREVISION= 8 4PKGREVISION= 8
5 5
6CONFLICTS+= ibus-mozc<=1.13.1651.102 6CONFLICTS+= ibus-mozc<=1.13.1651.102
7 7
8INSTALLATION_DIRS+= lib/uim/plugin share/uim/pixmaps 8INSTALLATION_DIRS+= lib/uim/plugin share/uim/pixmaps
9 9
10DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 10DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
11DEPENDS+= mozc-renderer-[0-9]*:../../inputmethod/mozc-renderer 11DEPENDS+= mozc-renderer-[0-9]*:../../inputmethod/mozc-renderer
12DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server 12DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server
13DEPENDS+= mozc-tool-[0-9]*:../../inputmethod/mozc-tool 13DEPENDS+= mozc-tool-[0-9]*:../../inputmethod/mozc-tool
14 14
@@ -39,13 +39,14 @@ do-install: @@ -39,13 +39,14 @@ do-install:
39 ${DESTDIR}${PREFIX}/share/uim/pixmaps/mozc_tool_dictionary_tool.png 39 ${DESTDIR}${PREFIX}/share/uim/pixmaps/mozc_tool_dictionary_tool.png
40 ${INSTALL_DATA} ${WRKSRC}/scm/mozc-custom.scm \ 40 ${INSTALL_DATA} ${WRKSRC}/scm/mozc-custom.scm \
41 ${DESTDIR}${PREFIX}/share/uim 41 ${DESTDIR}${PREFIX}/share/uim
42 ${INSTALL_DATA} ${WRKSRC}/scm/mozc-key-custom.scm \ 42 ${INSTALL_DATA} ${WRKSRC}/scm/mozc-key-custom.scm \
43 ${DESTDIR}${PREFIX}/share/uim 43 ${DESTDIR}${PREFIX}/share/uim
44 ${INSTALL_DATA} ${WRKSRC}/scm/mozc.scm \ 44 ${INSTALL_DATA} ${WRKSRC}/scm/mozc.scm \
45 ${DESTDIR}${PREFIX}/share/uim 45 ${DESTDIR}${PREFIX}/share/uim
46 46
47UIM_MODULES= mozc 47UIM_MODULES= mozc
48.include "../../inputmethod/uim/modules.mk" 48.include "../../inputmethod/uim/modules.mk"
49 49
50.include "../../inputmethod/uim/buildlink3.mk" 50.include "../../inputmethod/uim/buildlink3.mk"
51.include "../../inputmethod/mozc-server/Makefile.common" 51.include "../../inputmethod/mozc-server/Makefile.common"
 52.include "../../mk/bsd.pkg.mk"