Update to 3.0.8.

4 files changed, 30 insertions, 3 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index bb3d8524a382..47cb9757e846 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mlterm
-PORTVERSION=	3.0.6
+PORTVERSION=	3.0.8
 CATEGORIES=	x11
 MASTER_SITES=	SF/${PORTNAME}/01release/${PORTNAME}-${PORTVERSION}
 
@@ -40,8 +40,10 @@ OPTIONS=	FRIBIDI	"Use Fribidi for BiDi rendering" off \
 .if defined(WITH_FRIBIDI)
 CONFIGURE_ARGS+=	--enable-fribidi
 LIB_DEPENDS+=	fribidi.3:${PORTSDIR}/converters/fribidi
+PLIST_SUB+=	FRIBIDI=""
 .else
 CONFIGURE_ARGS+=	--disable-fribidi
+PLIST_SUB+=	FRIBIDI="@comment "
 .endif
 
 .if defined(WITH_UIM)
@@ -88,8 +90,10 @@ PLIST_SUB+=	IBUS="@comment "
 CONFIGURE_ARGS+=	--with-type-engines="xcore,xft,cairo"
 MAKE_ENV=	LIBS_LOCAL=-L${LOCALBASE}/lib
 LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+PLIST_SUB+=	CAIRO=""
 .else
 CONFIGURE_ARGS+=	--with-type-engines="xcore,xft"
+PLIST_SUB+=	CAIRO="@comment "
 .endif
 
 
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index e2ea6388c476..ffb4a7b345ed 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mlterm-3.0.6.tar.gz) = 7de81f5b296312e39312481a14d75e93c6a7ddde385b08c22a31e61c168005f1
-SIZE (mlterm-3.0.6.tar.gz) = 3375241
+SHA256 (mlterm-3.0.8.tar.gz) = 394e570e96c296e63dc607a392038fa0b90eb9c2269f7a684220bf258ce1640e
+SIZE (mlterm-3.0.8.tar.gz) = 3396207
diff --git a/x11/mlterm/files/patch-xwindow_Makefile.in b/x11/mlterm/files/patch-xwindow_Makefile.in
new file mode 100644
index 000000000000..7da3e76018b1
--- /dev/null
+++ b/x11/mlterm/files/patch-xwindow_Makefile.in
@@ -0,0 +1,11 @@
+--- 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
+ 
diff --git a/x11/mlterm/pkg-plist b/x11/mlterm/pkg-plist
index 2f2333e3f7cd..360f647e5bc3 100644
--- a/x11/mlterm/pkg-plist
+++ b/x11/mlterm/pkg-plist
@@ -23,6 +23,9 @@ lib/libmkf.a
 lib/libmkf.la
 lib/libmkf.so
 lib/libmkf.so.16
+lib/libmlterm_core.a
+lib/libmlterm_core.la
+lib/libmlterm_core.so
 lib/libvte-mlterm.a
 lib/libvte-mlterm.la
 lib/libvte-mlterm.so
@@ -42,6 +45,9 @@ lib/mkf/libmkf_zh.so
 lib/mlterm/libathena.a
 lib/mlterm/libathena.la
 lib/mlterm/libathena.so
+%%FRIBIDI%%lib/mlterm/libctl_bidi.a
+%%FRIBIDI%%lib/mlterm/libctl_bidi.la
+%%FRIBIDI%%lib/mlterm/libctl_bidi.so
 %%IBUS%%lib/mlterm/libim-ibus.a
 %%IBUS%%lib/mlterm/libim-ibus.la
 %%IBUS%%lib/mlterm/libim-ibus.so
@@ -72,6 +78,12 @@ lib/mlterm/libsample.so
 lib/mlterm/libsample2.a
 lib/mlterm/libsample2.la
 lib/mlterm/libsample2.so
+%%CAIRO%%lib/mlterm/libtype_cairo.a
+%%CAIRO%%lib/mlterm/libtype_cairo.la
+%%CAIRO%%lib/mlterm/libtype_cairo.so
+lib/mlterm/libtype_xft.a
+lib/mlterm/libtype_xft.la
+lib/mlterm/libtype_xft.so
 libexec/mlconfig
 libexec/mlimgloader
 libexec/mlterm-menu