Date: Sun, 21 May 2006 13:53:55 +0900 (JST) From: KIMURA Yasuhiro <yasu@utahime.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: nobutaka@FreeBSD.org Subject: ports/97543: [PATCH] x11/mlterm: New version 2.9.3 is released Message-ID: <20060521045355.CA8B51F@eastasia.home.utahime.org> Resent-Message-ID: <200605210500.k4L50iCL021335@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97543
>Category: ports
>Synopsis: [PATCH] x11/mlterm: New version 2.9.3 is released
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun May 21 05:00:33 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: KIMURA Yasuhiro
>Release: FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD xxxx 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sat May 20 00:54:07 JST 2006 xxxx i386
>Description:
- New version 2.9.3 is released.
- Add optional support for SCIM.
>How-To-Repeat:
>Fix:
--- patch-mlterm begins here ---
Index: Makefile
===================================================================
RCS file: /usr1/freebsd/cvsroot/ports/x11/mlterm/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile 13 May 2006 05:00:20 -0000 1.35
+++ Makefile 21 May 2006 03:48:11 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= mlterm
-PORTVERSION= 2.9.2
-PORTREVISION= 2
+PORTVERSION= 2.9.3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -25,6 +24,7 @@
CONFIGURE_ENV= LIBS=-L${LOCALBASE}/lib CFLAGS=-I${LOCALBASE}/include
OPTIONS= FRIBIDI "Use Fribidi for BiDi rendering" off \
+ SCIM "SCIM support" off \
UIM "uim support" off \
M17NLIB "m17n library support" off \
IIIMF "IIIMF support (broken)" off
@@ -36,6 +36,15 @@
LIB_DEPENDS+= fribidi.0:${PORTSDIR}/converters/fribidi
.endif
+.if defined(WITH_SCIM)
+CONFIGURE_ARGS+= --enable-scim
+MAKE_ENV= LIBS_LOCAL=-L${X11BASE}/lib
+LIB_DEPENDS+= scim-1.0.9:${PORTSDIR}/textproc/scim
+PLIST_SUB+= SCIM=""
+.else
+PLIST_SUB+= SCIM="@comment "
+.endif
+
.if defined(WITH_UIM)
CONFIGURE_ARGS+= --enable-uim
MAKE_ENV= LIBS_LOCAL=-L${LOCALBASE}/lib
Index: distinfo
===================================================================
RCS file: /usr1/freebsd/cvsroot/ports/x11/mlterm/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo 24 Jan 2006 03:16:02 -0000 1.16
+++ distinfo 21 May 2006 03:48:23 -0000
@@ -1,3 +1,3 @@
-MD5 (mlterm-2.9.2.tar.gz) = be561bfe646a112ce7400b9d0db41e82
-SHA256 (mlterm-2.9.2.tar.gz) = e5ff08c516c4edabc51b12e177b6e653a8d01ea5bec2684b9db2c75ec95d268a
-SIZE (mlterm-2.9.2.tar.gz) = 1980109
+MD5 (mlterm-2.9.3.tar.gz) = 20188c0981a49dbb95c3ff5b8eb25365
+SHA256 (mlterm-2.9.3.tar.gz) = 565e2d3d391390450b953b13f4c1ebf6e67e188c1ec56583459842e592a08e4f
+SIZE (mlterm-2.9.3.tar.gz) = 1984977
Index: pkg-plist
===================================================================
RCS file: /usr1/freebsd/cvsroot/ports/x11/mlterm/pkg-plist,v
retrieving revision 1.11
diff -u -r1.11 pkg-plist
--- pkg-plist 23 Feb 2006 10:39:58 -0000 1.11
+++ pkg-plist 21 May 2006 04:29:21 -0000
@@ -34,6 +34,9 @@
%%M17NLIB%%lib/mlterm/libim-m17nlib.a
%%M17NLIB%%lib/mlterm/libim-m17nlib.la
%%M17NLIB%%lib/mlterm/libim-m17nlib.so
+%%SCIM%%lib/mlterm/libim-scim.a
+%%SCIM%%lib/mlterm/libim-scim.la
+%%SCIM%%lib/mlterm/libim-scim.so
%%UIM%%lib/mlterm/libim-uim.a
%%UIM%%lib/mlterm/libim-uim.la
%%UIM%%lib/mlterm/libim-uim.so
Index: files/patch-kiklib:configure
===================================================================
RCS file: /usr1/freebsd/cvsroot/ports/x11/mlterm/files/patch-kiklib:configure,v
retrieving revision 1.2
diff -u -r1.2 patch-kiklib:configure
--- files/patch-kiklib:configure 18 Feb 2006 18:47:23 -0000 1.2
+++ files/patch-kiklib:configure 21 May 2006 04:24:54 -0000
@@ -1,19 +1,74 @@
---- kiklib/configure.orig Sun Feb 19 02:28:35 2006
-+++ kiklib/configure Sun Feb 19 03:03:42 2006
-@@ -7261,11 +7261,7 @@
+--- kiklib/configure.orig Sun May 21 13:21:24 2006
++++ kiklib/configure Sun May 21 13:24:06 2006
+@@ -7299,66 +7299,7 @@
if test "$kik_cv_mingw32" = yes ; then
kik_cv_pty=win32
else
-- if test -c /dev/ptmx ; then
+- echo $ac_n "checking for posix_openpt""... $ac_c" 1>&6
+-echo "configure:7304: checking for posix_openpt" >&5
+-if eval "test \"`echo '$''{'ac_cv_func_posix_openpt'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- cat > conftest.$ac_ext <<EOF
+-#line 7309 "configure"
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char posix_openpt(); below. */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char posix_openpt();
+-
+-int main() {
+-
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_posix_openpt) || defined (__stub___posix_openpt)
+-choke me
+-#else
+-posix_openpt();
+-#endif
+-
+-; return 0; }
+-EOF
+-if { (eval echo configure:7332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- eval "ac_cv_func_posix_openpt=yes"
+-else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- eval "ac_cv_func_posix_openpt=no"
+-fi
+-rm -f conftest*
+-fi
+-
+-if eval "test \"`echo '$ac_cv_func_'posix_openpt`\" = yes"; then
+- echo "$ac_t""yes" 1>&6
+-
+- cat >> confdefs.h <<\EOF
+-#define HAVE_POSIX_OPENPT
+-EOF
+-
- kik_cv_pty=streams
-- else
-- kik_cv_pty=bsd
-- fi
+-
+-else
+- echo "$ac_t""no" 1>&6
+-
+- if test -c /dev/ptmx ; then
+- kik_cv_pty=streams
+- else
+- kik_cv_pty=bsd
+- fi
+-fi
+-
+ kik_cv_pty=bsd
fi
fi
-@@ -7535,11 +7531,6 @@
+@@ -7623,11 +7564,6 @@
*) # Relative path.
srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
top_srcdir="$ac_dots$ac_given_srcdir" ;;
--- patch-mlterm ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060521045355.CA8B51F>