Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26040/main/finkinfo/x11

Modified Files:
      Tag: pangocairo-branch
        applex11tools.info dmenu.info fontconfig-path.info 
        fontconfig-path.patch fontconfig2-dev.patch gerbv.info 
        kaptain.info kterm.info mrxvt.info 
        openoffice.org-nocrypto.info qwt.info qwtplot3d.info 
        rxvt-ml.info rxvt-unicode.info rxvt-unicode.patch rxvt.info 
        worker.info xmhtml.patch 
Added Files:
      Tag: pangocairo-branch
        fontconfig-path-10.5.info fontconfig-path-10.5.patch 
        fontconfig2-dev-10.5.info 
Log Message:
merges from trunk

Index: fontconfig2-dev.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/fontconfig2-dev.patch,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- fontconfig2-dev.patch       3 Nov 2007 20:25:34 -0000       1.4.2.2
+++ fontconfig2-dev.patch       11 Dec 2007 17:36:19 -0000      1.4.2.3
@@ -1,6 +1,6 @@
 
 --- fontconfig-2.4.1/fonts.conf.in     2006-09-09 23:36:02.000000000 -0400
-+++ fontconfig-2.4.1-new/fonts.conf.in 2007-11-03 15:11:57.000000000 -0400
++++ fontconfig-2.4.1-new/fonts.conf.in 2007-11-03 15:23:57.000000000 -0400
 @@ -30,7 +30,7 @@
  <!-- Font cache directory list -->
  
@@ -10,7 +10,7 @@
  
  <!--
    Accept deprecated 'mono' alias, replacing it with 'monospace'
-@@ -69,10 +69,20 @@
+@@ -69,10 +69,21 @@
        </match>
  
  <!--
@@ -26,6 +26,7 @@
 +<!--
 +  Load local (apple) system customization file
 +-->
++      <include 
ignore_missing="yes">/usr/X11/lib/X11/fonts/local.conf</include>
 +      <include ignore_missing="yes">/etc/fonts/local.conf</include>
 +
        <config>

Index: fontconfig-path.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/fontconfig-path.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- fontconfig-path.patch       20 Jan 2006 20:34:22 -0000      1.1
+++ fontconfig-path.patch       11 Dec 2007 17:36:18 -0000      1.1.2.1
@@ -31,7 +31,7 @@
 +<!--
 +  Load regular configuration file
 +-->
-+      <include>/etc/fonts/fonts.conf</include>
++      <include>/usr/X11R6/lib/X11/fonts/fonts.conf</include>
 +
 +</fontconfig>
 diff -ruN fontconfig-path-orig/fontconfig-path.csh 
fontconfig-path/fontconfig-path.csh

Index: openoffice.org-nocrypto.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/openoffice.org-nocrypto.info,v
retrieving revision 1.7.2.23
retrieving revision 1.7.2.24
diff -u -d -r1.7.2.23 -r1.7.2.24
--- openoffice.org-nocrypto.info        4 Nov 2007 02:34:53 -0000       1.7.2.23
+++ openoffice.org-nocrypto.info        11 Dec 2007 17:36:19 -0000      1.7.2.24
@@ -9,7 +9,7 @@
 Conflicts: openoffice.org, openoffice.org-firefox, openoffice.org-nocrypto
 Replaces: openoffice.org, openoffice.org-firefox, openoffice.org-nocrypto
 Provides: openoffice.org-generation2
-BuildConflicts: libicu32-dev
+BuildConflicts: libicu32-dev | libicu36-dev
 BuildDepends: <<
   x11-dev, ant, bison, fileutils, system-java14-dev,
   archive-zip-pm586, glitz, libpng3, cairo (>= 1.2-1), fontconfig2-dev (>= 
2.4.1-1),

--- NEW FILE: fontconfig-path-10.5.patch ---
diff -ruN fontconfig-path-orig/README fontconfig-path/README
--- fontconfig-path-orig/README Wed Dec 31 16:00:00 1969
+++ fontconfig-path/README      Sat Jan 29 00:15:27 2005
@@ -0,0 +1,16 @@
+fontconfig-path is a simple package to add additional font directories, e.g. 
the ghostscript fonts,
+to the fontconfig search path. 
+
+To use fontconfig-path, add the following lines to your package
+
+Depend: fontconfig-path
+Install: <<
+  mkdir -p %i/share/fontconfig-path
+  ln -s your-font-directory %i/share/fontconfig-path/your-package-name
+<<
+PostInstScript: fc-cache
+PostRmScript: fc-cache
+
+fontconfig-path is in the public domain.
+
+Matthias Neeracher
diff -ruN fontconfig-path-orig/fontconfig-path.conf 
fontconfig-path/fontconfig-path.conf
--- fontconfig-path-orig/fontconfig-path.conf   Wed Dec 31 16:00:00 1969
+++ fontconfig-path/fontconfig-path.conf        Fri Jan 28 23:52:42 2005
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts.conf file to configure system font access -->
+<fontconfig>
+       <dir>@PREFIX@/share/fontconfig-path</dir>
+
+<!--
+  Load regular configuration file
+-->
+       <include>/usr/X11/lib/X11/fonts/fonts.conf</include>
+
+</fontconfig>
diff -ruN fontconfig-path-orig/fontconfig-path.csh 
fontconfig-path/fontconfig-path.csh
--- fontconfig-path-orig/fontconfig-path.csh    Wed Dec 31 16:00:00 1969
+++ fontconfig-path/fontconfig-path.csh Fri Jan 28 23:55:05 2005
@@ -0,0 +1 @@
+setenv FONTCONFIG_FILE @PREFIX@/share/fontconfig-path/fontconfig-path.conf
diff -ruN fontconfig-path-orig/fontconfig-path.sh 
fontconfig-path/fontconfig-path.sh
--- fontconfig-path-orig/fontconfig-path.sh     Wed Dec 31 16:00:00 1969
+++ fontconfig-path/fontconfig-path.sh  Sat Jan 29 00:15:37 2005
@@ -0,0 +1 @@
+export [EMAIL PROTECTED]@/share/fontconfig-path/fontconfig-path.conf

--- NEW FILE: fontconfig-path-10.5.info ---
Package: fontconfig-path
Version: 20071103
Revision: 1
Distribution: 10.5
Type: nosource
NoSourceDirectory: true
PatchScript: sed 's|@PREFIX@|%p|' %a/%n-10.5.patch | patch -p1
CompileScript: echo "No compile needed"
InstallScript: <<
mkdir -p %i/share/%n
cp %n.conf %i/share/%n
mkdir -p %i/etc/profile.d
chmod a+x %n.*sh
cp %n.*sh %i/etc/profile.d
<<
PostRmScript: <<
  if [["$1" == "remove" || "$1" == "purge"]]; then
    rm -rf %p/share/fontconfig-path
    FONTCONFIG_FILE=/usr/X11/lib/X11/fonts/fonts.conf fc-cache || echo Ignoring 
errors...
  fi
<<
DocFiles: README
Description: Add custom directories to fontconfig search
License: Public Domain
Maintainer: Matthias Neeracher <[EMAIL PROTECTED]>



Index: fontconfig-path.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/fontconfig-path.info,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- fontconfig-path.info        20 Jan 2006 20:34:22 -0000      1.1
+++ fontconfig-path.info        11 Dec 2007 17:36:18 -0000      1.1.2.1
@@ -1,6 +1,7 @@
 Package: fontconfig-path
 Version: 20050601
 Revision: 1
+Distribution: 10.3, 10.4
 Type: nosource
 NoSourceDirectory: true
 PatchScript: sed 's|@PREFIX@|%p|' %a/%n.patch | patch -p1

Index: kterm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/kterm.info,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- kterm.info  17 Oct 2007 17:36:54 -0000      1.1.2.1
+++ kterm.info  11 Dec 2007 17:36:19 -0000      1.1.2.2
@@ -1,17 +1,21 @@
 Package: kterm
 Version: 6.2.0
-Revision: 3
-Distribution: 10.4
+Revision: 4
 BuildDepends: x11-dev
 Depends: x11-shlibs, app-defaults
 Source: ftp://ftp.x.org/contrib/applications/%n-%v.tar.gz
 Source-MD5: 9cc72841b50dfba92bce01dbbebf3039
+PatchScript: <<
+ perl -pi.bak \
+  -e 's/(#define setpgrp setpgid)/\1\n#endif\n#ifdef __DARWIN__\n\1/' main.c
+<<
 CompileScript: xmkmf -a; make
 InstallScript: <<
 make install DESTDIR=%d BINDIR=%p/bin CONFDIR=%p/etc INSTALLFLAGS=-c
 make install.man DESTDIR=%d MANDIR=%p/share/man/man1 DOCDIR=%p/share/doc/%n 
INSTALLFLAGS=-c
 install -d -m 755 %i/share/man/ja/man1
 install -c -m 644 kterm.jman %i/share/man/ja/man1/kterm.1
+install -d -m 755                  %i/share/doc/%n
 install -c -m 644 README.kt DEMO.* %i/share/doc/%n
 rm -rf %d/usr
 <<

Index: qwt.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qwt.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- qwt.info    9 Jan 2007 18:04:36 -0000       1.1.2.2
+++ qwt.info    11 Dec 2007 17:36:19 -0000      1.1.2.3
@@ -3,7 +3,7 @@
 Revision: 4
 Description: Qt Widgets for Technical Applications
 License: LGPL
-Maintainer: Murali K Vadivelu <[EMAIL PROTECTED]>
+Maintainer: Murali K Vadivelu <[EMAIL PROTECTED]>
 Depends: %N-shlibs ( = %v-%r )
 BuildDepends: qt3
 BuildDependsOnly: true

Index: mrxvt.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/mrxvt.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- mrxvt.info  19 Jun 2007 21:18:18 -0000      1.1.2.2
+++ mrxvt.info  11 Dec 2007 17:36:19 -0000      1.1.2.3
@@ -1,11 +1,13 @@
 Package: mrxvt
-Version: 0.5.2
+Version: 0.5.3
 Revision: 1
 Source: mirror:sourceforge:materm/%n-%v.tar.gz
-Source-MD5: ed87b7dd9f4fb482de0f14f085085027
+Source-MD5: 0dac39bef63a4a69eab35c027e8c5bdf
+Source2: mirror:sourceforge:materm/no-scroll-with-buffer-%n-%v.patch
+Source2-MD5: 9032af5f981b91462ed916d27ae286b9
 BuildDepends: x11-dev, libpng3, libjpeg, libiconv-dev
 Depends: x11, libjpeg-shlibs, libpng3-shlibs, libiconv
-PatchScript: perl -pi -e 's/define DEBUG_X/undef DEBUG_X/' src/init.c
+PatchScript: patch -p0 < ../no-scroll-with-buffer-%n-%v.patch
 ConfigureParams: --enable-everything --mandir=%p/share/man --disable-debug
 InstallScript: make install DESTDIR=%d
 DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
@@ -27,5 +29,5 @@
 
   PatchScript incorporates upstream patch
 <<
-Maintainer: None <[EMAIL PROTECTED]>
+Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
 Homepage: http://materm.sourceforge.net/wiki/
\ No newline at end of file

Index: rxvt.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/rxvt.info,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- rxvt.info   16 Jan 2007 16:03:30 -0000      1.2.2.1
+++ rxvt.info   11 Dec 2007 17:36:19 -0000      1.2.2.2
@@ -1,17 +1,28 @@
 Package: rxvt
-Version: 2.7.8
-Revision: 2
-Conflicts: rxvt-ml
-Replaces: rxvt-ml
+Version: 2.7.10
+Revision: 3
+Conflicts: rxvt-ml (<= 2.7.10-1)
+Replaces: rxvt-ml (<= 2.7.10-1)
 Source: mirror:custom:%n-%v.tar.gz
-Source-MD5: e91b733b4f480f218db4b3b331ea42f6
+Source-MD5: 302c5c455e64047b02d1ef19ff749141
+Source2: 
http://gentoo.gg3.net/portage/x11-terms/rxvt/files/rxvt-%v-line-scroll.patch
+Source3: http://gentoo.gg3.net/portage/x11-terms/rxvt/files/rxvt-%v-rk.patch
+Source4: http://gentoo.gg3.net/distfiles/rxvt-%v-xim-fix.patch.gz
+Source2-MD5: bbc012ce17c6e34803302e82cdf0a082
+Source3-MD5: 16be90450ba268312bb146b3d4e7b6e9
+Source4-MD5: 299ecbc322232d4031c02c72981fb193
 BuildDepends: x11-dev
 Depends: x11
 CustomMirror: <<
  Primary: ftp://ftp.rxvt.org/pub/rxvt/
  Secondary: ftp://ftp.rxvt.org/pub/rxvt/old
 <<
-ConfigureParams: --enable-everything --mandir='${prefix}/share/man' 
+PatchScript: <<
+ patch -p0 < ../rxvt-%v-line-scroll.patch
+ patch -p1 < ../rxvt-%v-rk.patch
+ gzip  -dc   ../rxvt-%v-xim-fix.patch.gz | patch -p1
+<<
+ConfigureParams: --enable-everything --mandir='${prefix}/share/man' 
--enable-languages --disable-utmp
 Description: VT102 emulator for X11
 DescDetail: <<
 rxvt is intended as an xterm replacement for users who  do  
@@ -21,5 +32,5 @@
 serving many X sessions.
 <<
 License: GPL
-Maintainer: None <[EMAIL PROTECTED]>
+Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
 Homepage: http://www.rxvt.org/

Index: qwtplot3d.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qwtplot3d.info,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- qwtplot3d.info      20 Jan 2007 15:54:01 -0000      1.1.2.3
+++ qwtplot3d.info      11 Dec 2007 17:36:19 -0000      1.1.2.4
@@ -6,7 +6,7 @@
 
 License: OSI-Approved
 
-Maintainer: Murali K Vadivelu <[EMAIL PROTECTED]>
+Maintainer: Murali K Vadivelu <[EMAIL PROTECTED]>
 
 Depends: %N-shlibs ( = %v-%r )
 BuildDepends: qt3

Index: rxvt-unicode.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/rxvt-unicode.info,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -d -r1.4.2.5 -r1.4.2.6
--- rxvt-unicode.info   3 Nov 2007 20:25:35 -0000       1.4.2.5
+++ rxvt-unicode.info   11 Dec 2007 17:36:19 -0000      1.4.2.6
@@ -1,14 +1,17 @@
 Package: rxvt-unicode
-Version: 8.4
+Version: 8.7
 Revision: 1001
-Distribution: 10.4
-Source: http://dist.schmorp.de/%n/%n-%v.tar.bz2
-Source-MD5: d15ba0ea7cb54ce7a2a41650e2a5e6ab
+Source: mirror:custom:%n-%v.tar.bz2
+Source-MD5: 4d615334e5e4959cded8ba298868a113
+CustomMirror: <<
+Primary: http://dist.schmorp.de/%n/Attic
+Current: http://dist.schmorp.de/%n
+<<
 BuildDepends: x11-dev, fink (>= 0.24.12)
 Depends: x11, system-perl
 PatchFile: %n.patch
-PatchFile-MD5: 9dda5b303e6c8031671e9d023571c644
-ConfigureParams: --enable-everything --mandir='${prefix}/share/man' 
PERL=/usr/bin/perl
+PatchFile-MD5: bad192179acca86d71a6e3eb5743f936
+ConfigureParams: --enable-everything --with-codeset=all --disable-utmp 
--disable-afterimage --mandir='${prefix}/share/man' PERL=/usr/bin/perl
 GCC: 4.0
 DocFiles: COPYING Changes INSTALL README* doc/README* doc/changes.txt doc/etc/*
 Description: Clone of rxvt with XFT and Unicode support

Index: rxvt-unicode.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/rxvt-unicode.patch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- rxvt-unicode.patch  3 Nov 2007 20:25:35 -0000       1.1.2.3
+++ rxvt-unicode.patch  11 Dec 2007 17:36:19 -0000      1.1.2.4
@@ -14,7 +14,7 @@
 --- rxvt-unicode-8.3.orig/Makefile.in  2007-08-21 15:39:40.000000000 -0400
 +++ rxvt-unicode-8.3/Makefile.in       2007-08-21 15:51:58.000000000 -0400
 @@ -47,6 +47,8 @@
-       (cd src; ${MAKE})
+       (cd src; $(MAKE))
  
  #-------------------------------------------------------------------------
 +.PHONY: install
@@ -22,3 +22,28 @@
  configure: configure.ac aclocal.m4 config.h.in
        cd $(srcdir); ./autogen.sh
  
+diff -Naur rxvt-unicode-8.7.orig/configure rxvt-unicode-8.7/configure
+--- rxvt-unicode-8.7.orig/configure    2007-11-21 13:19:54.000000000 +0900
++++ rxvt-unicode-8.7/configure 2007-11-27 10:56:41.000000000 +0900
+@@ -13530,8 +13530,8 @@
+ 
+      save_CXXFLAGS="$CXXFLAGS"
+      save_LIBS="$LIBS"
+-     CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
+-     LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
++     CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch 
i386||g' -e 's|-arch ppc||g'`"
++     LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts | sed -e 's|-arch 
i386||g' -e 's|-arch ppc||g'`"
+      cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -13594,8 +13594,8 @@
+ 
+         IF_PERL=
+         PERL_O=rxvtperl.o
+-        PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`"
+-        PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`"
++        PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch 
i386||g' -e 's|-arch ppc||g'`"
++        PERLLIB="`$PERL -MExtUtils::Embed -e ldopts | sed -e 's|-arch 
i386||g' -e 's|-arch ppc||g'`"
+         PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`"
+      else
+         { { echo "$as_me:$LINENO: error: no, unable to link" >&5

Index: kaptain.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/kaptain.info,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- kaptain.info        17 Oct 2007 17:36:54 -0000      1.1.2.1
+++ kaptain.info        11 Dec 2007 17:36:19 -0000      1.1.2.2
@@ -1,7 +1,7 @@
 Package: kaptain
 Version: 0.72
-Revision: 1012
-Distribution: 10.4
+Revision: 1013
+#Distribution: 10.4
 GCC: 4.0
 Source: mirror:sourceforge:kaptain/%n-%v.tar.gz
 Source-MD5: 2a3a9d6acaa74a517a088a3aba1b9696
@@ -10,8 +10,9 @@
 DocFiles: README ChangeLog AUTHORS INSTALL COPYING
 PatchScript: perl -pi -e 's/install-info --version/false/' doc/Makefile.in
 #InfoDocs: kaptain.info
-#SetCPPFlags: -Dsocklen_t=int
-ConfigureParams: --infodir=%p/share/info --enable-mt 
--with-extra-includes=%p/include --with-extra-libs=%p/lib --with-qt-dir=%p 
--with-qt-includes=%p/include/qt --with-qt-libraries=%p/share/qt3
+
+SetLDFLAGS: 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+ConfigureParams: --infodir=%p/share/info --with-qt-includes=%p/include/qt 
--with-qt-libraries=%p/lib/qt3  --with-qt-dir=%p 
--with-extra-includes=%p/include --with-extra-libs=%p/lib 
 CompileScript: <<
  ./configure %c
  make
@@ -35,7 +36,7 @@
  found in /sw/share/kaptain/.
 <<
 DescPackaging: <<
-infodoc removed due to bug in file.
+ infodoc removed due to bug in file.
 <<
 Maintainer: Koen van der Drift <[EMAIL PROTECTED]>
 Homepage: http://kaptain.sourceforge.net

Index: gerbv.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/gerbv.info,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- gerbv.info  11 Apr 2007 15:25:01 -0000      1.1.2.1
+++ gerbv.info  11 Dec 2007 17:36:19 -0000      1.1.2.2
@@ -1,14 +1,34 @@
 Package: gerbv
-Version: 1.0.2
+Version: 1.0.3
 Revision: 10
 
-Depends: gtk+-shlibs, gdk-pixbuf-shlibs, libpng3-shlibs, gettext, glib-shlibs, 
x11-shlibs
-BuildDepends: gtk+, gdk-pixbuf, libpng3, libiconv-dev, gettext-dev, glib, 
x11-dev
-Conflicts: gerbv-gtk2
-Replaces: gerbv-gtk2
+Depends: <<
+  atk1-shlibs,
+  glib2-shlibs (>= 2.12.0-1),
+  gtk+2,
+  gtk+2-shlibs,
+  libgettext3-shlibs,
+  libiconv,
+  libpng3-shlibs (>= 1:1.2.16-1),
+  pango1-xft2,
+  pango1-xft2-shlibs,
+  x11
+<<
 
-Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 2d5dccd9a060e92916bb7a41ef5433e6
+BuildDepends: <<
+  atk1, 
+  glib2-dev (>= 2.12.0-1), 
+  gtk+2-dev, 
+  libgettext3-dev,
+  libiconv-dev, 
+  libpng3,
+  pango1-xft2-dev,
+  pkgconfig, 
+  x11-dev
+<<
+
+Source: mirror:sourceforge:gerbv/gerbv-%v.tar.gz
+Source-MD5: dc7f2c362c7e9e406133ed0a60bb17b9
 
 DocFiles: AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
 
@@ -23,17 +43,20 @@
 Description: Gerber (RS-274D/RS274X) CAM file viewing tool
 DescDetail: <<
 Gerber Viewer (gerbv) is a viewer for Gerber files. Gerber files
-are generated from PCB CAD systems and are sent to PCB manufacturers as the
-basis for the manufacturing process. 
+are generated from PCB CAD systems and sent to PCB manufacturers
+as a basis for the manufacturing process. 
 
-This is the stable branch, using GTK+1. New features and GTK+2 support will
-be in another Fink package (gerbv-gtk2).
+gerbv now uses GTK+2 exclusively.
 
 A new feature as of 0.16 is the inclusion of a scheme interpreter, which
 enables support for "project files" to provide default settings
 every time the viewer is invoked.
 <<
 
+DescPackaging: <<
+$LastChangedRevision: 437 $ in my local SVN repository.
+<<
+
 License: GPL
 Homepage: http://gerbv.sourceforge.net/
 Maintainer: Charles Lepple <[EMAIL PROTECTED]>

Index: dmenu.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/dmenu.info,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- dmenu.info  17 Oct 2007 17:36:53 -0000      1.1.2.3
+++ dmenu.info  11 Dec 2007 17:36:16 -0000      1.1.2.4
@@ -1,8 +1,8 @@
 Package: dmenu
-Version: 3.3
+Version: 3.4
 Revision: 1
 Source: http://www.suckless.org/download/%n-%v.tar.gz
-Source-MD5: 4d2b5a993ecbdb884ed398ffd6aa5368 
+Source-MD5: 9b5c9d427c6896e50da1dc77a2405065 
 Maintainer: Jeroen Schot <[EMAIL PROTECTED]>
 BuildDepends: x11-dev
 Depends: x11

Index: applex11tools.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/applex11tools.info,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- applex11tools.info  17 Oct 2007 17:36:53 -0000      1.6.2.1
+++ applex11tools.info  11 Dec 2007 17:36:16 -0000      1.6.2.2
@@ -1,6 +1,7 @@
 Package: applex11tools
 Version: 1.1.3
 Revision: 2
+Distribution: 10.4
 Depends: quartz-wm (>= %v-%r), open-x11 (>= %v-%r), x11-app (>= %v-%r)
 Type: nosource
 CompileScript: <<

Index: worker.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/worker.info,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- worker.info 19 Jun 2007 21:18:18 -0000      1.3.2.2
+++ worker.info 11 Dec 2007 17:36:19 -0000      1.3.2.3
@@ -1,11 +1,11 @@
 Package: worker
-Version: 2.15.0
+Version: 2.16.1
 Revision: 1002
 Maintainer: Jack Fink <[EMAIL PROTECTED]>
 BuildDepends: avfs-dev, x11-dev
 Depends: avfs-shlibs, x11
 Source: http://www.boomerangsworld.de/cms/worker/downloads/%n-%v.tar.bz2
-Source-MD5: d208c91c7d700d55ff2dd8f41d644fa5
+Source-MD5: dcf577ca125bb8fe3eb971410720e4ce
 ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking 
--with-extra-includes=%p/include --with-extra-libraries=%p/lib
 PatchScript: perl -pi -e "s/-g -O/-O/g;s/-O2/-Os/g;" configure
 GCC: 4.0

Index: rxvt-ml.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/rxvt-ml.info,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- rxvt-ml.info        16 Jan 2007 16:03:30 -0000      1.2.2.1
+++ rxvt-ml.info        11 Dec 2007 17:36:19 -0000      1.2.2.2
@@ -1,26 +1,19 @@
 Package: rxvt-ml
-Version: 2.7.8
+Version: 2.7.10
 Revision: 2
-Conflicts: rxvt
-Replaces: rxvt
-Provides: rxvt
-Source: mirror:custom:rxvt-%v.tar.gz
-Source-MD5: e91b733b4f480f218db4b3b331ea42f6
-BuildDepends: x11-dev
-Depends: x11
-CustomMirror: <<
- Primary: ftp://ftp.rxvt.org/pub/rxvt/
- Secondary: ftp://ftp.rxvt.org/pub/rxvt/old
+Type: bundle
+Depends: rxvt (>=%v-%r), fink-obsolete-packages
+PreInstScript: <<
+echo "=====NOTICE====="
+echo "rxvt-ml is obsolete, having been deprecated in favor of rxvt."
+echo "(Now rxvt itself supports multi-language.)"
+echo "You can remove rxvt-ml now."
+echo "================"
 <<
-ConfigureParams: --enable-everything --mandir='${prefix}/share/man' 
--enable-languages
-Description: VT102 emulator for X11 with multi-language support
+Description: Placeholder package to update to rxvt. (OBSOLETE)
 DescDetail: <<
-rxvt is intended as an xterm replacement for users who  do  
-not require  features  such  as  Tektronix  4014 emulation and
-toolkit-style configurability.  As  a  result,  rxvt  uses much
-much  less  swap  space  --  a  significant advantage on a machine
-serving many X sessions.
+rxvt-ml is an obsolete package to allow upgrading of legacy rxvt-ml
+packages to current rxvt with m17n enabled.
 <<
-License: GPL
-Maintainer: None <[EMAIL PROTECTED]>
-Homepage: http://www.rxvt.org/
+Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
+Homepage: http://pdb.finkproject.org/pdb/package.php/fink-obsolete-packages

Index: xmhtml.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xmhtml.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- xmhtml.patch        23 May 2006 02:19:32 -0000      1.2
+++ xmhtml.patch        11 Dec 2007 17:36:19 -0000      1.2.2.1
@@ -1,5 +1,6 @@
---- XmHTML-1.1.7/Makefile      Thu Feb  4 00:43:27 1999
-+++ XmHTML-1.1.7-patched/Makefile      Thu Feb 21 10:23:43 2002
+diff -ur XmHTML-1.1.7/Makefile XmHTML-1.1.7.corr/Makefile
+--- XmHTML-1.1.7/Makefile      1999-02-04 01:43:27.000000000 +0100
++++ XmHTML-1.1.7.corr/Makefile 2007-12-01 11:15:42.000000000 +0100
 @@ -40,7 +40,7 @@
  # remove the examples directory from this line.
  # If you want to build the XmHTML tutorial examples, add the book directory.
@@ -40,7 +41,15 @@
  
  # It might be troublesome to know what the correct defines are for your
  # system. A possible set of defines for some OS's is given below. Pick
-@@ -173,7 +173,7 @@
+@@ -166,14 +166,14 @@
+ # Add -DDEBUG to enable selective debug output (see the file DEBUGGING for 
more
+ # info).
+ #
+-CPPFLAGS = -DDEBUG -D_GNU_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DHAVE_REGEX_H 
$(IMAGEDEFINES) 
++CPPFLAGS = -DHAVE_STRINGS_H -DDEBUG -D_GNU_SOURCE -D_BSD_SOURCE 
-D_POSIX_SOURCE -DHAVE_REGEX_H $(IMAGEDEFINES) 
+ 
+ # Various include directories
+ LIBINC=-I. -I../include -I../include/common -I../../include 
-I../../include/common
  
  # Platform specific includes
  ifeq ($(PLATFORM),Motif)
@@ -58,3 +67,15 @@
  # This is what is required under Linux (Motif 2.0.1).
  # Your mileage may vary.
  LIBS   = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
+diff -ur XmHTML-1.1.7/lib/common/debug.c XmHTML-1.1.7.corr/lib/common/debug.c
+--- XmHTML-1.1.7/lib/common/debug.c    1998-10-06 21:58:00.000000000 +0200
++++ XmHTML-1.1.7.corr/lib/common/debug.c       2007-12-01 11:24:23.000000000 
+0100
+@@ -110,7 +110,7 @@
+ /*** Private Function Prototype Declarations ****/
+ 
+ /*** Private Variable Declarations ***/
+-static FILE *__rsd_debug_file = stdout;
++static FILE *__rsd_debug_file; /**= stdout;**/
+ 
+ /*****
+ * When debug output is send to a file, we register an exit func to close

--- NEW FILE: fontconfig2-dev-10.5.info ---
Package: fontconfig2-dev
Version: 2.4.1
Revision: 5
Distribution: 10.5
Description: Font configuration library
Type: nosource
License: Restrictive/Distributable
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>

Depends: <<
        system-xfree86-dev (>= 2:7.2-1),
        fontconfig2-shlibs (= %v-%r)
<<
BuildDependsOnly: true

CompileScript: echo "no compilation necessary"

InstallScript: <<
#!/bin/sh -ev

        FC_ROOT="%i/lib/fontconfig2"
        X11_ROOT="/usr/X11"

        install -d -m 755 $FC_ROOT/{bin,include,lib,lib/pkgconfig}
        /bin/ln -sfh $X11_ROOT/include/fontconfig "$FC_ROOT/include/fontconfig"
        /bin/ln -sfh $X11_ROOT/lib/pkgconfig/fontconfig.pc 
"$FC_ROOT/lib/pkgconfig/fontconfig.pc"
        for file in libfontconfig.1.1.0.dylib libfontconfig.1.dylib 
libfontconfig.dylib libfontconfig.la; do
                /bin/ln -sfh "$X11_ROOT/lib/$file" "$FC_ROOT/lib/$file"
        done
        for file in fc-cache fc-cat fc-list fc-match; do
                /bin/ln -sfh "$X11_ROOT/bin/$file" "$FC_ROOT/bin/$file"
        done
<<
SplitOff: <<
        Package: fontconfig2-shlibs
        Description: Fontconfig 2, shared libs (dummy)
        Depends: system-xfree86-shlibs (>= 2:7.2-1)
        Files: <<
                lib/fontconfig2/bin
                lib/fontconfig2/lib/libfontconfig.1*dylib
        <<
        PreInstScript: <<
for file in "%p/lib/fontconfig2/include/fontconfig" 
"%p/lib/fontconfig2/lib/pkgconfig/fontconfig.pc" \
        "%p/lib/fontconfig2/lib"/libfontconfig.*.dylib \
        "%p/lib/fontconfig2/lib"/libfontconfig.la; do
        if [ ! -L "$file" ]; then
                rm -rf "$file"
        fi
done
        <<
        PostInstScript: %p/lib/fontconfig2/bin/fc-cache --force 
>/tmp/fc-cache.log 2>&1 || :
<<

PreInstScript: <<
        for file in "%p/lib/fontconfig2/include/fontconfig" 
"%p/lib/fontconfig2/lib/pkgconfig/fontconfig.pc" \
                "%p/lib/fontconfig2/lib"/libfontconfig.*.dylib \
                "%p/lib/fontconfig2/lib"/libfontconfig.la; do
                if [ ! -L "$file" ]; then
                        rm -rf "$file"
                fi
        done
<<

Homepage: http://www.fontconfig.org
DescDetail: <<
A library for font customization and configuration.

This version is a dummy package to take over for the previously-
supplied fontconfig2 package in Fink.
<<



-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to