Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/x11
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29473
Modified Files:
mlterm.info mlterm.patch xforms.info
Log Message:
move to stable
Index: mlterm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/x11/mlterm.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mlterm.info 20 Mar 2005 15:47:21 -0000 1.2
+++ mlterm.info 19 Apr 2005 13:41:29 -0000 1.3
@@ -1,24 +1,32 @@
Package: mlterm
-Version: 2.8.0
-Revision: 18
+Version: 2.9.2
+Revision: 5
License: BSD
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Description: Multilingual terminal emulator on X11
-BuildDepends: fribidi-dev, imlib, libjpeg, libpng3, libtiff, giflib,
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, x11-dev, freetype2,
xft2-dev, gtk+, glib, pkgconfig, autoconf2.5, libtool14, automake1.6
-Depends: fribidi-shlibs, imlib-shlibs, libjpeg-shlibs, libpng3-shlibs,
libtiff-shlibs, giflib-shlibs, x11-shlibs, freetype2-shlibs, xft2-shlibs,
gtk+-shlibs, gettext, libiconv, glib-shlibs
+BuildDepends: <<
+ fribidi-dev, libjpeg, libpng3, libtiff, giflib,
+ x11-dev, fontconfig1-dev, xft2-dev,
+ gtk+2-dev, atk1 (>= 1.6.0-1), glib2-dev (>= 2.4.0-1), pango1-xft2-dev (>=
1.4.0-1),
+ gettext-dev, gettext-tools (>= 0.14-1), libiconv-dev,
+ pkgconfig, autoconf2.5, libtool14, automake1.6
+<<
+Depends: <<
+ fribidi-shlibs, libjpeg-shlibs, libpng3-shlibs, libtiff-shlibs,
giflib-shlibs,
+ x11-shlibs, fontconfig1-shlibs, xft2-shlibs,
+ gtk+2, atk1-shlibs (>= 1.6.0-1), glib2 (>= 2.4.0-1), pango1-xft2 (>=
1.4.0-1),
+ gettext, libiconv
+<<
Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 69b38c6909ba8cd2e81edd18fc612b1f
-Source2: mirror:sourceforge:%n/%n-%vpl1.tar.gz
-Source2-MD5: 66a0d3b21e6bfcc7919b579794f70479
+Source-MD5: be561bfe646a112ce7400b9d0db41e82
PatchScript: <<
#!/bin/sh
set -e
set -x
-patch -p0 < ../%n-%vpl1/%n-%vpl1.patch
patch -p1 < %a/%n.patch
for dir in . mkf kiklib; do (
cd $dir
- %p/bin/libtoolize --force
+ %p/bin/libtoolize --copy --force
rm -f aclocal.m4
%p/bin/aclocal-1.6
%p/bin/autoconf
@@ -26,7 +34,7 @@
done
<<
# Don't remove --config-cache to workaround libtool.m4's(?) bug
-ConfigureParams: --config-cache --enable-shared --with-imagelib=imlib
--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
+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
InstallScript: <<
make install DESTDIR=%d
install -d -m 755 %i/share/doc
@@ -48,5 +56,20 @@
%p/etc/mlterm/tfont
%p/etc/mlterm/vfont
<<
-DocFiles: ChangeLog README LICENCE ABOUT-NLS
+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.
+
+ This package builddepends on the tools of gettext 0.14 due to the
+ makefiles, but still uses gettext 0.10 at the run time just because
+ there is no need to migrate to the 0.14 now.
+<<
Homepage: http://mlterm.sourceforge.net/
Index: mlterm.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/x11/mlterm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mlterm.patch 2 Oct 2004 11:13:09 -0000 1.1
+++ mlterm.patch 19 Apr 2005 13:41:29 -0000 1.2
@@ -1,29 +1,13 @@
-diff -Nru mlterm-2.8.0.orig+pl1/mkf/lib/Makefile.in
mlterm-2.8.0/mkf/lib/Makefile.in
---- mlterm-2.8.0.orig+pl1/mkf/lib/Makefile.in Sun Oct 5 22:10:15 2003
-+++ mlterm-2.8.0/mkf/lib/Makefile.in Thu Apr 29 22:41:08 2004
-@@ -18,7 +18,7 @@
-
- CFLAGS = $(CFLAGS_LOCAL) @DEB_CFLAGS@ @KIK_CFLAGS@ @TABLE_CFLAGS@ @CFLAGS@
@CPPFLAGS@ -I/usr/local/include
- LIBS = $(LIBS_LOCAL)
--LDFLAGS = @LDFLAGS@ -L${top_builddir}/kiklib/src/.libs
${top_builddir}/kiklib/src/libkik.la
-+LDFLAGS = @LDFLAGS@ ${top_builddir}/kiklib/src/libkik.la
+diff -Nru mlterm-2.9.2.orig/tool/mlconfig/po/Makefile.in.in
mlterm-2.9.2/tool/mlconfig/po/Makefile.in.in
+--- mlterm-2.9.2.orig/tool/mlconfig/po/Makefile.in.in Sun Jan 12 19:08:51 2003
++++ mlterm-2.9.2/tool/mlconfig/po/Makefile.in.in Sun Apr 3 02:29:55 2005
+@@ -26,8 +26,7 @@
- PARSER_OBJ = mkf_parser.o mkf_iso2022_parser.o mkf_iso8859_parser.o
mkf_xct_parser.o \
- mkf_eucjp_parser.o mkf_euckr_parser.o mkf_euccn_parser.o
mkf_iso2022jp_parser.o \
-diff -Nru mlterm-2.8.0.orig+pl1/tool/mlconfig/po/Makefile.in.in
mlterm-2.8.0/tool/mlconfig/po/Makefile.in.in
---- mlterm-2.8.0.orig+pl1/tool/mlconfig/po/Makefile.in.in Sun Oct 5
22:10:06 2003
-+++ mlterm-2.8.0/tool/mlconfig/po/Makefile.in.in Thu Apr 29 22:39:15 2004
-@@ -18,6 +18,13 @@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo
"$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = @MKINSTALLDIRS@
-+DOMAIN = $(PACKAGE)
-+subdir = tool/mlconfig/po
-+top_builddir = @top_builddir@
-+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
-+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
-+EXTRA_LOCALE_CATEGORIES =
-+
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
Index: xforms.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/x11/xforms.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xforms.info 19 Aug 2004 12:19:44 -0000 1.2
+++ xforms.info 19 Apr 2005 13:41:29 -0000 1.3
@@ -1,48 +1,38 @@
Package: xforms
-Version: 1.0
-Revision: 15
-Source: http://savannah.nongnu.org/download/%n/stable.pkg/%v/%n-%v.tar.gz
-Source-MD5: 64adf1c489b629a92218f7c140f4bdaf
+Version: 1.0.90
+Revision: 1
+Source: http://savannah.nongnu.org/download/%n/%n-%v.tar.gz
+Source-MD5: 558b600402430f207e671e2d0d725b6d
Depends: %N-shlibs (= %v-%r), %N-bin
Replaces: xforms-shlibs (<= 1.0-1)
BuildDependsOnly: true
-BuildDepends: fink (>= 0.9.9), libtiff, libjpeg, x11-dev
-PatchScript: <<
- sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
-<<
-CompileScript: <<
- xmkmf -a
- make EXTENSIONLIB="-L/usr/X11R6/lib -lXext"
-<<
-InstallScript: <<
- make install install.man DESTDIR=%d MANPATH=%p/share/man
- (cd demos; /bin/rm -f *.o)
- (mkdir -p %i/share/doc/%n; cp -R demos %i/share/doc/%n)
- /bin/rm -rf %d/usr
- (cd %i/include; ln -s X11/forms.h forms.h)
-<<
+BuildDepends: fink (>= 0.9.9), libjpeg, x11-dev, gcc3.3
+SetCC: gcc-3.3
+SetCXX: g++-3.3
+SetCPPFLAGS: -I/usr/X11R6/include
+ConfigureParams: --with-extra-prefix=%p --enable-gl
--mandir='${prefix}/share/man'
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<< 0.99-1)
- Depends: x11, libtiff-shlibs, libjpeg-shlibs, libgl
+ Depends: x11
Suggests: %N-bin
Files: lib/lib*.*.dylib
Shlibs: <<
- %p/lib/libflimage.1.dylib 1.0.0 %n (>= 1.0-14)
- %p/lib/libforms.1.dylib 1.0.0 %n (>= 1.0-14)
- %p/lib/libformsGL.1.dylib 1.0.0 %n (>= 1.0-14)
+ %p/lib/libflimage.1.dylib 2.0.0 %n (>= 1.0.90-1)
+ %p/lib/libforms.1.dylib 2.0.0 %n (>= 1.0.90-1)
+ %p/lib/libformsGL.1.dylib 2.0.0 %n (>= 1.0.90-1)
<<
- DocFiles: COPYING 00README
+ DocFiles: COPYING.LIB README NEWS
<<
SplitOff2: <<
Package: %N-bin
Replaces: %N (<< 0.99-1)
Depends: %N-shlibs (= %v-%r)
Files: bin share/man
- DocFiles: COPYING 00README
+ DocFiles: COPYING.LIB README NEWS
<<
Description: GUI toolkit based on Xlib
License: GPL
-DocFiles: COPYING 00README
-Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
-Homepage: http://world.std.com/~xforms/
+DocFiles: COPYING.LIB README NEWS
+Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
+Homepage: http://www.nongnu.org/xforms/
-------------------------------------------------------
This SF.Net email is sponsored by: New Crystal Reports XI.
Version 11 adds new functionality designed to reduce time involved in
creating, integrating, and deploying reporting solutions. Free runtime info,
new features, or free trial, at: http://www.businessobjects.com/devxi/728
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
