Update to 2.7.0.

6 files changed, 60 insertions, 12 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 77355fdac393..9ae495119c68 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mlterm
-PORTVERSION=	2.6.3
+PORTVERSION=	2.7.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,10 +15,10 @@ MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Multilingual X11 terminal emulator
 
 USE_X_PREFIX=	yes
-USE_GNOME=	imlib
+USE_GNOME=	gdkpixbuf
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=	--with-imagelib=imlib --enable-utmp
+CONFIGURE_ARGS=	--with-imagelib=gdk-pixbuf2 --enable-utmp
 INSTALLS_SHLIB=	yes
 
 MAN1=	mlterm.1 mlclient.1
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index c435c9968131..9554f6106f4f 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1 +1 @@
-MD5 (mlterm-2.6.3.tar.gz) = 1c0dc67e8a12d07f992226fe130881f6
+MD5 (mlterm-2.7.0.tar.gz) = 03d6cf243ada71e3b80553a9a4a8a372
diff --git a/x11/mlterm/files/patch-configure b/x11/mlterm/files/patch-configure
new file mode 100644
index 000000000000..29701bbc5d86
--- /dev/null
+++ b/x11/mlterm/files/patch-configure
@@ -0,0 +1,25 @@
+--- configure.orig	Fri Jun 20 10:53:15 2003
++++ configure	Fri Jun 20 11:00:52 2003
+@@ -9103,11 +9103,6 @@
+     top_srcdir="$ac_dots$ac_given_srcdir" ;;
+   esac
+ 
+-  case "$ac_given_INSTALL" in
+-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-  esac
+-
+   echo creating "$ac_file"
+   rm -f "$ac_file"
+   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+@@ -9469,10 +9464,6 @@
+       *) # Relative path.
+         ac_sub_cache_file="$ac_dots$cache_file" ;;
+       esac
+-  case "$ac_given_INSTALL" in
+-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-        esac
+ 
+       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+       # The eval makes quoting arguments work.
diff --git a/x11/mlterm/files/patch-kiklib:configure b/x11/mlterm/files/patch-kiklib:configure
new file mode 100644
index 000000000000..e5581b79d46c
--- /dev/null
+++ b/x11/mlterm/files/patch-kiklib:configure
@@ -0,0 +1,14 @@
+--- kiklib/configure.orig	Fri Jun 20 10:53:24 2003
++++ kiklib/configure	Fri Jun 20 10:54:08 2003
+@@ -7174,11 +7174,6 @@
+     top_srcdir="$ac_dots$ac_given_srcdir" ;;
+   esac
+ 
+-  case "$ac_given_INSTALL" in
+-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-  esac
+-
+   echo creating "$ac_file"
+   rm -f "$ac_file"
+   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
diff --git a/x11/mlterm/files/patch-mkf:configure b/x11/mlterm/files/patch-mkf:configure
new file mode 100644
index 000000000000..9c815b5619a3
--- /dev/null
+++ b/x11/mlterm/files/patch-mkf:configure
@@ -0,0 +1,14 @@
+--- mkf/configure.orig	Fri Jun 20 10:53:36 2003
++++ mkf/configure	Fri Jun 20 10:53:51 2003
+@@ -5796,11 +5796,6 @@
+     top_srcdir="$ac_dots$ac_given_srcdir" ;;
+   esac
+ 
+-  case "$ac_given_INSTALL" in
+-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-  esac
+-
+   echo creating "$ac_file"
+   rm -f "$ac_file"
+   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
diff --git a/x11/mlterm/pkg-plist b/x11/mlterm/pkg-plist
index fc1640aad1cb..28c4aaad1119 100644
--- a/x11/mlterm/pkg-plist
+++ b/x11/mlterm/pkg-plist
@@ -15,36 +15,31 @@ etc/mlterm/xim
 lib/libkik.a
 lib/libkik.la
 lib/libkik.so
-lib/libkik.so.6
+lib/libkik.so.9
 lib/libmkf.a
 lib/libmkf.la
 lib/libmkf.so
-lib/libmkf.so.12
+lib/libmkf.so.13
 lib/mlterm/libathena.a
 lib/mlterm/libathena.la
 lib/mlterm/libathena.so
-lib/mlterm/libathena.so.0
 lib/mlterm/libmotif.a
 lib/mlterm/libmotif.la
 lib/mlterm/libmotif.so
-lib/mlterm/libmotif.so.0
 lib/mlterm/libmozmodern.a
 lib/mlterm/libmozmodern.la
 lib/mlterm/libmozmodern.so
-lib/mlterm/libmozmodern.so.0
 lib/mlterm/libnext.a
 lib/mlterm/libnext.la
 lib/mlterm/libnext.so
-lib/mlterm/libnext.so.0
 lib/mlterm/libsample.a
 lib/mlterm/libsample.la
 lib/mlterm/libsample.so
-lib/mlterm/libsample.so.0
 lib/mlterm/libsample2.a
 lib/mlterm/libsample2.la
 lib/mlterm/libsample2.so
-lib/mlterm/libsample2.so.0
 libexec/mlconfig
+libexec/mlterm-menu
 libexec/w3mmlconfig/mlconfig-data.pl
 libexec/w3mmlconfig/mlconfig.cgi
 %%PORTDOCS%%share/doc/ja/mlterm/README.ja