Update to 3.1.0.

6 files changed, 32 insertions, 19 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index a16f863a1c2b..c586aff642eb 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mlterm
-PORTVERSION=	3.0.11
+PORTVERSION=	3.1.0
 CATEGORIES=	x11
 MASTER_SITES=	SF/${PORTNAME}/01release/${PORTNAME}-${PORTVERSION}
 
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index f897b27ce1c2..3bbb3044e080 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mlterm-3.0.11.tar.gz) = 808f15756aa40ada65a9b5760d9d1e4f281b62bb915ab51f4dd44e21a43f1e55
-SIZE (mlterm-3.0.11.tar.gz) = 4328395
+SHA256 (mlterm-3.1.0.tar.gz) = 4c07c74db87f4daf7b513aa3c50a56343c589476519d181e2461b9acfcb1d8a5
+SIZE (mlterm-3.1.0.tar.gz) = 4342792
diff --git a/x11/mlterm/files/patch-gtk_Makefile.in b/x11/mlterm/files/patch-gtk_Makefile.in
index aebcfecf4d24..ba3b5ea5fe79 100644
--- a/x11/mlterm/files/patch-gtk_Makefile.in
+++ b/x11/mlterm/files/patch-gtk_Makefile.in
@@ -1,5 +1,5 @@
---- gtk/Makefile.in.orig	2011-11-19 09:52:14.000000000 +0900
-+++ gtk/Makefile.in	2011-11-26 20:09:45.000000000 +0900
+--- gtk/Makefile.in.orig	2012-04-20 09:03:22.000000000 +0900
++++ gtk/Makefile.in	2012-04-29 02:29:44.000000000 +0900
 @@ -25,10 +25,10 @@
  
  OBJ = vte.o marshal.o vtetypebuiltins.o reaper.o
@@ -11,10 +11,10 @@
 -	$(LIBTOOL_LINK) -o libvte@LIBVTE_SUFFIX@.la $(OBJ:.o=.lo) ../mlterm/*.lo \
 +libvte-mlterm@LIBVTE_SUFFIX@.la: $(OBJ)
 +	$(LIBTOOL_LINK) -o libvte-mlterm@LIBVTE_SUFFIX@.la $(OBJ:.o=.lo) ../mlterm/*.lo \
- 	`echo ../xwindow/*.lo|sed 's/..\/xwindow\/main.lo//g' | \
- 	sed 's/..\/xwindow\/x_term_manager.lo//g' | \
+ 	`echo ../xwindow/*.lo| \
  	sed 's/..\/xwindow\/x_sb_screen.lo//g' | \
-@@ -45,13 +45,13 @@
+ 	sed 's/..\/xwindow\/x_scrollbar.lo//g' | \
+@@ -46,13 +46,13 @@
  		-I$(top_builddir)/xwindow -I../mkf/include -I../kiklib/include -g -c $<
  
  clean:
diff --git a/x11/mlterm/files/patch-kiklib_src_kik_utmp_utmper.c b/x11/mlterm/files/patch-kiklib_src_kik_utmp_utmper.c
new file mode 100644
index 000000000000..1163f3d81722
--- /dev/null
+++ b/x11/mlterm/files/patch-kiklib_src_kik_utmp_utmper.c
@@ -0,0 +1,13 @@
+--- kiklib/src/kik_utmp_utmper.c.orig	2012-04-29 11:38:18.000000000 +0900
++++ kiklib/src/kik_utmp_utmper.c	2012-04-29 11:39:57.000000000 +0900
+@@ -20,8 +20,8 @@
+ 
+ kik_utmp_t
+ kik_utmp_new(
+-	char *  tty ,
+-	char *  host,
++	const char *  tty ,
++	const char *  host,
+ 	int pty_fd
+ 	)
+ {
diff --git a/x11/mlterm/files/patch-main_dexport.map b/x11/mlterm/files/patch-main_dexport.map
new file mode 100644
index 000000000000..d69a4adee4e4
--- /dev/null
+++ b/x11/mlterm/files/patch-main_dexport.map
@@ -0,0 +1,11 @@
+--- main/dexport.map.orig	2012-04-29 11:45:34.000000000 +0900
++++ main/dexport.map	2012-04-29 11:46:34.000000000 +0900
+@@ -2,6 +2,8 @@
+ global:
+ 	x_imagelib_load_file ;
+ 	x_get_opened_displays ;
++	__progname ;
++	environ ;
+ local:
+ 	* ;
+ } ;
diff --git a/x11/mlterm/files/patch-xwindow_Makefile.in b/x11/mlterm/files/patch-xwindow_Makefile.in
deleted file mode 100644
index 7da3e76018b1..000000000000
--- a/x11/mlterm/files/patch-xwindow_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- xwindow/Makefile.in.orig	2011-10-10 22:14:33.000000000 +0900
-+++ xwindow/Makefile.in	2011-10-10 22:14:45.000000000 +0900
-@@ -68,7 +68,7 @@
- 	$(MAKE) LKIK="$(LKIK_DEB)" LMKF="$(LMKF_DEB)" all
- 
- $(PROG): $(OBJ) $(LMLTERM)
--	$(LIBTOOL_LINK) -o $(PROG) $(OBJ@XWINDOW_OBJ_SUFFIX@) @DEXPORT@ $(LIBS) @CTL_LIBS_FOR_PROG@
-+	$(LIBTOOL_LINK) -o $(PROG) $(OBJ@XWINDOW_OBJ_SUFFIX@) $(LIBS) @CTL_LIBS_FOR_PROG@
- 
- .SUFFIXES: .c .o
-