Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11
In directory vz-cvs-3.sog:/tmp/cvs-serv7677

Added Files:
        mlterm.info mlterm.patch 
Log Message:
OK for 10.7.

--- NEW FILE: mlterm.info ---
Package: mlterm
Version: 2.9.4
Revision: 4
License: BSD
Maintainer: Todai Fink Team <f...@sodan.ecc.u-tokyo.ac.jp>
Description: Multilingual terminal emulator on X11
BuildDepends: <<
  fink (>= 0.28),
  glitz, expat1, cairo (>= 1.6-1), fontconfig2-dev (>= 2.4.1-1), freetype219 
(>= 2.3.5-1),
  fribidi-dev (>= 0.19.2-2), libjpeg8, libpng14, libtiff, giflib,
  x11-dev, xft2-dev (>= 2.1.2-5),
  gtk+2-dev (>= 2.12.0-1), atk1 (>= 1.20.0-1), glib2-dev (>= 2.14.0-1), 
pango1-xft2-ft219-dev (>= 1.18.4-4), pixman (>= 0.10.0-1),
  libgettext8-dev, gettext-tools (>= 0.17-1), libiconv-dev,
  pkgconfig (>= 0.21-1), autoconf2.6, libtool2, automake1.11
<<
Depends: <<
  fribidi-shlibs (>= 0.19.2-2), libjpeg8-shlibs, libpng14-shlibs, 
libtiff-shlibs, giflib-shlibs,
  x11-shlibs, xft2-shlibs,
  gtk+2 (>= 2.12.0-1), atk1-shlibs (>= 1.20.0-1), glib2-shlibs (>= 2.14.0-1), 
pango1-xft2-ft219-shlibs (>= 1.18.4-4),
  libgettext8-shlibs, libiconv
<<
Conflicts: %N-shlibs (<< 2.9.4)
Replaces: %N-shlibs (<< 2.9.4)
Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: 67fc33f09da045f86b0d4ceebed76aac
PatchFile: %n.patch
PatchFile-MD5: f6d4bc88f9a3873b6d8f412a0844e89b
PatchScript: <<
#!/bin/sh -ex
patch -p1 < %{PatchFile}
for dir in . mkf kiklib; do (
    cd $dir
    %p/bin/libtoolize --force
    rm -f aclocal.m4
    %p/bin/aclocal
    %p/bin/autoconf
    ) || exit $?
done
for mk in `find . -name Makefile.in -or -name Makefile.in.in`; do
    echo 'datarootdir=@datarootdir@' >> $mk
done
<<
ConfigureParams: --enable-shared --with-imagelib=gdk-pixbuf --enable-fribidi 
--enable-ind --prefix=%p --libexecdir=%p/lib/mlterm --infodir=%p/share/info 
--mandir=%p/share/man --with-libiconv-prefix=%p --with-libintl-prefix=%p 
--enable-anti-alias --disable-dependency-tracking 
--with-scrollbars=pixmap_engine,simple,sample,extra
CompileScript: <<
#!/bin/sh -ev

        export 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
        ./configure %c
        make
<<
InstallScript: <<
  make -j1 install DESTDIR=%d
  install -d -m 755 %i/share/doc
  /bin/cp -R doc %i/share/doc/%n
  install -d -m 755 %i/share/doc/%n/etc
  install -m 644 etc/main.ja etc/font.ja %i/share/doc/%n/etc
<<
ConfFiles: <<
%p/etc/mlterm/color
%p/etc/mlterm/main
%p/etc/mlterm/menu
%p/etc/mlterm/termcap
%p/etc/mlterm/vaafont
%p/etc/mlterm/xim
%p/etc/mlterm/aafont
%p/etc/mlterm/font
%p/etc/mlterm/key
%p/etc/mlterm/taafont
%p/etc/mlterm/tfont
%p/etc/mlterm/vfont
<<
Shlibs: <<
  !%p/lib/libkik.11.dylib
  !%p/lib/libmkf.13.dylib
<<
#SplitOff: <<
#  Package: %N-shlibs
#  Depends: fink-obsolete-packages
#  Description: Dummy package. Merged into mlterm
#  DocFiles: dummy-package.txt
#<<
DocFiles: README LICENCE ABOUT-NLS
DescPort: <<
  This package depends on the freetype and fontconfig contained in
  the installed X11 indirectly due to xft2. It means, for example,
  the binary built with Apple's X11 might not run where xorg is installed.

  In contrast, it is generally safe to link the mlterm against another
  version of the freetype or fontconfig is generally safe as long as
  twolevel_namespace is used. It may happen if the m17n-lib support is
  enabled in future. If it happens, don't forget to add the appropreate
  libraries to BuildDepends and help the configure to find them.

  Autoconf 2.5 or higher is needed to update libtool to build dynamically
  loadable scrollbar modules. M4 files shipped with gettext-tools 0.14.x
  is used in this step.

  We define datarootdir in makefiles to prevent warnings by autoconf >= 2.6.

  MacOS X >= 10.4 has posix_openpt() but needs ioctl(TIOCSTTY) instead of
  open(slavetty) to acquire a controlling tty. The patch to
  kik_pty_streams.c solves the problem. MacOS X <= 10.3 only has the
  traditional BSD ptys and does not affected by the problem.
<<
DescPackaging: <<
        dmacks: @MKINSTALLDIRS@ isn't being replaced by autoconf, so
        the hacked form of tool/mlconfig/po/Makefile.in.in fails. But
        the original would fail too for same reason. So just use what
        the ac macro might reasonably set there.
<<
Homepage: http://mlterm.sourceforge.net/

--- NEW FILE: mlterm.patch ---
diff -Naur mlterm-2.9.4.orig/configure.in mlterm-2.9.4/configure.in
--- mlterm-2.9.4.orig/configure.in      2007-11-30 09:30:02.000000000 +0000
+++ mlterm-2.9.4/configure.in   2009-08-11 07:19:41.000000000 +0000
@@ -31,6 +31,7 @@
 dnl The ugly part should be replaced by:
 dnl  AC_PATH_TOOL(PKG_CONFIG, pkg-config)
 
+m4_ifdef([m4_pattern_allow], [m4_pattern_allow([PKG_CONFIG_.*])])
 if test x"${build}" != x"${host}"; then
        AC_CHECK_TOOL(CC, gcc)
        AC_CHECK_TOOL(AR, ar)
diff -Naur mlterm-2.9.4.orig/dummy-package.txt mlterm-2.9.4/dummy-package.txt
--- mlterm-2.9.4.orig/dummy-package.txt 1970-01-01 00:00:00.000000000 +0000
+++ mlterm-2.9.4/dummy-package.txt      2009-08-11 07:23:59.000000000 +0000
@@ -0,0 +1,2 @@
+The mlterm-shlibs package is merged into mlterm.
+You may remove this dummy package safely.
diff -Naur mlterm-2.9.4.orig/kiklib/configure.in 
mlterm-2.9.4/kiklib/configure.in
--- mlterm-2.9.4.orig/kiklib/configure.in       2006-10-20 09:04:01.000000000 
+0000
+++ mlterm-2.9.4/kiklib/configure.in    2009-08-11 07:19:41.000000000 +0000
@@ -251,7 +251,6 @@
        else
                AC_CHECK_FUNC( posix_openpt,
                        [
-                       AC_DEFINE(HAVE_POSIX_OPENPT,,"HAVE_POSIX_OPENPT")
                        kik_cv_pty=streams
                        ], [
                        if test -c /dev/ptmx ; then
@@ -263,6 +262,9 @@
 AC_MSG_RESULT($kik_cv_pty)
 PTY_NAME="${kik_cv_pty}"
 AC_SUBST(PTY_NAME)
+if test "x$ac_cv_func_posix_openpt" = xyes; then
+       AC_DEFINE(HAVE_POSIX_OPENPT,,"HAVE_POSIX_OPENPT")
+fi
 
 
 #
diff -Naur mlterm-2.9.4.orig/kiklib/src/kik_pty_streams.c 
mlterm-2.9.4/kiklib/src/kik_pty_streams.c
--- mlterm-2.9.4.orig/kiklib/src/kik_pty_streams.c      2006-10-19 
14:41:51.000000000 +0000
+++ mlterm-2.9.4/kiklib/src/kik_pty_streams.c   2009-08-11 07:19:41.000000000 
+0000
@@ -2,6 +2,9 @@
  *     $Id: kik_pty_streams.c,v 1.21 2006/10/19 14:41:51 h_minami Exp $
  */
 
+#if defined(__APPLE__) && defined(__MACH__) /* MacOS X */
+# define _APPLE_C_SOURCE
+#else
 /* ptsname/grantpt/unlockpt are not available without _XOPEN_SOURCE
  * on GNU libc based systems. (It may have some ill side-effect though) */
 #define  _XOPEN_SOURCE 500
@@ -12,6 +15,7 @@
 
 /* for solaris */
 #define __EXTENSIONS__
+#endif /* not MacOS X */
 
 #include  "kik_pty.h"
 
@@ -245,6 +249,12 @@
                }
 #endif /*TIOCNOTTY*/
 #endif /*HAVE_SETSID*/
+#ifdef TIOCSCTTY /* BSD (in addition Linux also knows TIOCSCTTY) */
+               if(ioctl(*slave, TIOCSCTTY, NULL) < 0)
+               {
+                       return -1 ;
+               }
+#else /* no TIOCSCTTY (SysV) */
                fd = open("/dev/tty", O_RDWR | O_NOCTTY);
                if (fd >= 0)
                {
@@ -261,6 +271,7 @@
                        return -1;
                }
                close(fd);
+#endif /* no TIOCSCTTY (SysV) */
 
                dup2( *slave , 0) ;
                dup2( *slave , 1) ;
diff -Naur mlterm-2.9.4.orig/tool/mlconfig/po/Makefile.in.in 
mlterm-2.9.4/tool/mlconfig/po/Makefile.in.in
--- mlterm-2.9.4.orig/tool/mlconfig/po/Makefile.in.in   2003-01-12 
10:08:51.000000000 +0000
+++ mlterm-2.9.4/tool/mlconfig/po/Makefile.in.in        2005-04-02 
17:29:55.000000000 +0000
@@ -26,8 +26,7 @@
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo 
"$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = $(top_srcdir)/script/install-sh -d
 
 GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@


------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure 
contains a definitive record of customers, application performance, 
security threats, fraudulent activity, and more. Splunk takes this 
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to