Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15168
Modified Files:
mlterm.info mlterm.patch
Log Message:
cleaned up deps for modern GNOME; turned off static libs because this
package does not have any headers or public shared libraries; fixed -I
ordering (local must come before global); fribidi uses .pc not -config
now.
Index: mlterm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11/mlterm.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mlterm.info 6 Jul 2013 19:08:14 -0000 1.2
+++ mlterm.info 29 Jul 2013 18:52:46 -0000 1.3
@@ -1,30 +1,47 @@
Package: mlterm
Version: 2.9.4
-Revision: 104
+Revision: 105
License: BSD
Maintainer: Todai Fink Team <f...@sodan.ecc.u-tokyo.ac.jp>
Description: Multilingual terminal emulator on X11
BuildDepends: <<
- fink (>= 0.32),
- 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
+ atk1 (>= 1.28.0-1),
+ autoconf2.6,
+ automake1.13,
+ cairo (>= 1.12.8-1),
+ fink (>= 0.32),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.10.0-1),
+ freetype219 (>= 2.4.11-1),
+ fribidi-dev (>= 0.19.5-1),
+ gettext-tools (>= 0.17-1),
+ glib2-dev (>= 2.22.0-1),
+ gtk+2-dev (>= 2.18.0-1),
+ libgettext8-dev,
+ libiconv-dev,
+ libtool2,
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pkgconfig (>= 0.23),
+ x11-dev,
+ xft2-dev (>= 2.2.0-1)
<<
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
+ atk1-shlibs (>= 1.28.0-1),
+ fribidi-shlibs (>= 0.19.5-1),
+ glib2-shlibs (>= 2.22.0-1),
+ gtk+2 (>= 2.18.0-1),
+ libgettext8-shlibs,
+ libiconv,
+ pango1-xft2-ft219-shlibs (>= 1.18.4-4),
+ x11-shlibs,
+ xft2-shlibs (>= 2.2.0-1)
<<
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
+PatchFile-MD5: 4bd717bf9b03faa096826ec853c50028
PatchScript: <<
#!/bin/sh -ex
patch -p1 < %{PatchFile}
@@ -40,13 +57,12 @@
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
+SetCPPFLAGS: -MD
+ConfigureParams: --enable-shared --disable-static --with-imagelib=gdk-pixbuf
--enable-fribidi --enable-ind --libexecdir=%p/lib/mlterm
--infodir=%p/share/info --mandir=%p/share/man --with-libiconv-prefix=%p
--with-libintl-prefix=%p --enable-anti-alias
--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
+ fink-package-precedence --depfile-ext='\.d' .
<<
InstallScript: <<
make -j1 install DESTDIR=%d
@@ -107,5 +123,10 @@
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.
+
+ dmacks: cleaned up deps for modern GNOME; turned off static
+ libs because this package does not have any headers or public
+ shared libraries; fixed -I ordering (local must come before
+ global); fribidi uses .pc not -config now.
<<
Homepage: http://mlterm.sourceforge.net/
Index: mlterm.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11/mlterm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mlterm.patch 3 Dec 2011 05:06:42 -0000 1.1
+++ mlterm.patch 29 Jul 2013 18:52:46 -0000 1.2
@@ -1,6 +1,6 @@
-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
+diff -Nurd -x'*~' mlterm-2.9.4.orig/configure.in mlterm-2.9.4/configure.in
+--- mlterm-2.9.4.orig/configure.in 2007-11-30 04:30:02.000000000 -0500
++++ mlterm-2.9.4/configure.in 2013-07-29 14:39:55.000000000 -0400
@@ -31,6 +31,7 @@
dnl The ugly part should be replaced by:
dnl AC_PATH_TOOL(PKG_CONFIG, pkg-config)
@@ -9,15 +9,181 @@
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
+@@ -90,11 +91,8 @@
+ [ --enable-fribidi bidi[default=disabled]],
+ fribidi=$enable_fribidi, fribidi="no")
+ if test "$fribidi" = "yes" ; then
+- AC_CHECK_PROG(fribidi_config,fribidi-config,yes,fribidi="no")
+- if test "$fribidi_config" = "yes" ; then
+- FRIBIDI_CFLAGS="`fribidi-config --cflags` -DUSE_FRIBIDI"
+- FRIBIDI_LIBS="`fribidi-config --libs`"
+- fi
++ PKG_CHECK_MODULES(FRIBIDI, fribidi)
++ FRIBIDI_CFLAGS="${FRIBIDI_CFLAGS} -DUSE_FRIBIDI"
+ fi
+ AC_SUBST(FRIBIDI_CFLAGS)
+ AC_SUBST(FRIBIDI_LIBS)
+diff -Nurd -x'*~' mlterm-2.9.4.orig/contrib/scrollbar/extra/Makefile.in
mlterm-2.9.4/contrib/scrollbar/extra/Makefile.in
+--- mlterm-2.9.4.orig/contrib/scrollbar/extra/Makefile.in 2005-03-13
11:07:47.000000000 -0500
++++ mlterm-2.9.4/contrib/scrollbar/extra/Makefile.in 2013-07-29
13:41:16.000000000 -0400
+@@ -15,7 +15,7 @@
+ MOZMODERN_OBJ = mozmodern.o
+ NEXT_OBJ = next.o
+
+-CFLAGS = $(CFLAGS_LOCAL) -I$(top_srcdir)/xwindow @CFLAGS@ @CPPFLAGS@
@X_CFLAGS@ -I/usr/include/include
++CFLAGS = -I$(top_srcdir)/xwindow $(CFLAGS_LOCAL) @CFLAGS@ @CPPFLAGS@
@X_CFLAGS@
+
+ CC = @CC@
+ INSTALL = @INSTALL@
+diff -Nurd -x'*~'
mlterm-2.9.4.orig/contrib/scrollbar/pixmap_engine/Makefile.in
mlterm-2.9.4/contrib/scrollbar/pixmap_engine/Makefile.in
+--- mlterm-2.9.4.orig/contrib/scrollbar/pixmap_engine/Makefile.in
2005-03-13 11:07:48.000000000 -0500
++++ mlterm-2.9.4/contrib/scrollbar/pixmap_engine/Makefile.in 2013-07-29
13:41:07.000000000 -0400
+@@ -15,7 +15,7 @@
+ SAMPLES = sample3
+ PIXMAP_ENGINE_OBJ = pixmap_engine.o
+
+-CFLAGS = $(CFLAGS_LOCAL) -I$(top_srcdir)/xwindow @CFLAGS@ @CPPFLAGS@
@X_CFLAGS@ -I/usr/include/include
++CFLAGS = -I$(top_srcdir)/xwindow $(CFLAGS_LOCAL) @CFLAGS@ @CPPFLAGS@
@X_CFLAGS@
+
+ CC = @CC@
+ INSTALL = @INSTALL@
+diff -Nurd -x'*~' mlterm-2.9.4.orig/dummy-package.txt
mlterm-2.9.4/dummy-package.txt
+--- mlterm-2.9.4.orig/dummy-package.txt 1969-12-31 19:00:00.000000000
-0500
++++ mlterm-2.9.4/dummy-package.txt 2013-07-29 13:34:19.000000000 -0400
@@ -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
+diff -Nurd -x'*~' mlterm-2.9.4.orig/inputmethod/iiimf/Makefile.in
mlterm-2.9.4/inputmethod/iiimf/Makefile.in
+--- mlterm-2.9.4.orig/inputmethod/iiimf/Makefile.in 2005-10-04
13:25:07.000000000 -0400
++++ mlterm-2.9.4/inputmethod/iiimf/Makefile.in 2013-07-29 13:39:47.000000000
-0400
+@@ -12,7 +12,9 @@
+
+ IM_IIIMF_OBJ = im_iiimf.o im_iiimf_aux.o keymap.o
+
+-CFLAGS = $(CFLAGS_LOCAL) \
++CFLAGS = -I$(top_srcdir)/mlterm \
++ -I${top_srcdir}/xwindow \
++ $(CFLAGS_LOCAL) \
+ @KIK_CFLAGS@ \
+ @MKF_CFLAGS@ \
+ @DEB_CFLAGS@ \
+@@ -20,10 +22,7 @@
+ @CFLAGS@ \
+ @CPPFLAGS@ \
+ @IM_CFLAGS@ \
+- @IIIMF_CFLAGS@ \
+- -I$(top_srcdir)/mlterm \
+- -I${top_srcdir}/xwindow \
+- -I/usr/local/include
++ @IIIMF_CFLAGS@
+
+ LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @MKF_LIBS_FOR_MODULE@ @IIIMF_LIBS@
+
+diff -Nurd -x'*~' mlterm-2.9.4.orig/inputmethod/kbd/Makefile.in
mlterm-2.9.4/inputmethod/kbd/Makefile.in
+--- mlterm-2.9.4.orig/inputmethod/kbd/Makefile.in 2005-03-13
11:07:48.000000000 -0500
++++ mlterm-2.9.4/inputmethod/kbd/Makefile.in 2013-07-29 13:39:37.000000000
-0400
+@@ -12,16 +12,15 @@
+
+ IM_KBD_OBJ = im_kbd.o
+
+-CFLAGS = $(CFLAGS_LOCAL) \
++CFLAGS = -I$(top_srcdir)/mlterm \
++ -I${top_srcdir}/xwindow \
++ $(CFLAGS_LOCAL) \
+ @KIK_CFLAGS@ \
+ @MKF_CFLAGS@ \
+ @DEB_CFLAGS@ \
+ @X_CFLAGS@ \
+ @CFLAGS@ \
+- @CPPFLAGS@ \
+- -I$(top_srcdir)/mlterm \
+- -I${top_srcdir}/xwindow \
+- -I/usr/local/include
++ @CPPFLAGS@
+
+ LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @MKF_LIBS_FOR_MODULE@
+
+diff -Nurd -x'*~' mlterm-2.9.4.orig/inputmethod/m17nlib/Makefile.in
mlterm-2.9.4/inputmethod/m17nlib/Makefile.in
+--- mlterm-2.9.4.orig/inputmethod/m17nlib/Makefile.in 2005-03-13
11:07:48.000000000 -0500
++++ mlterm-2.9.4/inputmethod/m17nlib/Makefile.in 2013-07-29
13:39:26.000000000 -0400
+@@ -12,7 +12,9 @@
+
+ IM_M17NLIB_OBJ = im_m17nlib.o
+
+-CFLAGS = $(CFLAGS_LOCAL) \
++CFLAGS = -I$(top_srcdir)/mlterm \
++ -I${top_srcdir}/xwindow \
++ $(CFLAGS_LOCAL) \
+ @KIK_CFLAGS@ \
+ @MKF_CFLAGS@ \
+ @DEB_CFLAGS@ \
+@@ -20,10 +22,7 @@
+ @CFLAGS@ \
+ @CPPFLAGS@ \
+ @IM_CFLAGS@ \
+- @M17NLIB_CFLAGS@ \
+- -I$(top_srcdir)/mlterm \
+- -I${top_srcdir}/xwindow \
+- -I/usr/local/include
++ @M17NLIB_CFLAGS@
+
+ LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @M17NLIB_LIBS@
+
+diff -Nurd -x'*~' mlterm-2.9.4.orig/inputmethod/scim/Makefile.in
mlterm-2.9.4/inputmethod/scim/Makefile.in
+--- mlterm-2.9.4.orig/inputmethod/scim/Makefile.in 2005-03-13
11:07:49.000000000 -0500
++++ mlterm-2.9.4/inputmethod/scim/Makefile.in 2013-07-29 13:38:35.000000000
-0400
+@@ -12,7 +12,9 @@
+
+ IM_SCIM_OBJ = im_scim_mod_if.o im_scim_@SCIM_VERSION@.o
+
+-CFLAGS = $(CFLAGS_LOCAL) \
++CFLAGS = -I$(top_srcdir)/mlterm \
++ -I${top_srcdir}/xwindow \
++ $(CFLAGS_LOCAL) \
+ @DEB_CFLAGS@ \
+ @KIK_CFLAGS@ \
+ @MKF_CFLAGS@ \
+@@ -21,10 +23,7 @@
+ @CPPFLAGS@ \
+ @CXXFLAGS@ \
+ @IM_CFLAGS@ \
+- @SCIM_CFLAGS@ \
+- -I$(top_srcdir)/mlterm \
+- -I${top_srcdir}/xwindow \
+- -I/usr/local/include
++ @SCIM_CFLAGS@
+
+ LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @SCIM_LIBS@
+
+diff -Nurd -x'*~' mlterm-2.9.4.orig/inputmethod/uim/Makefile.in
mlterm-2.9.4/inputmethod/uim/Makefile.in
+--- mlterm-2.9.4.orig/inputmethod/uim/Makefile.in 2005-03-13
11:07:49.000000000 -0500
++++ mlterm-2.9.4/inputmethod/uim/Makefile.in 2013-07-29 13:37:55.000000000
-0400
+@@ -12,7 +12,9 @@
+
+ IM_UIM_OBJ = im_uim.o
+
+-CFLAGS = $(CFLAGS_LOCAL) \
++CFLAGS = -I$(top_srcdir)/mlterm \
++ -I${top_srcdir}/xwindow \
++ $(CFLAGS_LOCAL) \
+ @KIK_CFLAGS@ \
+ @MKF_CFLAGS@ \
+ @DEB_CFLAGS@ \
+@@ -20,10 +22,7 @@
+ @CFLAGS@ \
+ @CPPFLAGS@ \
+ @IM_CFLAGS@ \
+- @UIM_CFLAGS@ \
+- -I$(top_srcdir)/mlterm \
+- -I${top_srcdir}/xwindow \
+- -I/usr/local/include
++ @UIM_CFLAGS@
+
+ LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @UIM_LIBS@
+
+diff -Nurd -x'*~' 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 05:04:01.000000000
-0400
++++ mlterm-2.9.4/kiklib/configure.in 2013-07-29 13:34:19.000000000 -0400
@@ -251,7 +251,6 @@
else
AC_CHECK_FUNC( posix_openpt,
@@ -36,9 +202,30 @@
#
-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
+diff -Nurd -x'*~' mlterm-2.9.4.orig/kiklib/src/Makefile.in
mlterm-2.9.4/kiklib/src/Makefile.in
+--- mlterm-2.9.4.orig/kiklib/src/Makefile.in 2006-10-19 10:41:51.000000000
-0400
++++ mlterm-2.9.4/kiklib/src/Makefile.in 2013-07-29 14:03:06.000000000
-0400
+@@ -28,7 +28,7 @@
+
+ INC = $(COMOBJ:.o=.h) kik_list.h kik_iterator.h kik_types.h kik_util.h
kik_def.h kik_net.h kik_pty.h kik_utmp.h kik_dlfcn.h
+
+-LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
++LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) -I. $(CFLAGS)
+ LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LIBS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+
+@@ -78,7 +78,7 @@
+ .SUFFIXES: .c.o
+
+ .c.o:
+- $(LIBTOOL_CC) -I. -c $<
++ $(LIBTOOL_CC) -c $<
+
+ $(LIBNAME).la : $(OBJ)
+ $(LIBTOOL_LINK) -o $(LIBNAME).la $(OBJ:.o=.lo) -rpath $(libdir) \
+diff -Nurd -x'*~' 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
10:41:51.000000000 -0400
++++ mlterm-2.9.4/kiklib/src/kik_pty_streams.c 2013-07-29 13:34:19.000000000
-0400
@@ -2,6 +2,9 @@
* $Id$
*/
@@ -78,9 +265,43 @@
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
+diff -Nurd -x'*~' mlterm-2.9.4.orig/scrollbar/sample/Makefile.in
mlterm-2.9.4/scrollbar/sample/Makefile.in
+--- mlterm-2.9.4.orig/scrollbar/sample/Makefile.in 2004-02-16
10:02:00.000000000 -0500
++++ mlterm-2.9.4/scrollbar/sample/Makefile.in 2013-07-29 13:37:11.000000000
-0400
+@@ -12,7 +12,7 @@
+
+ SAMPLE_OBJ = x_sample_sb_view.o x_transparent_sample_sb_view.o
x_sample_sb_view_lib.o
+ SAMPLE2_OBJ = x_sample2_sb_view.o x_transparent_sample2_sb_view.o
x_sample_sb_view_lib.o
+-CFLAGS = $(CFLAGS_LOCAL) -I$(top_srcdir)/xwindow @CFLAGS@ @CPPFLAGS@
@X_CFLAGS@ -I/usr/include/include
++CFLAGS = -I$(top_srcdir)/xwindow $(CFLAGS_LOCAL) @CFLAGS@ @CPPFLAGS@
@X_CFLAGS@
+
+ CC = @CC@
+ INSTALL = @INSTALL@
+diff -Nurd -x'*~' mlterm-2.9.4.orig/tool/mlconfig/Makefile.in
mlterm-2.9.4/tool/mlconfig/Makefile.in
+--- mlterm-2.9.4.orig/tool/mlconfig/Makefile.in 2005-01-15
18:55:48.000000000 -0500
++++ mlterm-2.9.4/tool/mlconfig/Makefile.in 2013-07-29 13:59:01.000000000
-0400
+@@ -25,13 +25,13 @@
+ LMKF = @MKF_LIBS@
+
+ GTK_CONFIG=@GTK_CONFIG@
+-CFLAGS = `$(GTK_CONFIG) --cflags` $(CFLAGS_LOCAL) \
+- @FRIBIDI_CFLAGS@ @IND_CFLAGS@ @AA_CFLAGS@ @IMAGELIB_CFLAGS@ \
+- @DEB_CFLAGS@ @KIK_CFLAGS@ @MKF_CFLAGS@ @CFLAGS@ @CPPFLAGS@ \
+- -I${top_srcdir}/xwindow -I${top_srcdir}/mlterm \
++CFLAGS= -I${top_srcdir}/xwindow -I${top_srcdir}/mlterm \
+ -I${top_builddir}/common -I${top_srcdir}/common \
+ -I${top_srcdir}/inputmethod \
+- -I/usr/local/include \
++ `$(GTK_CONFIG) --cflags` $(CFLAGS_LOCAL) \
++ @KIK_CFLAGS@ @MKF_CFLAGS@ \
++ @FRIBIDI_CFLAGS@ @IND_CFLAGS@ @AA_CFLAGS@ @IMAGELIB_CFLAGS@ \
++ @DEB_CFLAGS@ @CFLAGS@ @CPPFLAGS@ \
+ -DSYSCONFDIR=\"$(SYSCONFDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" \
+ -DDATADIR=\"$(DATADIR)\" -DLIBDIR=\"$(LIBDIR)\"
+ LIBS = @INTL_LIBS@ @DL_SELF@ @DL_LIBS_IM@ `$(GTK_CONFIG) --libs`
$(LIBS_LOCAL) \
+diff -Nurd -x'*~' 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
05:08:51.000000000 -0500
++++ mlterm-2.9.4/tool/mlconfig/po/Makefile.in.in 2013-07-29
13:34:19.000000000 -0400
@@ -26,8 +26,7 @@
INSTALL = @INSTALL@
@@ -91,3 +312,21 @@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
+diff -Nurd -x'*~' mlterm-2.9.4.orig/xwindow/Makefile.in
mlterm-2.9.4/xwindow/Makefile.in
+--- mlterm-2.9.4.orig/xwindow/Makefile.in 2005-01-13 12:19:37.000000000
-0500
++++ mlterm-2.9.4/xwindow/Makefile.in 2013-07-29 13:58:14.000000000 -0400
+@@ -35,12 +35,12 @@
+ LKIK_DEB = -lkik_deb
+ LMKF_DEB = -lmkf_deb
+
+-CFLAGS=$(CFLAGS_LOCAL) @AA_CFLAGS@ @KIK_CFLAGS@ @MKF_CFLAGS@ @DEB_CFLAGS@ \
++CFLAGS= -I$(top_srcdir)/mlterm -I${top_builddir}/xwindow \
++ $(CFLAGS_LOCAL) @KIK_CFLAGS@ @MKF_CFLAGS@ @AA_CFLAGS@ @DEB_CFLAGS@ \
+ @FRIBIDI_CFLAGS@ @IND_CFLAGS@ @IMAGELIB_CFLAGS@ @X_CFLAGS@ \
+ @XUTF8_CFLAGS@ @DND_CFLAGS@ @IM_CFLAGS@ @CFLAGS@ @CPPFLAGS@ \
+ -DLIBDIR=\"$(LIBDIR)\" -DSYSCONFDIR=\"$(SYSCONFDIR)\" \
+ -DLIBEXECDIR=\"$(LIBEXECDIR)\" -DDATADIR=\"$(DATADIR)\"\
+- -I$(top_srcdir)/mlterm -I${top_builddir}/xwindow -I/usr/local/include
+
+ LIBS=$(LIBS_LOCAL) @IND_LIBS@ @FRIBIDI_LIBS@ @IMAGELIB_LIBS@ @AA_LIBS@ \
+ @DL_LIBS_IM@ @DL_LIBS_SB@ \
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
