Index: head/x11/mlterm/Makefile =================================================================== --- head/x11/mlterm/Makefile (revision 434720) +++ head/x11/mlterm/Makefile (revision 434721) @@ -1,85 +1,88 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ PORTNAME= mlterm -PORTVERSION= 3.7.2 +PORTVERSION= 3.8.0 CATEGORIES= x11 MASTER_SITES= SF/${PORTNAME}/01release/${PORTNAME}-${PORTVERSION} MAINTAINER= nobutaka@FreeBSD.org COMMENT= Multilingual X11 terminal emulator LICENSE= BSD3CLAUSE +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz + USES= gettext libtool perl5 pkgconfig -USE_XORG= sm xft -USE_GNOME= gtk20 vte +USE_XORG= sm x11 xft +USE_GNOME= cairo gdkpixbuf2 gtk20 vte USE_LDCONFIG= yes USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gui=x11 --with-imagelib=gdk-pixbuf2 --enable-utmp \ - --enable-optimize-redrawing \ - --disable-iiimf --with-gtk=2.0 + --enable-optimize-redrawing --disable-iiimf --with-gtk=2.0 \ + --disable-ssh2 EXTERNAL_TOOLS= mlclient,mlconfig,mlterm-menu,mlcc,w3mmlconfig,mlimgloader CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= CAIRO DOCS FRIBIDI IBUS M17NLIB REGIS SCIM SIXEL UIM OPTIONS_SUB= yes CAIRO_DESC= Use Cairo for type engine (experimental) FRIBIDI_DESC= Use Fribidi for BiDi rendering IBUS_DESC= IBUS support (experimental) M17NLIB_DESC= m17n library support (experimental) REGIS_DESC= ReGIS graphics support SCIM_DESC= SCIM support (experimental) SIXEL_DESC= Sixel graphics support UIM_DESC= uim support (experimental) 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_LIB_DEPENDS= libSDL.so:devel/sdl12 \ libSDL_ttf.so:graphics/sdl_ttf \ libfontconfig.so:x11-fonts/fontconfig .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 - @${REINPLACE_CMD} -e 's|kik_utmp_bsd|kik_utmp_utmper|' \ - ${WRKSRC}/kiklib/src/Makefile 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} .include Index: head/x11/mlterm/distinfo =================================================================== --- head/x11/mlterm/distinfo (revision 434720) +++ head/x11/mlterm/distinfo (revision 434721) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472524907 -SHA256 (mlterm-3.7.2.tar.gz) = 88e70c1c98aea1e4134e1164e763c2662c5de92ee5a7dfa6a33e4ce620e244ac -SIZE (mlterm-3.7.2.tar.gz) = 3740947 +TIMESTAMP = 1483951966 +SHA256 (mlterm-3.8.0.tar.gz) = 6be0165fe43dc45099c4b37303fcca918e5dd07c5b0abb1fd4e35c8d73e9bf01 +SIZE (mlterm-3.8.0.tar.gz) = 3756779 Index: head/x11/mlterm/files/patch-configure =================================================================== --- head/x11/mlterm/files/patch-configure (revision 434720) +++ head/x11/mlterm/files/patch-configure (revision 434721) @@ -1,19 +1,19 @@ ---- configure.orig 2016-03-13 10:57:40 UTC +--- configure.orig 2017-01-07 22:24:39 UTC +++ configure -@@ -21869,7 +21869,7 @@ if test "$utmp" = "yes" -a "$pty_helper" +@@ -21932,7 +21932,7 @@ if test "$utmp" = "yes" -a "$pty_helper" if test "$has_utmp" ; then INSTALL_OPT="-m 2755 -g utmp" else - INSTALL_OPT="-m 4755 -o root" + INSTALL_OPT="-m 4755" fi else INSTALL_OPT="-m 755" -@@ -22095,6 +22095,7 @@ $as_echo "yes" >&6; } +@@ -22158,6 +22158,7 @@ $as_echo "yes" >&6; } fi fi if test "$have_vte" = "yes" ; then + MAKE_DIRS="gtk ${MAKE_DIRS}" OUTPUT_FILES="gtk/Makefile ${OUTPUT_FILES}" fi Index: head/x11/mlterm/files/patch-gtk_Makefile.in =================================================================== --- head/x11/mlterm/files/patch-gtk_Makefile.in (revision 434720) +++ head/x11/mlterm/files/patch-gtk_Makefile.in (revision 434721) @@ -1,11 +1,11 @@ ---- gtk/Makefile.in.orig 2016-03-13 10:57:40 UTC +--- gtk/Makefile.in.orig 2017-01-07 22:24:38 UTC +++ gtk/Makefile.in @@ -30,7 +30,7 @@ LIB_VERSION_2.90 = 9:0:0 LIB_VERSION_2.91 = 0:0:0 TARGET = $(TARGET_$(VTE_ABI)) -TARGET_ = libvte +TARGET_ = libvte-mlterm TARGET_2.90 = libvte2_90 TARGET_2.91 = libvte-2.91 Index: head/x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c =================================================================== --- head/x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c (revision 434720) +++ head/x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c (revision 434721) @@ -1,11 +1,11 @@ ---- inputmethod/ibus/im_ibus.c.orig 2016-03-13 10:57:40 UTC +--- inputmethod/ibus/im_ibus.c.orig 2017-01-07 22:24:38 UTC +++ inputmethod/ibus/im_ibus.c -@@ -1289,7 +1289,7 @@ im_ibus_get_info( - } +@@ -1008,7 +1008,7 @@ im_info_t* im_ibus_get_info(char* locale + } - result->id = strdup( "ibus") ; -- result->name = strdup( "iBus") ; -+ result->name = strdup( "ibus") ; - result->num_of_args = 0; - result->args = NULL ; - result->readable_args = NULL ; + result->id = strdup("ibus"); +- result->name = strdup("iBus"); ++ result->name = strdup("ibus"); + result->num_of_args = 0; + result->args = NULL; + result->readable_args = NULL; Index: head/x11/mlterm/files/patch-tool_w3mmlconfig_mlconfig.cgi.in =================================================================== --- head/x11/mlterm/files/patch-tool_w3mmlconfig_mlconfig.cgi.in (revision 434720) +++ head/x11/mlterm/files/patch-tool_w3mmlconfig_mlconfig.cgi.in (revision 434721) @@ -1,10 +1,10 @@ ---- tool/w3mmlconfig/mlconfig.cgi.in.orig Sat Feb 23 22:18:18 2002 -+++ tool/w3mmlconfig/mlconfig.cgi.in Sat Feb 23 22:22:19 2002 +--- tool/w3mmlconfig/mlconfig.cgi.in.orig 2017-01-07 22:24:38 UTC ++++ tool/w3mmlconfig/mlconfig.cgi.in @@ -2,6 +2,7 @@ $DEBUG = 1; +use lib '@CGI_BIN@'; require 'mlconfig-data.pl'; - $CGI = $ENV{SCRIPT_NAME} || $0; + open(CHALLENGE, "$ENV{HOME}/.mlterm/challenge"); Index: head/x11/mlterm/pkg-plist =================================================================== --- head/x11/mlterm/pkg-plist (revision 434720) +++ head/x11/mlterm/pkg-plist (revision 434721) @@ -1,125 +1,125 @@ 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/libkik.a -lib/libkik.so -lib/libkik.so.16 -lib/libkik.so.16.0.0 -lib/libmkf.a -lib/libmkf.so -lib/libmkf.so.17 -lib/libmkf.so.17.0.0 -lib/libmlterm_core.a -lib/libmlterm_core.so +lib/libmef.a +lib/libmef.so +lib/libmef.so.1 +lib/libmef.so.1.0.0 +lib/libmlterm_coreotl.a +lib/libmlterm_coreotl.so +lib/libpobl.a +lib/libpobl.so +lib/libpobl.so.1 +lib/libpobl.so.1.0.0 lib/libvte-mlterm.a lib/libvte-mlterm.so lib/libvte-mlterm.so.9 lib/libvte-mlterm.so.9.0.0 -lib/mkf/libmkf_8bits.a -lib/mkf/libmkf_8bits.so -lib/mkf/libmkf_jajp.a -lib/mkf/libmkf_jajp.so -lib/mkf/libmkf_kokr.a -lib/mkf/libmkf_kokr.so -lib/mkf/libmkf_zh.a -lib/mkf/libmkf_zh.so +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 %%FRIBIDI%%lib/mlterm/libctl_bidi.a %%FRIBIDI%%lib/mlterm/libctl_bidi.so lib/mlterm/libctl_iscii.a lib/mlterm/libctl_iscii.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_tamil.a lib/mlterm/libind_tamil.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 man/man1/mlclient.1.gz man/man1/mlterm.1.gz %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.ja 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 %%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