Update to 3.8.0.

7 files changed, 47 insertions, 44 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index bded7948a0b8..4a1830b57b91 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mlterm
-PORTVERSION=	3.7.2
+PORTVERSION=	3.8.0
 CATEGORIES=	x11
 MASTER_SITES=	SF/${PORTNAME}/01release/${PORTNAME}-${PORTVERSION}
 
@@ -11,15 +11,19 @@ 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
@@ -71,9 +75,8 @@ 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} \
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index b4a646fc65f8..57789513ebc2 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -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
diff --git a/x11/mlterm/files/patch-configure b/x11/mlterm/files/patch-configure
index 2ad8cfcc4ca9..5bb5ef8dc09b 100644
--- a/x11/mlterm/files/patch-configure
+++ b/x11/mlterm/files/patch-configure
@@ -1,6 +1,6 @@
---- 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
@@ -9,7 +9,7 @@
  	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
diff --git a/x11/mlterm/files/patch-gtk_Makefile.in b/x11/mlterm/files/patch-gtk_Makefile.in
index b8a4fc735d61..8b9fd00b08f5 100644
--- a/x11/mlterm/files/patch-gtk_Makefile.in
+++ b/x11/mlterm/files/patch-gtk_Makefile.in
@@ -1,4 +1,4 @@
---- 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
diff --git a/x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c b/x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c
index c07336139de8..cf9ed9493b74 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	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;
diff --git a/x11/mlterm/files/patch-tool_w3mmlconfig_mlconfig.cgi.in b/x11/mlterm/files/patch-tool_w3mmlconfig_mlconfig.cgi.in
index 844f217fcef1..78d8e410bc81 100644
--- a/x11/mlterm/files/patch-tool_w3mmlconfig_mlconfig.cgi.in
+++ b/x11/mlterm/files/patch-tool_w3mmlconfig_mlconfig.cgi.in
@@ -1,5 +1,5 @@
---- 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;
@@ -7,4 +7,4 @@
 +use lib '@CGI_BIN@';
  require 'mlconfig-data.pl';
  
- $CGI = $ENV{SCRIPT_NAME} || $0;
+ open(CHALLENGE, "$ENV{HOME}/.mlterm/challenge");
diff --git a/x11/mlterm/pkg-plist b/x11/mlterm/pkg-plist
index eca028b27986..23761f51198c 100644
--- a/x11/mlterm/pkg-plist
+++ b/x11/mlterm/pkg-plist
@@ -16,28 +16,28 @@ 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