diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile index 81f07bc585d6..8af48d2501df 100644 --- a/japanese/scim-uim/Makefile +++ b/japanese/scim-uim/Makefile @@ -1,23 +1,23 @@ # Created by: Seiya Yanagita PORTNAME= scim-uim PORTVERSION= 0.2.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= japanese MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION} \ http://freedesktop.org/~suzhe/sources/ MAINTAINER= s_yanagita@ybb.ne.jp COMMENT= SCIM IMEngine module using UIM input method library BUILD_DEPENDS= scim:textproc/scim LIB_DEPENDS= libuim.so:textproc/uim RUN_DEPENDS:= ${BUILD_DEPENDS} USES= gmake iconv libtool:keepla pkgconfig GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .include diff --git a/japanese/uim-anthy/Makefile b/japanese/uim-anthy/Makefile index 46aceff818d4..5a709e3ca8cf 100644 --- a/japanese/uim-anthy/Makefile +++ b/japanese/uim-anthy/Makefile @@ -1,46 +1,47 @@ # Created by: MANTANI Nobutaka CATEGORIES= japanese .if defined(WITHOUT_X11) PKGNAMESUFFIX= -anthy-nox11 .else PKGNAMESUFFIX= -anthy .endif COMMENT= Uim plugin using Anthy input method .if !defined(WITHOUT_X11) USE_GNOME= cairo gdkpixbuf2 gtk30 .endif LIB_DEPENDS= libanthy.so:japanese/anthy \ libfreetype.so:print/freetype2 \ libuim.so:textproc/uim \ - libfontconfig.so:x11-fonts/fontconfig + libfontconfig.so:x11-fonts/fontconfig \ + libharfbuzz.so:print/harfbuzz MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} CONFIGURE_ARGS= --with-anthy --with-anthy-utf8 .if !defined(WITHOUT_X11) CONFIGURE_ARGS+= --with-gtk3 --enable-dict .endif UIM_SLAVE= yes do-build: (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-anthy.la) (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-anthy-utf8.la) .if !defined(WITHOUT_X11) (cd ${WRKSRC}/gtk3/dict && ${MAKE_CMD} uim-dict-gtk3) .endif do-install: (cd ${WRKSRC}/uim && \ - ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy.la install-uim_pluginLTLIBRARIES && \ - ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la install-uim_pluginLTLIBRARIES) + ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy.la INSTALL_STRIP_FLAG=-s install-uim_pluginLTLIBRARIES && \ + ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la INSTALL_STRIP_FLAG=-s install-uim_pluginLTLIBRARIES) .if !defined(WITHOUT_X11) - (cd ${WRKSRC}/gtk3/dict && ${MAKE_CMD} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk3 install-binPROGRAMS install-uim_dict_uiDATA) + (cd ${WRKSRC}/gtk3/dict && ${MAKE_CMD} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk3 INSTALL_STRIP_FLAG=-s install-binPROGRAMS install-uim_dict_uiDATA) .endif .include "${MASTERDIR}/Makefile" diff --git a/japanese/uim-mozc/Makefile b/japanese/uim-mozc/Makefile index b22d0302ecea..f524a403a17f 100644 --- a/japanese/uim-mozc/Makefile +++ b/japanese/uim-mozc/Makefile @@ -1,15 +1,15 @@ # Created by: Koichiro IWAO -PORTREVISION= 4 +PORTREVISION= 5 PKGNAMEPREFIX= ja-uim- COMMENT= Mozc engine for uim MASTERDIR= ${.CURDIR}/../../japanese/mozc-server FILESDIR= ${.CURDIR}/files DATADIR= ${PREFIX}/share/uim SUB_FILES= pkg-message BUILD_MOZC_LIST=uim_mozc .include "${MASTERDIR}/Makefile" diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile index 75f279f3bb47..f5268e9727ad 100644 --- a/japanese/uim-tomoe-gtk/Makefile +++ b/japanese/uim-tomoe-gtk/Makefile @@ -1,25 +1,25 @@ # Created by: Hajimu UMEMOTO PORTNAME= uim-tomoe-gtk PORTVERSION= 0.6.0 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= japanese MASTER_SITES= SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ume@FreeBSD.org COMMENT= UIM helper program for Tomoe LIB_DEPENDS= libtomoe.so:japanese/tomoe \ libtomoe-gtk.so:japanese/libtomoe-gtk \ libuim.so:textproc/uim USES= gettext gmake gnome libtool pkgconfig USE_GNOME= gtk20 intltool GNU_CONFIGURE= yes PLIST_FILES= bin/uim-tomoe-gtk \ share/locale/ja/LC_MESSAGES/uim-tomoe-gtk.mo CONFIGURE_ENV+= GMSGFMT="${LOCALBASE}/bin/msgfmt" .include diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile index 76299f899ed5..1722836fcc8c 100644 --- a/textproc/uim-el/Makefile +++ b/textproc/uim-el/Makefile @@ -1,53 +1,53 @@ # Created by: MANTANI Nobutaka PORTNAME= uim-el -PORTVERSION= 1.8.9.b.20210104 -PORTREVISION= 3 +PORTVERSION= 1.8.9.b.${SNAPDATE} CATEGORIES= textproc PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} -#DISTNAME= uim-${PORTVERSION} MAINTAINER= nobutaka@FreeBSD.org COMMENT?= Emacs lisp for uim input method library LICENSE= BSD3CLAUSE GPLv2+ GPLv3+ LGPL21+ PD LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= uim-el-agent:textproc/uim USES= autoreconf:build emacs gettext gmake gnome iconv libtool pathfix perl5 pkgconfig USE_GNOME= intltool USE_PERL5= build USE_GITHUB= yes GH_ACCOUNT= uim GH_PROJECT= uim -GH_TAGNAME= d1ac9d9 +GH_TAGNAME= 6d8fcc8 + +SNAPDATE= 20220318 GNU_CONFIGURE= yes BUILD_WRKSRC= ${WRKSRC}/emacs INSTALL_WRKSRC= ${WRKSRC}/emacs CONFIGURE_ARGS?=--enable-maintainer-mode --enable-emacs \ --with-lispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR} CONFIGURE_ENV= EMACS="${EMACS_CMD}" CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib DOCSDIR_JA= ${PREFIX}/share/doc/ja/uim-el PLIST_SUB+= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}" OPTIONS_DEFINE= DOCS pre-configure: cd ${WRKSRC} && ./autogen.sh post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${DOCSDIR_JA} ${INSTALL_DATA} ${WRKSRC}/emacs/README ${STAGEDIR}${DOCSDIR}/README ${INSTALL_DATA} ${WRKSRC}/emacs/README.ja ${STAGEDIR}${DOCSDIR_JA}/README.ja .include diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo index 51504dd1929c..6d1a392557f9 100644 --- a/textproc/uim-el/distinfo +++ b/textproc/uim-el/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619703401 -SHA256 (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = e187667560eb920201c93a6af104868c7c86b0d61364f6f7a20b33416c15a935 -SIZE (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = 4052581 +TIMESTAMP = 1651686460 +SHA256 (uim-uim-1.8.9.b.20220318-6d8fcc8_GH0.tar.gz) = 5fc53cca4e8505d71ea8e54cf5a0ad6398c7435be7fbbd7016623f36c5b2a565 +SIZE (uim-uim-1.8.9.b.20220318-6d8fcc8_GH0.tar.gz) = 4052477 diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile index 1e4b8c10dc1a..6fbe5900df87 100644 --- a/textproc/uim-gtk/Makefile +++ b/textproc/uim-gtk/Makefile @@ -1,29 +1,30 @@ # Created by: MANTANI Nobutaka PKGNAMESUFFIX= -gtk COMMENT= GTK+ modules of uim input method USE_GNOME= cairo gdkpixbuf2 gtk20 LIB_DEPENDS= libuim.so:textproc/uim \ libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} CONFIGURE_ARGS= --with-gtk2 --enable-pref UIM_SLAVE= yes .if defined(WITHOUT_X11) IGNORE= requires X11 .endif do-build: (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la) (cd ${WRKSRC}/gtk2 && ${MAKE_CMD}) do-install: - (cd ${WRKSRC}/gtk2 && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk2 && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip) .include "${MASTERDIR}/Makefile" diff --git a/textproc/uim-gtk3/Makefile b/textproc/uim-gtk3/Makefile index 80bbb0cab30f..60571873bd48 100644 --- a/textproc/uim-gtk3/Makefile +++ b/textproc/uim-gtk3/Makefile @@ -1,35 +1,36 @@ # Created by: MANTANI Nobutaka PKGNAMESUFFIX= -gtk3 COMMENT= GTK+ 3.x modules of uim input method USE_GNOME= cairo gdkpixbuf2 gtk30 -LIB_DEPENDS= libuim.so:textproc/uim +LIB_DEPENDS= libuim.so:textproc/uim \ + libharfbuzz.so:print/harfbuzz MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} CONFIGURE_ARGS= --with-gtk3 --enable-pref --enable-default-toolkit=gtk3 UIM_SLAVE= yes .if defined(WITHOUT_X11) IGNORE= requires X11 .endif do-build: (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la) (cd ${WRKSRC}/gtk3/immodule && ${MAKE_CMD}) (cd ${WRKSRC}/gtk3/pad && ${MAKE_CMD}) (cd ${WRKSRC}/gtk3/pref && ${MAKE_CMD}) (cd ${WRKSRC}/gtk3/switcher && ${MAKE_CMD}) (cd ${WRKSRC}/gtk3/toolbar && ${MAKE_CMD}) do-install: - (cd ${WRKSRC}/gtk3/immodule && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) - (cd ${WRKSRC}/gtk3/pad && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) - (cd ${WRKSRC}/gtk3/pref && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) - (cd ${WRKSRC}/gtk3/switcher && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) - (cd ${WRKSRC}/gtk3/toolbar && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk3/immodule && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip) + (cd ${WRKSRC}/gtk3/pad && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip) + (cd ${WRKSRC}/gtk3/pref && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip) + (cd ${WRKSRC}/gtk3/switcher && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip) + (cd ${WRKSRC}/gtk3/toolbar && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip) .include "${MASTERDIR}/Makefile" diff --git a/textproc/uim-m17nlib/Makefile b/textproc/uim-m17nlib/Makefile index 6be918defd9f..e15c633b02a5 100644 --- a/textproc/uim-m17nlib/Makefile +++ b/textproc/uim-m17nlib/Makefile @@ -1,38 +1,38 @@ # Created by: MANTANI Nobutaka .if defined(WITHOUT_X11) PKGNAMESUFFIX= -m17nlib-nox11 .else PKGNAMESUFFIX= -m17nlib .endif COMMENT= Uim plugin using m17n library input method BUILD_DEPENDS= m17n-db:devel/m17n-db LIB_DEPENDS= libm17n.so:devel/m17n-lib \ libuim.so:textproc/uim RUN_DEPENDS= m17n-db:devel/m17n-db .if !defined(WITHOUT_M17NCONTRIB) RUN_DEPENDS+= ${LOCALBASE}/share/m17n/icons/as-phonetic.png:devel/m17n-db .endif MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} CONFIGURE_ARGS= --with-m17nlib UIM_SLAVE= yes do-build: (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-m17nlib.la) do-install: (cd ${WRKSRC}/uim && \ - ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-m17nlib.la install-uim_pluginLTLIBRARIES && \ + ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-m17nlib.la INSTALL_STRIP_FLAG=-s install-uim_pluginLTLIBRARIES && \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/uim/pixmaps && \ DESTDIR="${STAGEDIR}" ${SH} ../pixmaps/uim-m17nlib-relink-icons) post-install: @${FIND} ${LOCALBASE}/share/m17n/icons/ -name '*.png' -execdir ${ECHO} share/uim/pixmaps/m17n-{} \; >>${TMPPLIST} .include "${MASTERDIR}/Makefile" diff --git a/textproc/uim-qt5/Makefile b/textproc/uim-qt5/Makefile index 166008838a7e..f6c9ef2145d6 100644 --- a/textproc/uim-qt5/Makefile +++ b/textproc/uim-qt5/Makefile @@ -1,40 +1,35 @@ -PORTREVISION= 1 PKGNAMESUFFIX= -qt5 COMMENT= Qt5 modules of uim input method -LICENSE= BSD3CLAUSE GPLv2+ GPLv3+ LGPL21+ PD -LICENSE_COMB= multi -LICENSE_FILE= ${WRKSRC}/COPYING - BUILD_DEPENDS= cmake:devel/cmake LIB_DEPENDS= libuim.so:textproc/uim USES= compiler:c++11-lang gl iconv kde:5 libtool qt:5 USE_GL= gl USE_KDE= plasma-framework USE_QT= buildtools_build core declarative gui network qmake_build widgets x11extras MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-qt5 --with-qt5-immodule CONFIGURE_ENV= DATADIRNAME="share" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include UIM_SLAVE= yes .if defined(WITHOUT_X11) IGNORE= cannot be built without X11. Please, unset WITHOUT_X11 .endif do-build: (cd ${WRKSRC}/uim && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la) (cd ${WRKSRC}/replace && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}) (cd ${WRKSRC}/qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}) do-install: - (cd ${WRKSRC}/qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip) .include "${MASTERDIR}/Makefile" diff --git a/textproc/uim-qt5/pkg-plist b/textproc/uim-qt5/pkg-plist index dfc89becb0f1..a3630246057c 100644 --- a/textproc/uim-qt5/pkg-plist +++ b/textproc/uim-qt5/pkg-plist @@ -1,13 +1,14 @@ bin/uim-chardict-qt5 bin/uim-im-switcher-qt5 bin/uim-pref-qt5 bin/uim-toolbar-qt5 %%QT_QMLDIR%%/com/github/uim/libuim-qtquick-plugin.so %%QT_QMLDIR%%/com/github/uim/qmldir %%QT_PLUGINDIR%%/platforminputcontexts/libuimplatforminputcontextplugin.so libexec/uim-candwin-qt5 +share/kservices5/plasma-applet-com.github.uim.status.desktop share/metainfo/com.github.uim.status.appdata.xml share/plasma/plasmoids/com.github.uim.status/contents/ui/main.qml share/plasma/plasmoids/com.github.uim.status/contents/ui/messageProcessor.js share/plasma/plasmoids/com.github.uim.status/metadata.desktop share/plasma/plasmoids/com.github.uim.status/metadata.json diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index 065ff68da1ce..4d219955df42 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -1,137 +1,137 @@ # Created by: MANTANI Nobutaka PORTNAME= uim -PORTVERSION= 1.8.9.b.20210104 -PORTREVISION= 1 +PORTVERSION= 1.8.9.b.${SNAPDATE} CATEGORIES?= textproc .if !defined(UIM_SLAVE) && defined(WITHOUT_X11) PKGNAMESUFFIX= -nox11 .endif MAINTAINER= nobutaka@FreeBSD.org COMMENT?= Input method library LICENSE= BSD3CLAUSE GPLv2+ GPLv3+ LGPL21+ PD LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_riscv64= fails to configure: ./include/private/gcconfig.h:492:5: The collector has not been ported to this machine/OS combination USES+= autoreconf:build gettext gmake gnome iconv libedit libtool pathfix pkgconfig sqlite USE_LDCONFIG= yes USE_GNOME+= glib20 intltool USE_GITHUB= yes -GH_TAGNAME= d1ac9d9 +GH_TAGNAME= 6d8fcc8 GH_TUPLE= uim:sigscheme:beb8fbd:sigscheme \ uim:libgcroots:d362356:libgcroots +SNAPDATE= 20220318 + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-maintainer-mode OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT= X11 .include .if ${PORT_OPTIONS:MX11} USES+= xorg USE_XORG+= x11 xext LIB_DEPENDS+= libXft.so:x11-fonts/libXft CONFIGURE_ARGS+= --with-x --with-xft .endif .if !defined(UIM_SLAVE) USES+= perl5 USE_GNOME+= librsvg2:build USE_PERL5= build USE_RUBY= yes RUBY_NO_RUN_DEPENDS= yes .if ${PORT_OPTIONS:MX11} USE_GNOME+= cairo gdkpixbuf2 gtk30 LIB_DEPENDS+= libfreetype.so:print/freetype2 \ - libfontconfig.so:x11-fonts/fontconfig -CONFIGURE_ARGS+= --with-gtk3 + libfontconfig.so:x11-fonts/fontconfig \ + libharfbuzz.so:print/harfbuzz +CONFIGURE_ARGS+= --with-gtk3 --enable-default-toolkit=gtk3 .endif CONFIGURE_ARGS+= --enable-emacs --with-sj3 --with-canna --with-prime .endif CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include .if !defined(UIM_SLAVE) DOCSDIR_JA= ${PREFIX}/share/doc/ja/uim DOCSDIR_SIGSCHEME= ${PREFIX}/share/doc/uim/sigscheme PLIST_SUB+= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}" \ DOCSDIR_SIGSCHEME="${DOCSDIR_SIGSCHEME:S,^${PREFIX}/,,}" .endif .if empty(PORT_OPTIONS:MX11) PLIST_SUB+= X11="@comment " .else PLIST_SUB+= X11="" .endif .include .if ${ARCH} == "amd64" || ${ARCH} == "sparc64" CONFIGURE_ARGS+= --enable-storage=fatty .endif .for _x in x xft gtk2 gtk3 qt5 anthy canna m17nlib prime scim dict .if ${CONFIGURE_ARGS:M--with-${_x}} == "" CONFIGURE_ARGS+=--without-${_x} .endif .endfor .for _x in gnome-applet kde-applet emacs pref .if ${CONFIGURE_ARGS:M--enable-${_x}} == "" CONFIGURE_ARGS+=--disable-${_x} .endif .endfor post-extract: ${CP} -R ${WRKSRC_sigscheme}/* ${WRKSRC}/sigscheme ${MKDIR} ${WRKSRC}/sigscheme/libgcroots ${CP} -R ${WRKSRC_libgcroots}/* ${WRKSRC}/sigscheme/libgcroots -post-patch: - ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/scm/skk-custom.scm - pre-configure: cd ${WRKSRC} && ./autogen.sh do-build: .if !defined(UIM_SLAVE) .for d in replace sigscheme uim scm xim po fep emacs pixmaps tables cd ${WRKSRC}/${d} && ${MAKE_CMD} .endfor .if ${PORT_OPTIONS:MX11} cd ${WRKSRC}/gtk3/candwin && ${MAKE_CMD} .endif .endif do-install: .if !defined(UIM_SLAVE) cd ${WRKSRC} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-data-am -.for d in sigscheme uim scm xim po fep emacs pixmaps tables - cd ${WRKSRC}/${d} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install +.for d in sigscheme uim scm xim fep emacs pixmaps tables + cd ${WRKSRC}/${d} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip .endfor + cd ${WRKSRC}/po && ${MAKE_CMD} DESTDIR=${STAGEDIR} install .if ${PORT_OPTIONS:MX11} - cd ${WRKSRC}/gtk3/candwin && ${MAKE_CMD} DESTDIR=${STAGEDIR} install + cd ${WRKSRC}/gtk3/candwin && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip .endif .endif .if !defined(UIM_SLAVE) post-install: ${MKDIR} ${STAGEDIR}${DATADIR}/helperdata ${MKDIR} ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${DOCSDIR_JA} ${INSTALL_DATA} ${WRKSRC}/doc/KEY ${STAGEDIR}${DOCSDIR}/KEY ${INSTALL_DATA} ${WRKSRC}/fep/README ${STAGEDIR}${DOCSDIR}/README.fep ${INSTALL_DATA} ${WRKSRC}/fep/README ${STAGEDIR}${DOCSDIR}/README.key ${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${STAGEDIR}${DOCSDIR_JA}/README.fep ${INSTALL_DATA} ${WRKSRC}/xim/README ${STAGEDIR}${DOCSDIR}/README.xim .endif .include diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo index eb5a5de6cce3..731658897e60 100644 --- a/textproc/uim/distinfo +++ b/textproc/uim/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1619679684 -SHA256 (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = e187667560eb920201c93a6af104868c7c86b0d61364f6f7a20b33416c15a935 -SIZE (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = 4052581 +TIMESTAMP = 1651684893 +SHA256 (uim-uim-1.8.9.b.20220318-6d8fcc8_GH0.tar.gz) = 5fc53cca4e8505d71ea8e54cf5a0ad6398c7435be7fbbd7016623f36c5b2a565 +SIZE (uim-uim-1.8.9.b.20220318-6d8fcc8_GH0.tar.gz) = 4052477 SHA256 (uim-sigscheme-beb8fbd_GH0.tar.gz) = c3ad5cbec2ff32bb97aed4273e7a61ee74b2a0da301490349798e475c894a25c SIZE (uim-sigscheme-beb8fbd_GH0.tar.gz) = 570745 SHA256 (uim-libgcroots-d362356_GH0.tar.gz) = ae01589f5a7b49cf78418aca8679a7cd46a177a37d7776a4353b517d88cef451 SIZE (uim-libgcroots-d362356_GH0.tar.gz) = 88740 diff --git a/textproc/uim/files/patch-configure.ac b/textproc/uim/files/patch-configure.ac index 5bc71c1d0b02..54ea5d240826 100644 --- a/textproc/uim/files/patch-configure.ac +++ b/textproc/uim/files/patch-configure.ac @@ -1,20 +1,20 @@ ---- configure.ac.orig 2021-01-03 20:53:29 UTC +--- configure.ac.orig 2022-03-18 00:54:17 UTC +++ configure.ac -@@ -124,7 +124,7 @@ fi +@@ -123,7 +123,7 @@ fi if test "x$with_anthy" = xyes; then ANTHY_LIBS="-lanthy -lanthydic" ANTHY_CFLAGS="" - PKG_CHECK_EXISTS(anthy >= 8622, + PKG_CHECK_EXISTS(anthy >= 0.4, [AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1, "libanthy can handle UTF-8")]) fi -@@ -142,7 +142,7 @@ AC_ARG_WITH(anthy-utf8, +@@ -141,7 +141,7 @@ AC_ARG_WITH(anthy-utf8, [with_anthy_utf8=no]) if test "x$with_anthy_utf8" != xno; then - PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 8622, + PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 0.4, [with_anthy_utf8=yes AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1, [libanthy can handle UTF-8])], diff --git a/textproc/uim/files/patch-gtk2_toolbar_Makefile.am b/textproc/uim/files/patch-gtk2_toolbar_Makefile.am index a633ad34dd85..639b1596ee6e 100644 --- a/textproc/uim/files/patch-gtk2_toolbar_Makefile.am +++ b/textproc/uim/files/patch-gtk2_toolbar_Makefile.am @@ -1,34 +1,34 @@ ---- gtk2/toolbar/Makefile.am.orig 2021-04-29 16:11:47 UTC +--- gtk2/toolbar/Makefile.am.orig 2022-05-04 18:55:24 UTC +++ gtk2/toolbar/Makefile.am @@ -6,9 +6,7 @@ if GNOME_APPLET libexec_PROGRAMS = uim-toolbar-applet uim_toolbar_applet_LDADD = @GTK2_LIBS@ @GNOME_APPLET_LIBS@ \ - $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la + -luim-scm -luim -luim-custom uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @GNOME_APPLET_CFLAGS@ if GCC -@@ -41,9 +39,7 @@ bin_PROGRAMS = uim-toolbar-gtk uim-toolbar-gtk-systray +@@ -45,9 +43,7 @@ bin_PROGRAMS = uim-toolbar-gtk uim-toolbar-gtk-systray endif uim_toolbar_gtk_SOURCES = standalone-gtk.c common-gtk.c -uim_toolbar_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la +uim_toolbar_gtk_LDADD = @GTK2_LIBS@ -luim-scm -luim -luim-custom uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@ -@@ -51,8 +47,6 @@ uim_toolbar_gtk_systray_SOURCES = systray-gtk.c commo +@@ -55,8 +51,6 @@ uim_toolbar_gtk_systray_SOURCES = systray-gtk.c commo eggtrayicon.c eggtrayicon.h uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \ @X11_LIBS@ \ - $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la + -luim-scm -luim -luim-custom uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@ diff --git a/textproc/uim/files/patch-gtk3_toolbar_Makefile.am b/textproc/uim/files/patch-gtk3_toolbar_Makefile.am index 895afd6eb302..a946771304b2 100644 --- a/textproc/uim/files/patch-gtk3_toolbar_Makefile.am +++ b/textproc/uim/files/patch-gtk3_toolbar_Makefile.am @@ -1,35 +1,35 @@ ---- gtk3/toolbar/Makefile.am.orig 2021-04-30 15:03:44 UTC +--- gtk3/toolbar/Makefile.am.orig 2022-05-04 18:55:24 UTC +++ gtk3/toolbar/Makefile.am @@ -11,9 +11,7 @@ xmluidir = $(pkgdatadir)/ui xmlui_DATA = uim-applet-menu.xml libuim_toolbar_applet_gnome3_la_LIBADD = @GTK3_LIBS@ @GNOME3_APPLET_LIBS@ \ - $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la + -luim-scm -luim -luim-custom libuim_toolbar_applet_gnome3_la_CPPFLAGS = \ -DUIM_UIDATADIR="\"${xmluidir}\"" \ $(helper_defs) -I$(top_srcdir) -I$(top_builddir) -@@ -48,9 +46,7 @@ if GTK3 +@@ -52,9 +50,7 @@ if GTK3 bin_PROGRAMS = uim-toolbar-gtk3 uim-toolbar-gtk3-systray uim_toolbar_gtk3_SOURCES = ../../gtk2/toolbar/standalone-gtk.c \ ../../gtk2/toolbar/common-gtk.c -uim_toolbar_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la +uim_toolbar_gtk3_LDADD = @GTK3_LIBS@ -luim-scm -luim -luim-custom uim_toolbar_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) uim_toolbar_gtk3_CFLAGS = @GTK3_CFLAGS@ -@@ -60,9 +56,7 @@ uim_toolbar_gtk3_systray_SOURCES = ../../gtk2/toolbar +@@ -64,9 +60,7 @@ uim_toolbar_gtk3_systray_SOURCES = ../../gtk2/toolbar ../../gtk2/toolbar/eggtrayicon.h uim_toolbar_gtk3_systray_LDADD = @GTK3_LIBS@ \ @X11_LIBS@ \ - $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la + -luim-scm -luim -luim-custom uim_toolbar_gtk3_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) uim_toolbar_gtk3_systray_CFLAGS = @GTK3_CFLAGS@ endif diff --git a/textproc/uim/files/patch-qt4_common.pro.in b/textproc/uim/files/patch-qt4_common.pro.in new file mode 100644 index 000000000000..79a10c87a73a --- /dev/null +++ b/textproc/uim/files/patch-qt4_common.pro.in @@ -0,0 +1,10 @@ +--- qt4/common.pro.in.orig 2022-05-04 19:05:55 UTC ++++ qt4/common.pro.in +@@ -26,6 +26,6 @@ QMAKE_CXXFLAGS_DEBUG = $$replace(QMAKE_CXXFLAGS_DEB + QMAKE_CXXFLAGS_RELEASE = $$replace(QMAKE_CXXFLAGS_RELEASE, "-Wconversion", "") + QMAKE_LINK = @CXX@ + QMAKE_LFLAGS = @LDFLAGS@ +-QMAKE_STRIP = ++QMAKE_STRIP = @STRIP@ + + INSTALLS += target diff --git a/textproc/uim/files/patch-qt5_applet_Makefile.am b/textproc/uim/files/patch-qt5_applet_Makefile.am new file mode 100644 index 000000000000..99667e926f6f --- /dev/null +++ b/textproc/uim/files/patch-qt5_applet_Makefile.am @@ -0,0 +1,12 @@ +--- qt5/applet/Makefile.am.orig 2022-05-04 19:18:08 UTC ++++ qt5/applet/Makefile.am +@@ -6,6 +6,8 @@ EXTRA_DIST = \ + plasmoid + + if QT5 +-all clean install uninstall: ++all clean uninstall: + $(MAKE) $(AM_MAKEFLAGS) -C ../applet.cmake $@ ++install: ++ $(MAKE) $(AM_MAKEFLAGS) -C ../applet.cmake install/strip + endif diff --git a/textproc/uim/files/patch-scm_Makefile.am b/textproc/uim/files/patch-scm_Makefile.am deleted file mode 100644 index 04e3b642c2b2..000000000000 --- a/textproc/uim/files/patch-scm_Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ ---- scm/Makefile.am.orig 2021-04-29 07:47:29 UTC -+++ scm/Makefile.am -@@ -130,6 +130,3 @@ installed-modules.scm: $(SCM_FILES) - --path $(top_builddir)/scm --register $(module_names) - - json-parser-expanded.scm: macro-expander.scm json-parser-expander.scm packrat.scm.in -- if test -n "$(CSI)"; then \ -- $(CSI) -R syntax-case -q json-parser-expander.scm > json-parser-expanded.scm; \ -- fi diff --git a/textproc/uim/files/patch-xim_convdisp.cpp b/textproc/uim/files/patch-xim_convdisp.cpp index d063027340da..6510c2ca4310 100644 --- a/textproc/uim/files/patch-xim_convdisp.cpp +++ b/textproc/uim/files/patch-xim_convdisp.cpp @@ -1,46 +1,46 @@ ---- xim/convdisp.cpp.orig 2013-06-30 04:26:09 UTC +--- xim/convdisp.cpp.orig 2022-03-18 00:54:17 UTC +++ xim/convdisp.cpp -@@ -87,14 +87,14 @@ init_default_xftfont() { +@@ -81,14 +81,14 @@ init_default_xftfont() { gXftFont = XftFontOpen(XimServer::gDpy, DefaultScreen(XimServer::gDpy), XFT_FAMILY, XftTypeString, fontname, XFT_PIXEL_SIZE, XftTypeDouble, (double)DEFAULT_FONT_SIZE, - NULL); + (char *)NULL); gXftFontLocale = strdup(setlocale(LC_CTYPE, NULL)); // maybe not needed, but in case it return NULL... if (!gXftFont) { gXftFont = XftFontOpen(XimServer::gDpy, DefaultScreen(XimServer::gDpy), XFT_FAMILY, XftTypeString, "Sans", XFT_PIXEL_SIZE, XftTypeDouble, (double)DEFAULT_FONT_SIZE, - NULL); + (char *)NULL); } } -@@ -112,7 +112,7 @@ update_default_xftfont() { +@@ -106,7 +106,7 @@ update_default_xftfont() { DefaultScreen(XimServer::gDpy), XFT_FAMILY, XftTypeString, fontname, XFT_PIXEL_SIZE, XftTypeDouble, (double)DEFAULT_FONT_SIZE, - NULL); + (char *)NULL); if (xftfont) { if (gXftFont) XftFontClose(XimServer::gDpy, gXftFont); -@@ -387,7 +387,7 @@ PeWin::PeWin(Window pw, const char *im_l +@@ -385,7 +385,7 @@ PeWin::PeWin(Window pw, const char *im_lang, const cha DefaultScreen(XimServer::gDpy), XFT_FAMILY, XftTypeString, gXftFontName, XFT_PIXEL_SIZE, XftTypeDouble, (double)mXftFontSize, - NULL); + (char *)NULL); } mXftDraw = XftDrawCreate(XimServer::gDpy, mPixmap, DefaultVisual(XimServer::gDpy, scr_num), -@@ -557,7 +557,7 @@ void PeWin::set_xftfont(const char *xfld +@@ -555,7 +555,7 @@ void PeWin::set_xftfont(const char *xfld) DefaultScreen(XimServer::gDpy), XFT_FAMILY, XftTypeString, gXftFontName, XFT_PIXEL_SIZE, XftTypeDouble, (double)size, - NULL); + (char *)NULL); mXftFontSize = size; } }