diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index 21a3b7d6fea6..4fd59a3fecbf 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,102 +1,101 @@ PORTNAME= mlterm -PORTVERSION= 3.9.4 -PORTREVISION= 1 +PORTVERSION= 3.9.5 CATEGORIES= x11 MAINTAINER= nobutaka@FreeBSD.org COMMENT= Multilingual X11 terminal emulator WWW= https://mlterm.sourceforge.net/ LICENSE= BSD3CLAUSE LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz USES= cpe desktop-file-utils gettext gnome libtool perl5 pkgconfig xorg USE_GITHUB= yes USE_GNOME= cairo gdkpixbuf gtk30 vte3 USE_LDCONFIG= yes USE_PERL5= build USE_XORG= sm x11 xft GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --with-gui=x11 --with-imagelib=gdk-pixbuf2 --enable-utmp \ --enable-optimize-redrawing --disable-iiimf --with-gtk=3.0 \ --disable-ssh2 EXTERNAL_TOOLS= mlclient,mlconfig,mlterm-menu,mlcc,w3mmlconfig,mlimgloader CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl -Wl,--undefined-version MAKE_JOBS_UNSAFE= yes GH_ACCOUNT= arakiken OPTIONS_DEFINE= CAIRO DOCS FRIBIDI IBUS M17NLIB REGIS SCIM SIXEL UIM OPTIONS_SUB= yes OPTIONS_RADIO= FCITX OPTIONS_RADIO_FCITX= FCITX4 FCITX5 CAIRO_DESC= Use Cairo for type engine FCITX_DESC= Fcitx support FCITX4_DESC= Fcitx4 support FCITX5_DESC= Fcitx5 support FRIBIDI_DESC= Use Fribidi for BiDi rendering IBUS_DESC= IBUS support M17NLIB_DESC= m17n library support REGIS_DESC= ReGIS graphics support SCIM_DESC= SCIM support SIXEL_DESC= Sixel graphics support UIM_DESC= uim support FCITX4_CONFIGURE_ON= --enable-fcitx FCITX4_LIB_DEPENDS= libfcitx-gclient.so:chinese/fcitx FCITX5_CONFIGURE_ON= --enable-fcitx FCITX5_LIB_DEPENDS= libFcitx5Core.so:textproc/fcitx5 \ libFcitx5GClient.so:textproc/fcitx5-gtk FRIBIDI_CONFIGURE_ENABLE= fribidi FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi UIM_CONFIGURE_ENABLE= uim UIM_LIB_DEPENDS= libuim.so:textproc/uim M17NLIB_CONFIGURE_ENABLE= m17nlib M17NLIB_LIB_DEPENDS= libm17n.so:devel/m17n-lib SCIM_CONFIGURE_ENABLE= scim SCIM_LIB_DEPENDS= libscim-1.0.so:textproc/scim IBUS_CONFIGURE_ENABLE= ibus IBUS_LIB_DEPENDS= libibus-1.0.so:textproc/ibus CAIRO_LIB_DEPENDS= libcairo.so:graphics/cairo CAIRO_CONFIGURE_ON= --with-type-engines="xcore,xft,cairo" CAIRO_CONFIGURE_OFF= --with-type-engines="xcore,xft" SIXEL_CONFIGURE_ENABLE= sixel REGIS_USES= sdl REGIS_USE= SDL=ttf .include .if ${PORT_OPTIONS:MREGIS} EXTERNAL_TOOLS+=,registobmp .endif CONFIGURE_ARGS+=--with-tools="${EXTERNAL_TOOLS}" post-configure: @${REINPLACE_CMD} -e "s,@CGI_BIN@,${PREFIX}/libexec/w3mmlconfig," \ -e "s,@PERL @,${PERL}," \ ${WRKSRC}/tool/w3mmlconfig/mlconfig.cgi post-install: (cd ${WRKSRC}/tool/w3mmlconfig && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/ja/README.ja ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${FILESDIR}/mlterm.desktop ${STAGEDIR}${DESKTOPDIR} .include diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo index 73439ed8440e..1939234a4fd6 100644 --- a/x11/mlterm/distinfo +++ b/x11/mlterm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743312749 -SHA256 (arakiken-mlterm-3.9.4_GH0.tar.gz) = 171de4c4f3443bc1211cc51df5caa0e082ffcdd33ab3ce261bc0a4cfe85d9b5e -SIZE (arakiken-mlterm-3.9.4_GH0.tar.gz) = 4227568 +TIMESTAMP = 1783783192 +SHA256 (arakiken-mlterm-3.9.5_GH0.tar.gz) = 7d28678aa90dade72cea4e1e5fffb5e4c343487d60ca36c88dc615134613af39 +SIZE (arakiken-mlterm-3.9.5_GH0.tar.gz) = 4279053 diff --git a/x11/mlterm/files/patch-configure b/x11/mlterm/files/patch-configure index 4a479e4b14f6..4306576f417f 100644 --- a/x11/mlterm/files/patch-configure +++ b/x11/mlterm/files/patch-configure @@ -1,10 +1,10 @@ ---- configure.orig 2023-04-08 11:30:26 UTC +--- configure.orig 2026-07-05 16:18:25 UTC +++ configure -@@ -19974,6 +19974,7 @@ $as_echo "yes" >&6; } +@@ -20183,6 +20183,7 @@ fi fi fi if test "$have_vte" = "yes" ; then + MAKE_DIRS2="gtk ${MAKE_DIRS2}" OUTPUT_FILES="gtk/Makefile ${OUTPUT_FILES}" fi diff --git a/x11/mlterm/files/patch-gtk_Makefile.in b/x11/mlterm/files/patch-gtk_Makefile.in index b533fefbb0fe..d3db1b1aa9fd 100644 --- a/x11/mlterm/files/patch-gtk_Makefile.in +++ b/x11/mlterm/files/patch-gtk_Makefile.in @@ -1,15 +1,17 @@ ---- gtk/Makefile.in.orig 2023-04-01 13:54:40 UTC +--- gtk/Makefile.in.orig 2026-07-05 16:18:25 UTC +++ gtk/Makefile.in -@@ -30,9 +30,9 @@ LIB_VERSION_2.90 = 9:0:0 - LIB_VERSION_2.91 = 0:0:0 +@@ -32,10 +32,10 @@ TARGET = $(TARGET_$(VTE_ABI)) + LIB_VERSION_2.91-gtk4 = 0:0:0 TARGET = $(TARGET_$(VTE_ABI)) -TARGET_ = libvte -TARGET_2.90 = libvte2_90 -TARGET_2.91 = libvte-2.91 +-TARGET_2.91-gtk4 = libvte-2.91-gtk4 +TARGET_ = libvte-mlterm +TARGET_2.90 = libvte-mlterm +TARGET_2.91 = libvte-mlterm ++TARGET_2.91-gtk4 = libvte-mlterm-gtk4 LPOBL = @LPOBL@ LMEF = @LMEF@ diff --git a/x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c b/x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c index 49841299c30c..22e9953a51ee 100644 --- a/x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c +++ b/x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c @@ -1,11 +1,11 @@ ---- inputmethod/ibus/im_ibus.c.orig 2023-04-01 13:54:40 UTC +--- inputmethod/ibus/im_ibus.c.orig 2026-07-05 16:18:25 UTC +++ inputmethod/ibus/im_ibus.c -@@ -1024,7 +1024,7 @@ im_info_t *im_ibus_get_info(char *locale, char *encodi +@@ -1059,7 +1059,7 @@ im_info_t *im_ibus_get_info(char *locale, char *encodi } result->id = strdup("ibus"); - result->name = strdup("iBus"); + result->name = strdup("ibus"); result->num_args = 0; result->args = NULL; result->readable_args = NULL; diff --git a/x11/mlterm/pkg-plist b/x11/mlterm/pkg-plist index 1b23256081be..ff889c078126 100644 --- a/x11/mlterm/pkg-plist +++ b/x11/mlterm/pkg-plist @@ -1,131 +1,131 @@ bin/mlcc bin/mlterm bin/mlclient bin/mlclientx bin/w3mmlconfig etc/mlterm/aafont etc/mlterm/color etc/mlterm/font etc/mlterm/font-fb etc/mlterm/key etc/mlterm/main etc/mlterm/menu etc/mlterm/taafont etc/mlterm/termcap etc/mlterm/tfont etc/mlterm/vaafont etc/mlterm/vfont etc/mlterm/xim lib/libmef.a lib/libmef.so -lib/libmef.so.3 -lib/libmef.so.3.0.1 +lib/libmef.so.4 +lib/libmef.so.4.0.0 lib/libmlterm_coreotl.a lib/libmlterm_coreotl.so lib/libpobl.a lib/libpobl.so -lib/libpobl.so.2 -lib/libpobl.so.2.0.1 +lib/libpobl.so.3 +lib/libpobl.so.3.0.0 lib/libvte-mlterm.a lib/libvte-mlterm.so lib/libvte-mlterm.so.0 lib/libvte-mlterm.so.0.0.0 lib/mef/libmef_8bits.a lib/mef/libmef_8bits.so lib/mef/libmef_jajp.a lib/mef/libmef_jajp.so lib/mef/libmef_kokr.a lib/mef/libmef_kokr.so lib/mef/libmef_zh.a lib/mef/libmef_zh.so lib/mlterm/libathena.a lib/mlterm/libathena.so lib/mlterm/libzmodem.a lib/mlterm/libzmodem.so %%FRIBIDI%%lib/mlterm/libctl_bidi.a %%FRIBIDI%%lib/mlterm/libctl_bidi.so lib/mlterm/libctl_iscii.a lib/mlterm/libctl_iscii.so %%FCITX4%%lib/mlterm/libim-fcitx.a %%FCITX4%%lib/mlterm/libim-fcitx.so %%FCITX5%%lib/mlterm/libim-fcitx.a %%FCITX5%%lib/mlterm/libim-fcitx.so %%IBUS%%lib/mlterm/libim-ibus.a %%IBUS%%lib/mlterm/libim-ibus.so lib/mlterm/libim-kbd.a lib/mlterm/libim-kbd.so lib/mlterm/libim-skk.a lib/mlterm/libim-skk.so lib/mlterm/libind_assamese.a lib/mlterm/libind_assamese.so lib/mlterm/libind_bengali.a lib/mlterm/libind_bengali.so lib/mlterm/libind_gujarati.a lib/mlterm/libind_gujarati.so lib/mlterm/libind_hindi.a lib/mlterm/libind_hindi.so lib/mlterm/libind_iitkeyb.a lib/mlterm/libind_iitkeyb.so lib/mlterm/libind_inscript.a lib/mlterm/libind_inscript.so lib/mlterm/libind_kannada.a lib/mlterm/libind_kannada.so lib/mlterm/libind_malayalam.a lib/mlterm/libind_malayalam.so lib/mlterm/libind_oriya.a lib/mlterm/libind_oriya.so lib/mlterm/libind_punjabi.a lib/mlterm/libind_punjabi.so lib/mlterm/libind_telugu.a lib/mlterm/libind_telugu.so %%M17NLIB%%lib/mlterm/libim-m17nlib.a %%M17NLIB%%lib/mlterm/libim-m17nlib.so %%SCIM%%lib/mlterm/libim-scim.a %%SCIM%%lib/mlterm/libim-scim.so %%UIM%%lib/mlterm/libim-uim.a %%UIM%%lib/mlterm/libim-uim.so lib/mlterm/libmotif.a lib/mlterm/libmotif.so lib/mlterm/libmozmodern.a lib/mlterm/libmozmodern.so lib/mlterm/libnext.a lib/mlterm/libnext.so lib/mlterm/libotl.a lib/mlterm/libotl.so lib/mlterm/libpixmap_engine.a lib/mlterm/libpixmap_engine.so lib/mlterm/libsample.a lib/mlterm/libsample.so %%CAIRO%%lib/mlterm/libtype_cairo.a %%CAIRO%%lib/mlterm/libtype_cairo.so lib/mlterm/libtype_xft.a lib/mlterm/libtype_xft.so libexec/mlterm/mlconfig libexec/mlterm/mlimgloader libexec/mlterm/mlterm-menu %%REGIS%%libexec/mlterm/registobmp libexec/w3mmlconfig/mlconfig-data.pl libexec/w3mmlconfig/mlconfig.cgi %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.ja share/applications/mlterm.desktop share/locale/ar/LC_MESSAGES/mlconfig.mo share/locale/de/LC_MESSAGES/mlconfig.mo share/locale/ja/LC_MESSAGES/mlconfig.mo share/locale/vi/LC_MESSAGES/mlconfig.mo share/locale/zh_TW/LC_MESSAGES/mlconfig.mo share/man/man1/mlcc.1.gz share/man/man1/mlclient.1.gz share/man/man1/mlterm.1.gz %%DATADIR%%/scrollbars/sample3/bg_body.png %%DATADIR%%/scrollbars/sample3/bg_bottom.png %%DATADIR%%/scrollbars/sample3/bg_top.png %%DATADIR%%/scrollbars/sample3/button_down.png %%DATADIR%%/scrollbars/sample3/button_down_pressed.png %%DATADIR%%/scrollbars/sample3/button_up.png %%DATADIR%%/scrollbars/sample3/button_up_pressed.png %%DATADIR%%/scrollbars/sample3/rc %%DATADIR%%/scrollbars/sample3/slider_body.png %%DATADIR%%/scrollbars/sample3/slider_bottom.png %%DATADIR%%/scrollbars/sample3/slider_knob.png %%DATADIR%%/scrollbars/sample3/slider_top.png