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

Modified Files:
      Tag: pangocairo-branch
        ctypes-py.info exiv2.info fuse.info libexif12.info 
        libgeda.info libgeos2.info libsigsegv.info libusb.info 
        libusb.patch 
Added Files:
      Tag: pangocairo-branch
        libavcodec1-shlibs.info libavcodec1-shlibs.patch 
        libc-client1-shlibs.info libc-client1-shlibs.patch 
        libming0-shlibs.info libx264-57-shlibs.info 
        libx264-57-shlibs.patch 
Log Message:
sync with HEAD (pangocairo-root-40)


--- NEW FILE: libx264-57-shlibs.patch ---
diff -ruN x264-0.0.20071214.orig/Makefile x264-0.0.20071214/Makefile
--- x264-0.0.20071214.orig/Makefile     2007-12-14 14:45:02.000000000 -0700
+++ x264-0.0.20071214/Makefile  2007-12-15 18:02:29.000000000 -0700
@@ -77,10 +77,10 @@
        ar rc libx264.a $(OBJS) $(OBJASM)
        ranlib libx264.a
 
-$(SONAME): .depend $(OBJS) $(OBJASM)
-       $(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
+$(SONAME): .depend $(OBJS) $(OBJASM) libx264.a
+       $(CC) -dynamiclib -o $@ $(OBJS) $(OBJASM) -install_name 
$(SOINSTALLPATH)/$(SONAME_INSTALL) -compatibility_version 1 -current_version 1 
$(LDFLAGS)
 
-x264$(EXE): $(OBJCLI) libx264.a 
+x264$(EXE): $(OBJCLI) $(SONAME)
        $(CC) -o $@ $+ $(LDFLAGS)
 
 libx264gtk.a: muxers.o libx264.a
@@ -157,7 +157,8 @@
        install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
        install x264 $(DESTDIR)$(bindir)
        ranlib $(DESTDIR)$(libdir)/libx264.a
-       $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
+       $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.dylib)
+       $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/$(SONAME_INSTALL))
        $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
 
 install-gtk: libx264gtk.a
diff -ruN x264-0.0.20071214.orig/configure x264-0.0.20071214/configure
--- x264-0.0.20071214.orig/configure    2007-12-14 14:45:02.000000000 -0700
+++ x264-0.0.20071214/configure 2007-12-15 17:55:20.000000000 -0700
@@ -15,7 +15,7 @@
 echo "  --enable-gprof           adds -pg, doesn't strip"
 echo "  --enable-visualize       enables visualization (X11 only)"
 echo "  --enable-pic             build position-independent code"
-echo "  --enable-shared          build libx264.so"
+echo "  --enable-shared          build libx264.dylib"
 echo "  --extra-asflags=EASFLAGS add EASFLAGS to ASFLAGS"
 echo "  --extra-cflags=ECFLAGS   add ECFLAGS to CFLAGS"
 echo "  --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS"
@@ -122,10 +122,10 @@
             ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"
             ;;
         --extra-cflags=*)
-            CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
+            CFLAGS="${opt#--extra-cflags=} $CFLAGS"
             ;;
         --extra-ldflags=*)
-            LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
+            LDFLAGS="${opt#--extra-ldflags=} $LDFLAGS"
             ;;
         --enable-pthread)
             pthread="auto" # can't skip detection, since it differs by OS
@@ -401,7 +401,7 @@
 
 if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
     CFLAGS="$CFLAGS -s -fomit-frame-pointer"
-    LDFLAGS="$LDFLAGS -s"
+    LDFLAGS="$LDFLAGS"
 fi
 
 if [ "$debug" = "yes" ]; then
@@ -452,10 +452,14 @@
 
 if [ "$shared" = "yes" ]; then
     API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
-    echo "SONAME=libx264.so.$API" >> config.mak
+    echo "SOINSTALLPATH=${prefix}/lib" >> config.mak
+    echo "SONAME_INSTALL=libx264.$API.dylib" >> config.mak
+    echo "SONAME=libx264.$API.0.0.dylib" >> config.mak
     echo 'default: $(SONAME)' >> config.mak
     if [ "$gtk" = "yes" ]; then
-        echo "SONAMEGTK=libx264gtk.so.$API" >> gtk/config.mak
+        echo "SOINSTALLPATH=${prefix}/lib" >> gtk/config.mak
+        echo "SONAMEGTK_INSTALL=libx264gtk.$API.dylib" >> gtk/config.mak
+        echo "SONAMEGTK=libx264gtk.$API.0.0.dylib" >> gtk/config.mak
     fi
 fi
 
diff -ruN x264-0.0.20071214.orig/gtk/Makefile x264-0.0.20071214/gtk/Makefile
--- x264-0.0.20071214.orig/gtk/Makefile 2007-12-14 14:45:01.000000000 -0700
+++ x264-0.0.20071214/gtk/Makefile      2007-12-15 17:34:42.000000000 -0700
@@ -93,7 +93,7 @@
 
 $(SONAMEGTK): $(OBJECTS_LIB)
        @echo "  L: $(@F)"
-       @$(CC) -shared -o $@ $(OBJECTS_LIB) -Wl,-soname,$(SONAMEGTK) $(LDFLAGS)
+       @$(CC) -dynamiclib -o $@ $(OBJECTS_LIB) -install_name 
$(SONAMEGTK_INSTALL) -compatibility_version 1 -current_version 1 $(LDFLAGS)
 
 # Program : test
 $(TEST_BIN): $(OBJECTS_LIB) $(OBJECTS_TEST)
@@ -142,8 +142,9 @@
        @install -d "$(DESTDIR)$(libdir)"
        @echo "  I: $(DESTDIR)$(libdir)/libx264gtk.a"
        @install -m 644 libx264gtk.a "$(DESTDIR)$(libdir)"
-       @echo "  I: $(DESTDIR)$(libdir)/libx264gtk.so"
-       @$(if $(SONAMEGTK), ln -sf $(SONAMEGTK) 
$(DESTDIR)$(libdir)/libx264gtk.so)
+       @echo "  I: $(DESTDIR)$(libdir)/libx264gtk.dylib"
+       @$(if $(SONAMEGTK), ln -sf $(SONAMEGTK) 
$(DESTDIR)$(libdir)/libx264gtk.dylib)
+       @$(if $(SONAMEGTK), ln -sf $(SONAMEGTK) 
$(DESTDIR)$(libdir)/$(SONAMEGTK_INSTALL))
        @$(if $(SONAMEGTK), install -m 755 $(SONAMEGTK) $(DESTDIR)$(libdir))
        @echo "  D: $(DESTDIR)$(bindir)"
        @install -d "$(DESTDIR)$(bindir)"

--- NEW FILE: libavcodec1-shlibs.info ---
Package: libavcodec1-shlibs
Version: 0.4.9-pre1
Revision: 1014
###
# No C++ symbols used
BuildDepends: a52dec-dev, imlib2, lame-dev, libfaad1-dev, libmp4v21-dev, 
libogg, libpostproc1, libvorbis0, sdl (>= 1.2.9-1001)
Depends: a52dec-shlibs, lame-shlibs, libpostproc1-shlibs, libvorbis0-shlibs
Conflicts: ffmpeg (<< 0.4.6-1)
Replaces: ffmpeg (<< 0.4.6-1)
###
Source: mirror:sourceforge:ffmpeg/ffmpeg-%v.tar.gz
Source-MD5: ea5587e3c66d50b1503b82ac4179c303
###
PatchScript: <<
  ### WTF and YUCK
  perl -pi -e 's,LDFLAGS=\"-Wl\,-d\",LDFLAGS=\"\",g' configure
  perl -pi -e 's,\#define printf please_use_av_log,\/\/\#define printf 
please_use_av_log,g' libavcodec/common.h
  perl -pi -e 's,\#define fprintf please_use_av_log,\/\/\#define fprintf 
please_use_av_log,g' libavcodec/common.h
  perl -pi -e 's,\#define fprintf please_use_av_log,\/\/\#define fprintf 
please_use_av_log,g' libavcodec/utils.c
  perl -pi -e 's,\#undef fprintf,\/\/\#undef fprintf,g' libavcodec/utils.c
  perl -pi -e 's,\#define time 
time_is_forbidden_due_to_security_issues,\/\/\#define time 
time_is_forbidden_due_to_security_issues,g' libavcodec/common.h
  ### Fix ffserver conf file location
  perl -pi -e 's,/etc,%p/etc,g' ffserver.c
  ### Enable ffserver on darwin
  perl -pi -e 's,ffserver="no",ffserver="yes",g' configure
  ### Fix for Imlib2
  perl -pi -e 's,-lImlib2,-I%p/include -L%p/lib -lImlib2,g' configure
  ### Lib version fix & so -> dylib
  perl -pi -e 's,dynamiclib\",dynamiclib -undefined dynamic_lookup 
-compatibility_version 1 -current_version 1.4.8 -install_name 
%p/lib/\\\$(SLIB_INSTALL)\"\nSLIBSUF=\".dylib\",g' configure
  ### Fix dlopen filenames
  perl -pi -e 's,liba52.so.0,%p/lib/liba52.0.dylib,g' libavcodec/a52dec.c
  perl -pi -e 's,libfaad.so.0,%p/lib/libfaad.0.dylib,g' libavcodec/faad.c
  ### More fixes for dylib
  perl -pi -e 's,\$\(SLIBSUF\),.0.4.8\$\(SLIBSUF\),g' Makefile
  perl -pi -e 's,\$\(SLIBSUF\),.0.4.8\$\(SLIBSUF\),g' libavcodec/Makefile
  perl -pi -e 's,\$\(SLIBSUF\),.0.4.8\$\(SLIBSUF\),g' libavformat/Makefile
  perl -pi -e 's,SLIB=,SLIB_INSTALL=\$(SLIBPREF)avcodec.0\$(SLIBSUF)\nSLIB=,g' 
libavcodec/Makefile
  perl -pi -e 's,SLIB=,SLIB_INSTALL=\$(SLIBPREF)avformat.0\$(SLIBSUF)\nSLIB=,g' 
libavformat/Makefile
  perl -pi -e 's,\$\(CC\) \$\(SHFLAGS\) -o (.*),\$\(CC\) \$\(SHFLAGS\) -o 
$1\n\tln -sf \$\(SLIB\) \$\(SLIBPREF\)avcodec.0\$\(SLIBSUF\)\n\tln -sf 
\$(SLIB\) \$\(SLIBPREF\)avcodec\$\(SLIBSUF\),g' libavcodec/Makefile
  perl -pi -e 's,\$\(CC\) \$\(SHFLAGS\) -o (.*),\$\(CC\) \$\(SHFLAGS\) -o 
$1\n\tln -sf \$\(SLIB\) \$\(SLIBPREF\)avformat.0\$\(SLIBSUF\)\n\tln -sf 
\$(SLIB\) \$\(SLIBPREF\)avformat\$\(SLIBSUF\),g' libavformat/Makefile
  ### libsvformat shared lib linking
  perl -pi -e 's,PPOBJS=,PPOBJS=\nLIBS+=-L../libavcodec 
-lavcodec\nEXTRALIBS+=-lmp3lame -lvorbis -lvorbisenc -logg,g' 
libavformat/Makefile
  perl -pi -e 's,\$\(EXTRALIBS\),\$\(LIBS\) \$\(EXTRALIBS\),g' 
libavformat/Makefile
  ### Not sure why this is needed, but it is for now
  ### looks like the first endif, ends at the wrong place...should be before
  ### the second if.
  perl -pi -e 's,-logg -lvorbis -lvorbisenc,-lmp3lame -logg -lvorbis 
-lvorbisenc,g' Makefile
  ### Fix vhook
  perl -pi -e 's,\+=-flat_namespace -undefined suppress,=-bundle 
-avoid-version,g' vhook/Makefile
  perl -pi -e 's,\$<,\$< -L../libavcodec -lavcodec -L../libavformat -lavformat 
-L%p/lib,g' vhook/Makefile
  ### Can't strip libs with ref to dylibs
  perl -pi -e 's,install -s,install,g' vhook/Makefile
  perl -pi -e 's,install -s -m 755 \$\(SLIB\) 
\$\(prefix\)/lib/libavcodec-\$\(VERSION\)\.so,install -m 755 \$\(SLIB\) 
\$\(prefix\)/lib/\$\(SLIB\),g' libavcodec/Makefile
  perl -pi -e 's,ln -sf libavcodec-\$\(VERSION\)\.so 
\$\(prefix\)/lib/libavcodec\.so, ,g' libavcodec/Makefile
  perl -pi -e 's,ldconfig \|\| true, ,g' libavcodec/Makefile
  perl -pi -e 's,install -s -m 755 \$\(SLIB\) 
\$\(prefix\)/lib/libavformat-\$\(VERSION\).so,install -m 755 \$\(SLIB\) 
\$\(prefix\)/lib/\$\(SLIB\),g' libavformat/Makefile
  perl -pi -e 's,ln -sf libavformat-\$\(VERSION\)\.so 
\$\(prefix\)/lib/libavformat\.so, ,g' libavformat/Makefile
  perl -pi -e 's,ldconfig \|\| true, ,g' libavformat/Makefile
  ### Fix bin install
  perl -pi -e 's,"\$\(bindir\)",\$\(prefix\)/bin,g' Makefile
  ### Fixes for fink's ft2, I need to manually add the fink includes
  perl -pi -e 's,\$\@ \$\<,\$\@ \$\< -I%p/include,g' Makefile
  perl -pi -e 's,\$\@ \$\<,\$\@ \$\< -I%p/include,g' libavcodec/Makefile
  perl -pi -e 's,\$\@ \$\<,\$\@ \$\< -I%p/include,g' libavformat/Makefile
  perl -pi -e 's,\$\< (.*)?,\$\< $1 -I%p/include,g' vhook/Makefile
  ### Fix for ffplay
  perl -pi -e 's,-o \$\@ ffplay.o,-bind_at_load -o \$\@ ffplay.o,g' Makefile
  ### Fix for 10.4
  perl -pi -e 's,APPLE,NOTAPPLE,g' libavformat/tcp.c
<<
Patch: %n.patch
###
DocFiles: COPYING
###
ConfigureParams: --extra-libs="-L%p/lib -la52" (%m = powerpc) 
--extra-cflags="-force_cpusubtype_ALL -Wno-sign-compare -maltivec -fno-common" 
(%m = i386) --extra-cflags="-force_cpusubtype_ALL -Wno-sign-compare -fno-common 
-DPIC" --enable-gpl --enable-mp3lame --enable-vorbis --enable-pp 
--enable-shared-pp (%m = powerpc) --powerpc-perf-enable --disable-faac 
--enable-faad --enable-faadbin --enable-a52 --enable-a52bin --enable-shared 
--mandir=%p/share/man --disable-mmx --disable-audio-beos --disable-v4l 
--disable-dv1394
###
InstallScript: <<
  make install prefix=%i mandir=%i/share/man
  install -d %i/etc
  install -m 664 doc/ffserver.conf %i/etc
  ln -sf libavcodec.0.4.8.dylib %i/lib/libavcodec.0.dylib
  ln -sf libavcodec.0.4.8.dylib %i/lib/libavcodec.dylib
  ln -sf libavformat.0.4.8.dylib %i/lib/libavformat.0.dylib
  ln -sf libavformat.0.4.8.dylib %i/lib/libavformat.dylib

  ### Remove ffmpeg and ffmpegserver files, this PKG is LEGACY only now
  rm -rf %i/bin
  rm -rf %i/etc
  rm -rf %i/share
  rm -rf %i/lib/vhook
  rm -rf %i/include/ffmpeg/avio.h
  rm -rf %i/include/ffmpeg/common.h
  rm -rf %i/include/ffmpeg/rational.h
  rm -rf %i/include/ffmpeg/rtp.h
  rm -rf %i/include/ffmpeg/rtsp.h
  rm -rf %i/include/ffmpeg/rtspcodes.h
<<
Shlibs: %p/lib/libavcodec.0.dylib 1.0.0 %n (>= 0.4.6-1)
###
SplitOff2: <<
  Package: libavcodec1-dev
  Depends: libavcodec1-shlibs (= %v-%r)
  Conflicts: ffmpeg (<< 0.4.6-1), libavcodec-dev
  Replaces: ffmpeg (<< 0.4.6-1), libavcodec-dev
  BuildDependsOnly: true
  Files: <<
    include/ffmpeg/avcodec.h
    lib/libavcodec.dylib
  <<
  DocFiles: COPYING
  Description: Audio/video encoders and decoders dev files
<<
SplitOff3: <<
  Package: libavformat1-shlibs
  Depends: a52dec-shlibs, lame-shlibs, libavcodec1-shlibs, libogg-shlibs, 
libvorbis0-shlibs
  Files: <<
    lib/libavformat.*.dylib
  <<
  Shlibs: <<
    %p/lib/libavformat.0.dylib 1.0.0 %n (>= 0.4.8-1)
  <<
  DocFiles: COPYING
  Description: Parsers and generators for all common audio/video formats libs
<<
SplitOff4: <<
  Package: libavformat1-dev
  Depends: libavformat1-shlibs (= %v-%r)
  Conflicts: libavformat-dev
  Replaces: libavformat-dev
  BuildDependsOnly: true
  Files: <<
    include/ffmpeg/avformat.h
    lib/libavformat.dylib
  <<
  DocFiles: COPYING
  Description: Parsers and generators for all common audio/video formats dev
<<
###
Description: Audio/video encoders and decoders libs
DescDetail: <<
  FFMpeg is a complete and free Internet live audio and video broadcasting
  solution for Linux/Unix. It also includes a digital VCR. It can encode in
  real time in many formats including MPEG1 audio and video, MPEG4, h263,
  ac3, asf, avi, real, mjpeg, and flash.

  sudo daemonic enable ffserver

  ffplay, currently broken, SDL crash
<<
###
License: GPL
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
Homepage: http://ffmpeg.sourceforge.net/

--- NEW FILE: libavcodec1-shlibs.patch ---
diff -ru ffmpeg-0.4.9-pre1.orig/libavcodec/ac3tab.h 
ffmpeg-0.4.9-pre1/libavcodec/ac3tab.h
--- ffmpeg-0.4.9-pre1.orig/libavcodec/ac3tab.h  2004-06-26 06:08:49.000000000 
-0400
+++ ffmpeg-0.4.9-pre1/libavcodec/ac3tab.h       2006-03-23 22:39:30.000000000 
-0500
@@ -4,10 +4,10 @@
  */
 
 /* possible frequencies */
-static const uint16_t ac3_freqs[3] = { 48000, 44100, 32000 };
+const uint16_t ac3_freqs[3] = { 48000, 44100, 32000 };
 
 /* possible bitrates */
-static const uint16_t ac3_bitratetab[19] = {
+const uint16_t ac3_bitratetab[19] = {
     32, 40, 48, 56, 64, 80, 96, 112, 128, 
     160, 192, 224, 256, 320, 384, 448, 512, 576, 640 
 };
@@ -15,7 +15,7 @@
 /* AC3 MDCT window */
 
 /* MDCT window */
-static const int16_t ac3_window[256] = {
+const int16_t ac3_window[256] = {
     4,    7,   12,   16,   21,   28,   34,   42,
    51,   61,   72,   84,   97,  111,  127,  145,
   164,  184,  207,  231,  257,  285,  315,  347,
@@ -144,27 +144,27 @@
     15, 15, 15, 15,
 };
 
-static const uint8_t sdecaytab[4]={ 
+const uint8_t sdecaytab[4]={ 
     0x0f, 0x11, 0x13, 0x15,
 };
 
-static const uint8_t fdecaytab[4]={ 
+const uint8_t fdecaytab[4]={ 
     0x3f, 0x53, 0x67, 0x7b, 
 };
 
-static const uint16_t sgaintab[4]= { 
+const uint16_t sgaintab[4]= { 
     0x540, 0x4d8, 0x478, 0x410,
 };
 
-static const uint16_t dbkneetab[4]= { 
+const uint16_t dbkneetab[4]= { 
     0x000, 0x700, 0x900, 0xb00,
 };
 
-static const uint16_t floortab[8]= { 
+const uint16_t floortab[8]= { 
     0x2f0, 0x2b0, 0x270, 0x230, 0x1f0, 0x170, 0x0f0, 0xf800,
 };
 
-static const uint16_t fgaintab[8]= {
+const uint16_t fgaintab[8]= {
     0x080, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380, 0x400,
 };
 
diff -ru ffmpeg-0.4.9-pre1.orig/libavcodec/avcodec.h 
ffmpeg-0.4.9-pre1/libavcodec/avcodec.h
--- ffmpeg-0.4.9-pre1.orig/libavcodec/avcodec.h 2004-07-09 08:49:55.000000000 
-0400
+++ ffmpeg-0.4.9-pre1/libavcodec/avcodec.h      2006-03-23 22:35:39.000000000 
-0500
@@ -1657,6 +1657,13 @@
 #define FF_OPT_MAX_DEPTH 10
 } AVOption;
 
+#ifdef HAVE_MMX
+extern const struct AVOption avoptions_common[3 + 5];
+#else
+extern const struct AVOption avoptions_common[3];
+#endif
+extern const struct AVOption avoptions_workaround_bug[11];
+
 /**
  * Parse option(s) and sets fields in passed structure
  * @param strct        structure where the parsed results will be written
diff -ru ffmpeg-0.4.9-pre1.orig/libavcodec/common.h 
ffmpeg-0.4.9-pre1/libavcodec/common.h
--- ffmpeg-0.4.9-pre1.orig/libavcodec/common.h  2004-07-01 08:33:07.000000000 
-0400
+++ ffmpeg-0.4.9-pre1/libavcodec/common.h       2006-03-23 22:35:21.000000000 
-0500
@@ -63,12 +63,6 @@
 #define AVOPTION_END() AVOPTION_SUB(NULL)
 
 struct AVOption;
-#ifdef HAVE_MMX
-extern const struct AVOption avoptions_common[3 + 5];
-#else
-extern const struct AVOption avoptions_common[3];
-#endif
-extern const struct AVOption avoptions_workaround_bug[11];
 
 #endif /* HAVE_AV_CONFIG_H */
 

--- NEW FILE: libming0-shlibs.info ---
Package: libming0-shlibs
Version: 0.4.0.beta5
Revision: 5
###
BuildConflicts: ming
BuildDepends: coreutils-default, freetype219, libpng3, giflib | libungif, 
pkgconfig, x11-dev
Depends: freetype219-shlibs, giflib-shlibs | libungif-shlibs, libpng3-shlibs
Replaces: ming-shlibs
###
Source: mirror:sourceforge:ming/ming-%v.tar.gz
Source-MD5: d092c3322b91b965363b537f2143997f
###
ConfigureParams: --with-freetype-config=%p/lib/freetype219/bin/freetype-config 
--disable-python --disable-perl --disable-php --disable-tcl --with-pic 
--enable-shared --enable-static --mandir=%i/share/man --infodir=%p/share/info 
--libexecdir=%p/lib --disable-dependency-tracking
###
DocFiles: AUTHORS COPYING ChangeLog HISTORY INSTALL LICENSE LICENSE_GPL2 NEWS 
README
Shlibs: %p/lib/libming.0.dylib 5.0.0 libming0-shlibs (>= 0.4.0.beta5-1)
###
SplitOff: <<
  Package: libming-dev
  Depends: libming0-shlibs (= %v-%r)
  Replaces: ming
  Conflicts: ming
  BuildDependsOnly: True
  Files: <<
    include
    lib/pkgconfig
    lib/libming.dylib
    lib/libming.la
    lib/libming.a
    share/man/man3
  <<
  DocFiles: AUTHORS COPYING ChangeLog HISTORY INSTALL LICENSE LICENSE_GPL2 NEWS 
README
  Description: Library to generate SWF (Flash) Files (development files)
  DescDetail: <<
    Ming is an SWF (Flash) file format output library.
    It is written in C, with wrappers for C++, Perl, Python,
    PHP and experimental support for Ruby and Java.

    This package contains the development headers for C and C++.
  <<
<<
SplitOff2: <<
  Package: libming-utils
  Depends: libming0-shlibs (>= %v-%r), freetype219-shlibs, giflib-shlibs | 
libungif-shlibs, libpng3-shlibs
  Files: <<
    bin
    share/man/man1
  <<
  DocFiles: AUTHORS COPYING ChangeLog HISTORY INSTALL LICENSE LICENSE_GPL2 NEWS 
README
  Description: Library to generate SWF (Flash) Files - Utilities
  DescDetail: <<
    Ming is an SWF (Flash) file format output library.
    It is written in C, with wrappers for C++, Perl, Python,
    PHP and experimental support for Ruby and Java.

    This package contains some utilities like:
     swftophp   - SWF to PHP converter
     makefdb    - Font Definition Ripper
     listfdb    - List Font Definition
     listjpeg   - List JPEGs
     listswf    - SWF Disassembler
     listaction - Actions Script Disassembler
     png2dbl    - PNG convert
     gif2dbl    - GIF converter
     gif2mask   - GIF Mask extractor
     raw2adpcm  - Audio Converter
  <<
<<
###
Description: Library to generate SWF (Flash) Files
DescDetail: <<
  Ming is an SWF (Flash) file format output library.
  It is written in C, with wrappers for C++, Perl, Python,
  PHP and experimental support for Ruby and Java.

  This package contains the C and C++ library.
<<
###
License: GPL
HomePage: http://ming.sourceforge.net/
Maintainer: None <[EMAIL PROTECTED]>

Index: fuse.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/fuse.info,v
retrieving revision 1.6.2.12
retrieving revision 1.6.2.13
diff -u -d -r1.6.2.12 -r1.6.2.13
--- fuse.info   11 Dec 2007 17:35:59 -0000      1.6.2.12
+++ fuse.info   19 Jan 2008 17:25:30 -0000      1.6.2.13
@@ -1,10 +1,8 @@
 Package: fuse
-Version: 1.1
+Version: 1.3
 Revision: 1
 Source: http://dev.kublai.com/macfuse-%v.tar.gz
-Source-MD5: 45aadef1e966bd4e6fc7372cbb31e9d7
-Source2: mirror:sourceforge:%n/%n-2.7.1.tar.gz
-Source2-MD5: f95b4a238a3df5a92e9013ecb55c2c17
+Source-MD5: 8343fab60798c2b42713c1419c51789b
 
 # Broken with xcode 2.2, reported working with 2.4.0
 BuildDepends: gcc4.0 (>= 4.0.1-5363)
@@ -12,21 +10,34 @@
 PatchScript: <<
 #!/bin/sh -ev
 MACOSVER=`/usr/bin/sw_vers | grep ProductVersion: | cut -f 2 | cut -d. -f1,2`
-sed -i.bak -e 's,/Library/Filesystems/,%p/lib/%n/,' \
-  core/$MACOSVER/fusefs/common/fuse_param.h \
-  core/$MACOSVER/libfuse/fuse-2.7.1-macosx.patch
-cd ../fuse-2.7.1 && patch -p1 < 
../macfuse-%v/core/$MACOSVER/libfuse/fuse-2.7.1-macosx.patch
+if test $MACOSVER = 10.4
+then
+   FUSEVER=2.7.1
+   FSPFX=/System/Library/Filesystems/
+else
+  FUSEVER=2.7.2
+  FSPFX=/Library/Filesystems/
+fi
+sed -i.bak -e "s,$FSPFX,%p/lib/%n/," core/$MACOSVER/fusefs/common/fuse_param.h
+tar xvzf core/$MACOSVER/libfuse/fuse-current.tar.gz
+cd fuse-$FUSEVER && patch -p1 < 
../core/$MACOSVER/libfuse/fuse-current-macosx.patch
 <<
 CompileScript: <<
 #!/bin/sh -ev
 MACOSVER=`/usr/bin/sw_vers | grep ProductVersion: | cut -f 2 | cut -d. -f1,2`
+if test $MACOSVER = 10.4
+then
+   FUSEVER=2.7.1
+else
+  FUSEVER=2.7.2
+fi
 if test "%m" = "powerpc"; then ARCHS=ppc; else ARCHS=i386; fi
 cd core/$MACOSVER/fusefs
 for target in fusefs mount_fusefs load_fusefs fusefs.fs
 do
   xcodebuild -target $target SDKROOT= ARCHS=$ARCHS
 done
-cd %b/../fuse-2.7.1
+cd %b/fuse-$FUSEVER
 CFLAGS="-D__FreeBSD__=10 -O -g -I%b/core/$MACOSVER/fusefs/common" 
LDFLAGS="-framework CoreFoundation" ./configure --prefix=%p 
--disable-dependency-tracking
 make
 <<
@@ -34,12 +45,18 @@
 #!/bin/sh -ev
 # TODO: figure out how to install this in /System/Library/Filesystems
 MACOSVER=`/usr/bin/sw_vers | grep ProductVersion: | cut -f 2 | cut -d. -f1,2`
+if test $MACOSVER = 10.4
+then
+   FUSEVER=2.7.1
+else
+  FUSEVER=2.7.2
+fi
 mkdir -p %i/lib/%n
 cp -R core/$MACOSVER/fusefs/build/Release/fusefs.fs %i/lib/%n
 mkdir %i/lib/%n/fusefs.fs/Support
 cp -R core/$MACOSVER/fusefs/build/Release/fusefs.kext 
%i/lib/%n/fusefs.fs/Support
 cp core/$MACOSVER/fusefs/build/Release/*_fusefs %i/lib/%n/fusefs.fs/Support
-cd %b/../fuse-2.7.1 && make install DESTDIR=%d
+cd %b/fuse-$FUSEVER && make install DESTDIR=%d
 <<
 PreRmScript: /sbin/kextunload %p/lib/fuse/fusefs.fs/Support/fusefs.kext || true
 PostInstScript: <<

--- NEW FILE: libx264-57-shlibs.info ---
Package: libx264-57-shlibs
Version: 0.0.20071214
Revision: 1
###
BuildDepends: atk1, freetype219, gdk-pixbuf, glib2-dev, gtk+2-dev, 
libgettext3-dev, libiconv-dev, pango1-dev | pango1-xft2-dev, x11-dev
Depends: x11
###
Source: 
ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20071214-2245.tar.bz2
SourceDirectory: x264-snapshot-20071214-2245
Source-MD5: 19c5bdcd3192a4e612507bd6a4f8eafe
###
Patch: %n.patch
###
DocFiles: AUTHORS COPYING
###
ConfigureParams: --enable-gtk --enable-pthread --enable-visualize --enable-pic 
--enable-shared --extra-cflags="-fno-common -I%p/lib/freetype219/include 
-I%p/include" --extra-ldflags="-L%p/lib/freetype219/lib"
###
InstallScript: <<
  make install DESTDIR=%d
<<
###
Shlibs: %p/lib/libx264.57.dylib 1.0.0 %n (>= 0.0.20071214-1)
###
SplitOff: <<
  Package: x264
  Depends: atk1-shlibs, freetype219-shlibs, gdk-pixbuf-shlibs, glib2-shlibs, 
libgettext3-shlibs, libiconv, libx264-57-shlibs (>= %v-%r), libx264gtk57-shlibs 
(>= %v-%r), pango1-shlibs | pango1-xft2-shlibs, x11
  Files: <<
    bin
    share
  <<
  DocFiles: AUTHORS COPYING
<<
SplitOff2: <<
  Package: libx264gtk57-shlibs
  Depends: atk1-shlibs, freetype219-shlibs, gdk-pixbuf-shlibs, glib2-shlibs, 
gtk+2-shlibs, libgettext3-shlibs, libiconv, pango1-shlibs | pango1-xft2-shlibs, 
x11
  Files: <<
    lib/libx264gtk.*.dylib
  <<
  Shlibs: %p/lib/libx264gtk.57.dylib 1.0.0 %n (>= 0.0.20071214-1)
  DocFiles: AUTHORS COPYING
<<
SplitOff3: <<
  Package: libx264-dev
  Depends: libx264-57-shlibs (>= %v-%r)
  BuildDependsOnly: true
  Files: <<
    include/x264.h
    lib/libx264.a
    lib/pkgconfig/x264.pc
    lib/libx264.dylib
  <<
  DocFiles: AUTHORS COPYING
<<
SplitOff4: <<
  Package: libx264gtk-dev
  Depends: libx264gtk57-shlibs (>= %v-%r)
  BuildDependsOnly: true
  Files: <<
    include/x264_gtk.h
    include/x264_gtk_enum.h
    lib/libx264gtk.a
    lib/pkgconfig/x264gtk.pc
    lib/libx264gtk.dylib
  <<
  DocFiles: AUTHORS COPYING
<<
###
Description: Encoding H264/AVC video streams
DescDetail: <<
  x264 is a free library for encoding H264/AVC video streams
<<
###
License: GPL
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
Homepage: http://www.videolan.org/developers/x264.html

Index: exiv2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/exiv2.info,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- exiv2.info  19 Jul 2007 22:23:30 -0000      1.1.2.7
+++ exiv2.info  19 Jan 2008 17:25:30 -0000      1.1.2.8
@@ -1,5 +1,5 @@
 Package: exiv2
-Version: 0.15
+Version: 0.16
 Revision: 1002
 Source: http://www.exiv2.org/%n-%v.tar.gz
 Depends: libexiv2-shlibs (= %v-%r)
@@ -10,7 +10,7 @@
 Homepage: http://www.exiv2.org
 License: GPL
 Description: Cmdline read/write of EXIF & IPTC metadata
-Source-MD5: bb18d19e1d6fb255dadda456cadec00e
+Source-MD5: a6e72343885d990c593bd013c6c988f1
 PatchScript: perl -pi -e 's/-g 
-O/-O/g;s/-O2/-Os/g;s/INTL_MACOSX_LIBS="-Wl,-framework 
-Wl,CoreFoundation"/INTL_MACOSX_LIBS="-Wl,-framework,CoreFoundation"/' configure
 ConfigureParams: --mandir=%p/share/man --with-extra-libs=%p/lib 
--with-extra-includes=%p/include --disable-dependency-tracking
 InstallScript: <<
@@ -23,11 +23,11 @@
   Replaces: libexiv2-0.12-shlibs
   Depends: libgettext3-shlibs, libiconv
   Files: <<
-    lib/libexiv2.0.dylib
-    lib/libexiv2.0.1.0.dylib
+    lib/libexiv2.2.dylib
+    lib/libexiv2.2.1.0.dylib
   <<
   Shlibs: <<
-    %p/lib/libexiv2.0.dylib 1.0.0 %n (>= 0.14-1001)
+    %p/lib/libexiv2.2.dylib 4.0.0 %n (>= 0.16-1001)
   <<
   DocFiles: COPYING README
 <<

Index: libusb.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libusb.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- libusb.patch        27 Jan 2006 18:30:38 -0000      1.1
+++ libusb.patch        19 Jan 2008 17:25:31 -0000      1.1.2.1
@@ -1,13 +1,220 @@
-diff -urN libusb-0.1.8/darwin.c libusb-0.1.8.darwin/darwin.c
---- libusb-0.1.8/darwin.c      Tue Jan 27 14:36:31 2004
-+++ libusb-0.1.8.darwin/darwin.c       Wed Jan  5 19:43:17 2005
-@@ -689,7 +689,7 @@
-
-   /* there seems to be no way to determine how many bytes are actually 
written */
- #if !defined (LIBUSB_NO_TIMEOUT_INTERFACE)
--  if ( transferType == kUSBInterrupt )
-+  if ( transferType != kUSBInterrupt )     /*** DARWIN 0.1.8 FIX ***/
-     result = (*(device->interface))->WritePipeAsyncTO(device->interface, 
pipeRef,
-                                                     bytes, size, 0, timeout,
-                                                     write_completed, NULL);
-
+--- a/darwin.c 2006/02/25 18:40:17     1.61
++++ b/darwin.c 2007/05/02 20:03:49     1.62
+@@ -1,8 +1,10 @@
+ /*
+  * Darwin/MacOS X Support
+  *
+- * (c) 2002-2005 Nathan Hjelm <[EMAIL PROTECTED]>
++ * (c) 2002-2006 Nathan Hjelm <[EMAIL PROTECTED]>
+  *
++ * (06/26/2006):
++ *   - Bulk functions no longer use async transfer functions.
+  * (04/17/2005):
+  *   - Lots of minor fixes.
+  *   - Endpoint table now made by claim_interface to fix a bug.
+@@ -146,7 +148,6 @@
+ #define IO_OBJECT_NULL ((io_object_t)0)
+ #endif
+ 
+-/* Darwin/OS X impl does not use fd field, instead it uses this */
+ struct darwin_dev_handle {
+   usb_device_t **device;
+   usb_interface_t **interface;
+@@ -157,7 +158,6 @@
+   unsigned char *endpoint_addrs;
+ };
+ 
+-static CFMutableDictionaryRef matchingDict;
+ static IONotificationPortRef gNotifyPort;
+ static mach_port_t masterPort = MACH_PORT_NULL;
+ 
+@@ -223,6 +223,7 @@
+ static int usb_setup_iterator (io_iterator_t *deviceIterator)
+ {
+   int result;
++  CFMutableDictionaryRef matchingDict;
+ 
+   /* set up the matching dictionary for class IOUSBDevice and its subclasses.
+      It will be consumed by the IOServiceGetMatchingServices call */
+@@ -756,6 +757,70 @@
+   return -1;
+ }
+ 
++static int usb_bulk_transfer (usb_dev_handle *dev, int ep, char *bytes, 
u_int32_t size, int timeout, int usb_bt_read)
++{
++  struct darwin_dev_handle *device;
++
++  io_return_t result = -1;
++
++  int pipeRef;
++
++  u_int8_t  transferType, direction, number, interval;
++  u_int16_t maxPacketSize;
++
++  if (!dev)
++    USB_ERROR_STR ( -ENXIO, "libusb/darwin.c usb_bulk_transfer: Called with 
NULL device" );
++
++  if ((device = dev->impl_info) == NULL)
++    USB_ERROR_STR ( -ENOENT, "libusb/darwin.c usb_bulk_transfer: Device not 
open" );
++
++  /* interface is not open */
++  if (!device->interface)
++    USB_ERROR_STR(-EACCES, "libusb/darwin.c usb_bulk_transfer: Interface used 
before it was opened");
++
++
++  /* Set up transfer */
++  if ((pipeRef = ep_to_pipeRef(device, ep)) < 0)
++    USB_ERROR_STR ( -EINVAL, "libusb/darwin.c usb_bulk_transfer: Invalid pipe 
reference" );
++
++  (*(device->interface))->GetPipeProperties (device->interface, pipeRef, 
&direction, &number,
++                                           &transferType, &maxPacketSize, 
&interval);
++  /* Transfer set up complete */
++
++  if (usb_debug > 0)
++    fprintf (stderr, "libusb/darwin.c usb_bulk_transfer: Transfering %i bytes 
of data on endpoint 0x%02x\n", size, ep);
++
++  /* Do bulk transfer */
++  if (transferType == kUSBInterrupt && usb_debug > 3)
++    fprintf (stderr, "libusb/darwin.c usb_bulk_transfer: USB pipe is an 
interrupt pipe. Timeouts will not be used.\n");
++
++#if !defined(LIBUSB_NO_TIMEOUT_INTERFACE)
++  if ( transferType != kUSBInterrupt) {
++    if (usb_bt_read != 0)
++      result = (*(device->interface))->ReadPipeTO (device->interface, 
pipeRef, bytes, (UInt32 *)&size, timeout, timeout);
++    else
++      result = (*(device->interface))->WritePipeTO (device->interface, 
pipeRef, bytes, size, timeout, timeout);
++
++    /* pipe bits may need to be cleared after a timeout. should this be done 
here or in user code? */
++    if (result == kIOUSBTransactionTimeout && 
(*(device->interface))->GetPipeStatus (device->interface, pipeRef) == 
kIOUSBPipeStalled)
++      usb_clear_halt (dev, ep);
++  } else
++#endif
++  {
++    if (usb_bt_read != 0)
++      result = (*(device->interface))->ReadPipe (device->interface, pipeRef, 
bytes, (UInt32 *)&size);
++    else
++      result = (*(device->interface))->WritePipe (device->interface, pipeRef, 
bytes, size);
++  }
++
++  if (result != kIOReturnSuccess)
++    USB_ERROR_STR (-darwin_to_errno (result), "libusb/darwin.c 
usb_bulk_transfer: %s", darwin_error_str (result));
++
++  return size;
++}
++
++#if 0
++/* NOT USED */
+ /* argument to handle multiple parameters to rw_completed */
+ struct rw_complete_arg {
+   UInt32        io_size;
+@@ -777,7 +842,7 @@
+   CFRunLoopStop(rw_arg->cf_loop);
+ }
+ 
+-static int usb_bulk_transfer (usb_dev_handle *dev, int ep, char *bytes, int 
size, int timeout,
++static int usb_bulk_transfer_async (usb_dev_handle *dev, int ep, char *bytes, 
int size, int timeout,
+                             rw_async_func_t rw_async, rw_async_to_func_t 
rw_async_to)
+ {
+   struct darwin_dev_handle *device;
+@@ -813,11 +878,12 @@
+   (*(device->interface))->GetPipeProperties (device->interface, pipeRef, 
&direction, &number,
+                                            &transferType, &maxPacketSize, 
&interval);
+ 
+-  (*(device->interface))->CreateInterfaceAsyncEventSource(device->interface, 
&cfSource);
+-  CFRunLoopAddSource(CFRunLoopGetCurrent(), cfSource, kCFRunLoopDefaultMode);
+-
+   bzero((void *)&rw_arg, sizeof(struct rw_complete_arg));
+   rw_arg.cf_loop = CFRunLoopGetCurrent();
++  CFRetain (rw_arg.cf_loop);
++
++  (*(device->interface))->CreateInterfaceAsyncEventSource(device->interface, 
&cfSource);
++  CFRunLoopAddSource(rw_arg.cf_loop, cfSource, kCFRunLoopDefaultMode);
+   /* Transfer set up complete */
+ 
+   if (usb_debug > 0)
+@@ -842,11 +908,12 @@
+       (*(device->interface))->AbortPipe(device->interface, pipeRef);
+       CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true); /* Pick up aborted 
callback */
+       if (usb_debug)
+-      fprintf(stderr, "usb_bulk_read: input timed out\n");
++      fprintf(stderr, "usb_bulk_transfer: timed out\n");
+     }
+   }
+ 
+-  CFRunLoopRemoveSource(CFRunLoopGetCurrent(), cfSource, 
kCFRunLoopDefaultMode);
++  CFRunLoopRemoveSource(rw_arg.cf_loop, cfSource, kCFRunLoopDefaultMode);
++  CFRelease (rw_arg.cf_loop);
+   
+   /* Check the return code of both the write and completion functions. */
+   if (result != kIOReturnSuccess || (rw_arg.result != kIOReturnSuccess && 
+@@ -870,24 +937,16 @@
+ 
+   return rw_arg.io_size;
+ }
++#endif
+ 
+ int usb_bulk_write(usb_dev_handle *dev, int ep, char *bytes, int size, int 
timeout)
+ {
+   int result;
+-  rw_async_to_func_t to_func = NULL;
+-  struct darwin_dev_handle *device;
+   
+   if (dev == NULL || dev->impl_info == NULL)
+     return -EINVAL;
+ 
+-  device = dev->impl_info;
+-
+-#if !defined (LIBUSB_NO_TIMEOUT_INTERFACE)
+-  to_func = (*(device->interface))->WritePipeAsyncTO;
+-#endif
+-
+-  if ((result = usb_bulk_transfer (dev, ep, bytes, size, timeout,
+-                                 (*(device->interface))->WritePipeAsync, 
to_func)) < 0)
++  if ((result = usb_bulk_transfer (dev, ep, bytes, size, timeout, 0)) < 0)
+     USB_ERROR_STR (result, "usb_bulk_write: An error occured during write 
(see messages above)");
+   
+   return result;
+@@ -896,28 +955,19 @@
+ int usb_bulk_read(usb_dev_handle *dev, int ep, char *bytes, int size, int 
timeout)
+ {
+   int result;
+-  rw_async_to_func_t to_func = NULL;
+-  struct darwin_dev_handle *device;
+   
+   if (dev == NULL || dev->impl_info == NULL)
+     return -EINVAL;
+ 
+   ep |= 0x80;
+-  
+-  device = dev->impl_info;
+ 
+-#if !defined (LIBUSB_NO_TIMEOUT_INTERFACE)
+-  to_func = (*(device->interface))->ReadPipeAsyncTO;
+-#endif
+-
+-  if ((result = usb_bulk_transfer (dev, ep, bytes, size, timeout,
+-                                 (*(device->interface))->ReadPipeAsync, 
to_func)) < 0)
++  if ((result = usb_bulk_transfer (dev, ep, bytes, size, timeout, 1)) < 0)
+     USB_ERROR_STR (result, "usb_bulk_read: An error occured during read (see 
messages above)");
+   
+   return result;
+ }
+ 
+-/* interrupt endpoints seem to be treated just like any other endpoint under 
OSX/Darwin */
++/* interrupt endpoints appear to be treated the same as non-interrupt 
endpoints under OSX/Darwin */
+ int usb_interrupt_write(usb_dev_handle *dev, int ep, char *bytes, int size,
+       int timeout)
+ {
+@@ -1177,7 +1227,12 @@
+   if ((pipeRef = ep_to_pipeRef(device, ep)) == -1)
+     USB_ERROR(-EINVAL);
+ 
++#if (InterfaceVersion < 190)
+   result = (*(device->interface))->ClearPipeStall(device->interface, pipeRef);
++#else
++  /* newer versions of darwin support clearing additional bits on the 
device's endpoint */
++  result = (*(device->interface))->ClearPipeStallBothEnds(device->interface, 
pipeRef);
++#endif
+ 
+   if (result != kIOReturnSuccess)
+     USB_ERROR_STR(-darwin_to_errno(result), "usb_clear_halt(ClearPipeStall): 
%s", darwin_error_str(result));

Index: libgeda.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libgeda.info,v
retrieving revision 1.7.2.25
retrieving revision 1.7.2.26
diff -u -d -r1.7.2.25 -r1.7.2.26
--- libgeda.info        4 Nov 2007 02:34:49 -0000       1.7.2.25
+++ libgeda.info        19 Jan 2008 17:25:31 -0000      1.7.2.26
@@ -1,6 +1,6 @@
 Package: libgeda
 Epoch: 1
-Version: 1.2.0
+Version: 1.2.1
 Revision: 11
 
 # Update both %N__-shlibs and %N__-data dependencies
@@ -40,13 +40,13 @@
 BuildDependsOnly: True
 
 CustomMirror: <<
-  nam-US: http://www.geda.seul.org/release/v1.2/1.2.0/
-  eur-SE: http://ftp.sunet.se/geda/release/v1.2/1.2.0/
+  nam-US: http://www.geda.seul.org/release/v1.2/%v/
+  eur-SE: http://ftp.sunet.se/geda/release/v1.2/%v/
 <<
 
 Source: mirror:custom:%n-%v.tar.gz
 SourceDirectory: %n-%v
-Source-MD5: 43f2b2daabee59ffeae84fe13c10c51d
+Source-MD5: 154d219540de33694e1db67e3525b8b6
 
 ### Apparently this disappeared with noweb:
 # InfoDocs: libgedadoc.info
@@ -89,9 +89,9 @@
   <<
 
   Description: GNU EDA -- Electronics design -- library files
-  Files: lib/libgeda.31.0.0.dylib lib/libgeda.31.dylib
+  Files: lib/libgeda.31.0.1.dylib lib/libgeda.31.dylib
   Shlibs: <<
-    %p/lib/libgeda.31.dylib 32.0.0 %n (>= 1:1.2.0-1)
+    %p/lib/libgeda.31.dylib 32.1.0 %n (>= 1:1.2.1-1)
   <<
   DocFiles: AUTHORS BUGS NEWS README TODO
 
@@ -139,7 +139,7 @@
 You only need to install this package if you wish to recompile
 the geda-* client packages.
 
-Release notes: http://geda.seul.org/release/v1.2/1.2.0/gaf-1.2.0-relnotes.html
+Release notes: http://geda.seul.org/release/v1.2/%v/gaf-%v-relnotes.html
 <<
 
 License: GPL
@@ -150,5 +150,5 @@
 prolog.ps has been split off since we do not yet know whether it will
 be backwards compatible in future releases.
 
-$LastChangedRevision: 429 $ in my local repository.
+$LastChangedRevision: 441 $ in my local repository.
 <<

Index: libsigsegv.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libsigsegv.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
--- libsigsegv.info     28 Sep 2007 16:34:29 -0000      1.1.2.2
+++ libsigsegv.info     19 Jan 2008 17:25:31 -0000      1.1.2.3
@@ -1,11 +1,11 @@
 Package: libsigsegv
-Version: 2.4
-Revision: 1
-Distribution: 10.4
+Version: 2.5
+Revision: 2
+# Distribution: 10.4
 Source: gnu
-Source-MD5: df0fe5f87a01e0b4b53b2cdfa8a730e1
+Source-MD5: bcb3a7208661dead3aec2cbde4373a3b
 BuildDependsOnly: true
-
+Depends: %N-shlibs (= %v-%r)
 ConfigureParams: --enable-shared=yes
 DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
 
@@ -18,7 +18,7 @@
 SplitOff: <<
     Package: %N-shlibs
     Files: lib/*.*.dylib
-    Shlibs: %p/lib/libsigsegv.*.dylib 1.0.0 %n (>= 2.4-1)
+    Shlibs: %p/lib/libsigsegv.0.dylib 1.0.0 %n (>= 2.4-1)
     DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
 <<
 

Index: libexif12.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libexif12.info,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- libexif12.info      20 Dec 2006 18:01:05 -0000      1.3.2.1
+++ libexif12.info      19 Jan 2008 17:25:31 -0000      1.3.2.2
@@ -1,6 +1,6 @@
 Package: libexif12
-Version: 0.6.13
-Revision: 5
+Version: 0.6.16
+Revision: 1
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 Conflicts: libexif-dev
 Replaces: libexif-dev
@@ -8,7 +8,7 @@
 BuildDepends: doxygen, libiconv-dev, libgettext3-dev, gettext-tools
 Depends: %N-shlibs (= %v-%r)
 Source: mirror:sourceforge:libexif/libexif-%v.tar.bz2
-Source-MD5: 1b1e2b495c5aa20c08725f30545a110b
+Source-MD5: deee153b1ded5a944ea05d041d959eca
 PatchScript: <<
        # um no, CPPFLAGS and AM_CPPFLAGS have quite different meanings
        perl -ni -e 'print unless /AM_CPPFLAGS="\$CPPFLAGS"/' configure
@@ -35,7 +35,7 @@
        Depends: libgettext3-shlibs, libiconv
        Files: lib/libexif.*.dylib share/locale
        Replaces: %N (<< 0.6.13-5)
-       Shlibs: %p/lib/libexif.12.dylib 13.0.0 libexif12 (>= 0.6.13-1)
+       Shlibs: %p/lib/libexif.12.dylib 15.0.0 libexif12 (>= 0.6.16-1)
        DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
 <<
 Description: EXIF Tag Parsing Library

Index: libusb.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libusb.info,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -d -r1.4.2.4 -r1.4.2.5
--- libusb.info 5 Oct 2007 18:16:11 -0000       1.4.2.4
+++ libusb.info 19 Jan 2008 17:25:31 -0000      1.4.2.5
@@ -22,7 +22,7 @@
        /usr/bin/head -n 7 usb.c >> LICENSE
        make
 <<
-#Patch: %n.patch
+Patch: %n.patch
 InstallScript: <<
  make install DESTDIR=%d 
  # for some reason, libusb's build strips out the -Wl's?

Index: libgeos2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libgeos2.info,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- libgeos2.info       22 Feb 2007 13:09:23 -0000      1.7.2.2
+++ libgeos2.info       19 Jan 2008 17:25:31 -0000      1.7.2.3
@@ -1,6 +1,6 @@
 Package: libgeos2
 Version: 2.2.3
-Revision: 2004
+Revision: 2005
 Description: Geometry Engine - Open Source
 License: LGPL
 Homepage: http://geos.refractions.net/
@@ -15,6 +15,10 @@
 Source: http://geos.refractions.net/geos-%v.tar.bz2
 Source-MD5: 440be2b11fd3d711e950a47ea6f1b424
 
+PatchScript: <<
+  perl -pi -e 's|safe_ctype<std::tolower>|(int(*)(int))std::tolower|' 
source/test/XMLTester.cpp
+<<
+
 # Compile Phase.
 GCC: 4.0
 ConfigureParams: --mandir=%p/share/man

--- NEW FILE: libc-client1-shlibs.info ---
Package: libc-client1-shlibs
Version: 2006k
Revision: 3
Source: mirror:custom:imap-%v.tar.Z
CustomMirror: <<
 Primary: ftp://ftp.cac.washington.edu/imap/
 Secondary: ftp://ftp.cac.washington.edu/imap/old/
<<
Source-MD5: 3a98066870fb8075c744079309e379c8
BuildDepends: system-openssl-dev
Replaces: uw-imap-c-client1-shlibs, uw-imap-c-client-ssl1-shlibs
PatchScript: <<
  sed 's|@FINKPREFIX@|%p|g' < %a/%n.patch | patch -p1
<<
CompileScript: <<
  make ops
<<
InstallScript: <<
  make install PREFIX=%p DESTDIR=%i
<<
DocFiles: CONTENTS LICENSE.txt NOTICE OSTYPE README SPECIALS SUPPORT docs/*
Shlibs: %p/lib/libc-client.1.dylib 2.0.0 libc-client1-shlibs (>= 2006k-1)
SplitOff: <<
  Package: libc-client-dev
  Depends: %N (>= %v-%r)
  Replaces: uw-imap-c-client, uw-imap-c-client-ssl
  BuildDependsOnly: true
  Files: <<
    include
    lib/libc-client.dylib
    lib/libc-client.a
  <<
  DocFiles: CONTENTS LICENSE.txt NOTICE OSTYPE README SPECIALS SUPPORT docs/*
  Description: UW c-client library for mail protocols
  DescDetail: <<
    C-client is a library of functions for accessing mail folders and messages.
    It was written as part of the University of Washington IMAP server, but has
    since found other use as well.

    This package contains the static lib and headers for using the c-client mail
    handling library.
  <<
<<
SplitOff2: <<
  Package: uw-ipopd
  Depends: %N (>= %v-%r)
  Files: <<
    sbin/uw-ipop2d
    sbin/uw-ipop3d
  <<
  DocFiles: CONTENTS LICENSE.txt NOTICE OSTYPE README SPECIALS SUPPORT docs/*
  Description: POP2 and POP3 servers from UW
  DescDetail: <<
    This package contains the POP2 and POP3 servers which were
    formerly part of the University of Washington IMAP package.

    This server has SSL support built in.
  <<
<<
SplitOff3: <<
  Package: uw-imapd
  Depends: %N (>= %v-%r)
  Files: <<
    sbin/uw-imapd
  <<
  DocFiles: CONTENTS LICENSE.txt NOTICE OSTYPE README SPECIALS SUPPORT docs/*
  Description: Remote mail folder access server
  DescDetail: <<
    IMAP (the Interactive Mail Access Protocol) is a mechanism for
    accessing mail folders and the messages in them remotely, ie with
    your user mail program running on a different machine to the one
    where all the messages are stored.

    If you do install uw-imapd you will almost certainly want to install a
    Mail Transfer Agent such as Smail or Sendmail, as remote mail
    programs which use IMAP to access incoming and saved mail will
    usually want to send mail using SMTP, often to the same machine.

    This server has SSL support built in.
  <<
<<
SplitOff4: <<
  Package: uw-mlock
  Depends: %N (>= %v-%r)
  Files: <<
    bin/uw-mlock
  <<
  DocFiles: CONTENTS LICENSE.txt NOTICE OSTYPE README SPECIALS SUPPORT docs/*
  Description: Mailbox locking program from UW
  DescDetail: <<
    C-client is a library of functions for accessing mail folders and messages.
    It was written as part of the University of Washington IMAP server, but has
    since found other use as well.

    libc-client.dylib uses this program to lock mailbox files so they don't get
    corrupted.
  <<
<<
SplitOff5: <<
  Package: uw-mailutils
  Depends: %N (>= %v-%r)
  Files: <<
    bin/uw-dmail
    bin/uw-tmail
    bin/uw-mailutil
  <<
  DocFiles: CONTENTS LICENSE.txt NOTICE OSTYPE README SPECIALS SUPPORT docs/*
  Description: C-client support programs from UW
  DescDetail: <<
    C-client is a library of functions for accessing mail folders and messages.
    It was written as part of the University of Washington IMAP server, but has
    since found other use as well.

    This package contains some programs that can be used with the libc-client
    mail handling library.  They are:

    uw-mailutil: a program for dealing with mailboxes of various types.
    uw-dmail: a Mail Delivery Agent (MDA) for use with procmail
    uw-tmail: a Mail Delivery Program (MDA) for use with sendmail etc.
  <<
<<
SplitOff100: <<
  Package: uw-imap-c-client
  Depends: libc-client-dev (>= %v-%r)
  DocFiles: LICENSE.txt
<<
SplitOff101: <<
  Package: uw-imap-c-client-ssl
  Depends: libc-client-dev (>= %v-%r)
  DocFiles: LICENSE.txt
<<
SplitOff102: <<
  Package: uw-imap-c-client1-shlibs
  Depends: libc-client1-shlibs (>= %v-%r)
  DocFiles: LICENSE.txt
<<
SplitOff103: <<
  Package: uw-imap-c-client-ssl1-shlibs
  Depends: libc-client1-shlibs (>= %v-%r)
  DocFiles: LICENSE.txt
<<

Description: UW c-client library for mail protocols
DescDetail: <<
  C-client is a library of functions for accessing mail folders and messages.
  It was written as part of the University of Washington IMAP server, but has
  since found other use as well.

  This package contains the shared c-client mail handling library with SSL
  support.
<<
DescPort: <<
 License: University of Washington's Free-Fork License
<<
License: Restrictive
Homepage: http://www.washington.edu/imap/
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>

Index: ctypes-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/ctypes-py.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- ctypes-py.info      18 Apr 2006 20:20:08 -0000      1.2
+++ ctypes-py.info      19 Jan 2008 17:25:30 -0000      1.2.2.1
@@ -5,13 +5,13 @@
 Revision: 2
 Type: python (2.4)
 Architecture: powerpc
-Maintainer: Henning Kiel <[EMAIL PROTECTED]>
+Maintainer: None <[EMAIL PROTECTED]>
 Homepage: http://starship.python.net/crew/theller/ctypes/
 License: BSD
 Description: Foreign Function Interface package for Python
 DescDetail: <<
  ctypes is an advanced ffi (Foreign Function Interface) package for Python 2.3
- and higher.
+ and higher. In Python 2.5 it is already included.
 
  ctypes allows to call functions exposed from dlls/shared libraries and has ex-
  tensive facilities to create, access and manipulate simple and complicated C
@@ -34,6 +34,8 @@
    Configuring static FFI library:
    cd build/temp.darwin-8.6.1-i386-2.4/libffi && env CFLAGS='' 
'/sw/build.build/ctypes-py24-0.9.9.3-2/ctypes-0.9.9.3/source/libffi/configure' 
    Failed
+
+ Former Maintainer: Henning Kiel <[EMAIL PROTECTED]>
 <<
 Source: mirror:sourceforge:ctypes/ctypes-%v.tar.gz
 Source-MD5: 78b3b178ff62db6bb9a618b2a6e92609

--- NEW FILE: libc-client1-shlibs.patch ---
diff -ruN imap-2006k.orig/Makefile imap-2006k/Makefile
--- imap-2006k.orig/Makefile    2007-11-07 16:16:50.000000000 -0700
+++ imap-2006k/Makefile 2007-12-10 13:57:06.000000000 -0700
@@ -102,6 +102,7 @@
 # os4  OSF/1 (Digital UNIX) 4
 # osx  Mac OS X
 # oxp  Mac OS X with Pluggable Authentication Modules (PAM)
+# ops  Mac OS X with Pluggable Authentication Modules (Shared c-client lib)
 # ptx  PTX
 # pyr  Pyramid
 # qnx  QNX 4
@@ -411,6 +412,13 @@
        EXTRACFLAGS="$(EXTRACFLAGS) -I/usr/kerberos/include" \
        SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib 
SSLCERTS=/usr/share/ssl/certs SSLKEYS=/usr/share/ssl/private 
GSSDIR=/usr/kerberos LOCKPGM=/usr/sbin/mlock"
 
+ops:   an
+       $(TOUCH) ip6
+       $(BUILD) BUILDTYPE=osx IP=$(IP6) 
EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \
+       PASSWDTYPE=pam \
+       EXTRACFLAGS="$(EXTRACFLAGS) -DMAC_OSX_KLUDGE=1" \
+       SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib [EMAIL 
PROTECTED]@/etc/ssl/certs [EMAIL PROTECTED]@/etc/ssl/private 
GSSINCLUDE=/usr/include GSSLIB=/usr/lib [EMAIL PROTECTED]@/var/spool [EMAIL 
PROTECTED]@/sbin/uw-mlock PAMDLFLAGS=-lpam"
+
 oxp:   an
        $(TOUCH) ip6
        $(BUILD) BUILDTYPE=osx IP=$(IP6) 
EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \
@@ -731,3 +739,31 @@
 # A monument to a hack of long ago and far away...
 love:
        @echo not war?
+
+install:
+       mkdir -p $(DESTDIR)/sbin
+       mkdir -p $(DESTDIR)/bin
+       mkdir -p $(DESTDIR)/lib
+       mkdir -p $(DESTDIR)/include/c-client
+       install -m755 ipopd/ipop2d $(DESTDIR)/sbin/uw-ipop2d
+       install -m755 ipopd/ipop3d $(DESTDIR)/sbin/uw-ipop3d
+       install -m755 imapd/imapd $(DESTDIR)/sbin/uw-imapd
+       install -m755 mlock/mlock $(DESTDIR)/bin/uw-mlock
+       install -m755 dmail/dmail $(DESTDIR)/bin/uw-dmail
+       install -m755 tmail/tmail $(DESTDIR)/bin/uw-tmail
+       install -m755 mailutil/mailutil $(DESTDIR)/bin/uw-mailutil
+       for i in src/c-client/*.h; do \
+               install -m644 $$i $(DESTDIR)/include/c-client; \
+       done
+       for i in src/osdep/unix/*.h; do \
+               install -m644 $$i $(DESTDIR)/include/c-client; \
+       done
+       install -m644 c-client/auths.c $(DESTDIR)/include/c-client
+       install -m644 c-client/linkage.c $(DESTDIR)/include/c-client
+       install -m644 c-client/linkage.h $(DESTDIR)/include/c-client
+       install -m644 c-client/osdep.h $(DESTDIR)/include/c-client
+       install -m644 c-client/libc-client.a $(DESTDIR)/lib
+       ranlib $(DESTDIR)/lib/libc-client.a
+       install -m644 c-client/libc-client.`cat c-client/MAJOR`.0.0.`cat 
c-client/SHLIBEXT` $(DESTDIR)/lib
+       ln -s $(PREFIX)/lib/libc-client.`cat c-client/MAJOR`.0.0.`cat 
c-client/SHLIBEXT` $(DESTDIR)/lib/libc-client.`cat c-client/MAJOR`.`cat 
c-client/SHLIBEXT`
+       ln -s $(PREFIX)/lib/libc-client.`cat c-client/MAJOR`.0.0.`cat 
c-client/SHLIBEXT` $(DESTDIR)/lib/libc-client.`cat c-client/SHLIBEXT`
diff -ruN imap-2006k.orig/src/dmail/Makefile imap-2006k/src/dmail/Makefile
--- imap-2006k.orig/src/dmail/Makefile  2007-09-10 17:56:35.000000000 -0600
+++ imap-2006k/src/dmail/Makefile       2007-12-10 13:26:01.000000000 -0700
@@ -26,7 +26,7 @@
 
 
 C = ../c-client
-CCLIENTLIB = $C/c-client.a
+CCLIENTLIB = 
 SHELL = /bin/sh
 
 # Get local definitions from c-client directory
diff -ruN imap-2006k.orig/src/imapd/Makefile imap-2006k/src/imapd/Makefile
--- imap-2006k.orig/src/imapd/Makefile  2006-08-30 18:10:44.000000000 -0600
+++ imap-2006k/src/imapd/Makefile       2007-12-10 13:25:11.000000000 -0700
@@ -43,12 +43,13 @@
 # Get local definitions from c-client directory
 
 C = ../c-client
-CCLIENTLIB = $C/c-client.a
+CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
+
 CC = `cat $C/CCTYPE`
 CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) -DANOFILE=\"$(ANO)\" \
        -DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \
        -DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\"
-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+LDFLAGS = `cat $C/LDFLAGS`
 
 all:   imapd
 
diff -ruN imap-2006k.orig/src/ipopd/Makefile imap-2006k/src/ipopd/Makefile
--- imap-2006k.orig/src/ipopd/Makefile  2006-08-30 18:17:30.000000000 -0600
+++ imap-2006k/src/ipopd/Makefile       2007-12-10 13:25:21.000000000 -0700
@@ -26,14 +26,14 @@
 
 
 C = ../c-client
-CCLIENTLIB = $C/c-client.a
+CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
 SHELL = /bin/sh
 
 # Get local definitions from c-client directory
 
 CC = `cat $C/CCTYPE`
 CFLAGS = -I$C `cat $C/CFLAGS`
-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+LDFLAGS = `cat $C/LDFLAGS`
 
 ipopd: ipop2d ipop3d
 
diff -ruN imap-2006k.orig/src/mailutil/Makefile imap-2006k/src/mailutil/Makefile
--- imap-2006k.orig/src/mailutil/Makefile       2006-08-30 18:21:20.000000000 
-0600
+++ imap-2006k/src/mailutil/Makefile    2007-12-10 13:25:45.000000000 -0700
@@ -26,7 +26,7 @@
 
 
 C = ../c-client
-CCLIENTLIB = $C/c-client.a
+CCLIENTLIB = 
 SHELL = /bin/sh
 
 # Get local definitions from c-client directory
diff -ruN imap-2006k.orig/src/mtest/Makefile imap-2006k/src/mtest/Makefile
--- imap-2006k.orig/src/mtest/Makefile  2006-08-30 18:25:07.000000000 -0600
+++ imap-2006k/src/mtest/Makefile       2007-12-10 13:25:33.000000000 -0700
@@ -26,7 +26,7 @@
 
 
 C = ../c-client
-CCLIENTLIB = $C/c-client.a
+CCLIENTLIB = 
 SHELL = /bin/sh
 
 # Get local definitions from c-client directory
diff -ruN imap-2006k.orig/src/osdep/unix/Makefile 
imap-2006k/src/osdep/unix/Makefile
--- imap-2006k.orig/src/osdep/unix/Makefile     2007-06-17 09:37:44.000000000 
-0600
+++ imap-2006k/src/osdep/unix/Makefile  2007-12-10 13:57:39.000000000 -0700
@@ -144,7 +144,11 @@
 
 # Normally no need to change any of these
 
-ARCHIVE=c-client.a
+ARCHIVE=libc-client.a
+SHARED-C-CLIENT=c-client
+MAJOR=1
+SHLIBEXT=dylib
+
 BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o utf8aux.o siglocal.o 
\
  dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
  rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
@@ -577,9 +581,19 @@
 osx:   # Mac OS X
        $(BUILD) `$(CAT) SPECIALS` OS=$@ \
         CRXTYPE=nfs \
-        SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
+        [EMAIL PROTECTED]@/var/spool [EMAIL PROTECTED]@/var/mail \
         RSHPATH=/usr/bin/rsh \
-        BASECFLAGS="$(GCC4CFLAGS)"
+        BASECFLAGS="$(GCC4CFLAGS)" \
+        BASELDFLAGS="-L../c-client -l$(SHARED-C-CLIENT)" \
+        RANLIB=true \
+        CC=gcc
+
+osxshared: $(BINARIES) $(SHARED-C-CLIENT).$(SHLIBEXT)
+
+$(SHARED-C-CLIENT).$(SHLIBEXT):
+       $(CC) -dynamiclib -undefined dynamic_lookup -install_name 
@FINKPREFIX@/lib/lib$(SHARED-C-CLIENT).$(MAJOR).$(SHLIBEXT) 
-compatibility_version 2.0 -current_version 2.0 -o 
lib$(SHARED-C-CLIENT).$(MAJOR).0.0.$(SHLIBEXT) $(BINARIES) `cat EXTRALDFLAGS`
+       ln -s lib$(SHARED-C-CLIENT).$(MAJOR).0.0.$(SHLIBEXT) 
lib$(SHARED-C-CLIENT).$(MAJOR).$(SHLIBEXT)
+       ln -s lib$(SHARED-C-CLIENT).$(MAJOR).0.0.$(SHLIBEXT) 
lib$(SHARED-C-CLIENT).$(SHLIBEXT)
 
 ptx:   # PTX
        $(BUILD) `$(CAT) SPECIALS` OS=$@ \
@@ -840,7 +854,7 @@
 
 # Build it!
 
-build: clean once $(ARCHIVE)
+build: clean once $(ARCHIVE) osxshared
 
 all:   $(ARCHIVE)
 
@@ -856,7 +870,7 @@
 # Cleanup
 
 clean:
-       sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c 
osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
+       sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c 
osdep*.[ch] *.o ARCHIVE ARCHIVENAME EXTRALDFLAGS SHARED-C-CLIENT *FLAGS *TYPE 
$(ARCHIVE) $(SHARED-C-CLIENT).$(SHLIBEXT) 
$(SHARED-C-CLIENT).$(MAJOR).$(SHLIBEXT) 
$(SHARED-C-CLIENT).$(MAJOR).0.0.$(SHLIBEXT) || true'
 
 
 # Dependencies
@@ -949,7 +963,12 @@
 
 # Once-only environment setup
 
-once:  onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c
+once:  onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) secondenv osdep.c
+
+secondenv:
+       @echo Second-only environment setup...
+       mv LDFLAGS EXTRALDFLAGS
+       echo $(BASELDFLAGS) `cat EXTRALDFLAGS` > LDFLAGS
 
 onceenv:
        @echo Once-only environment setup...
@@ -960,8 +979,12 @@
         -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
         -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
         -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
-       echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+       echo $(EXTRALDFLAGS) > LDFLAGS
        echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
+       echo $(ARCHIVE) > ARCHIVENAME
+       echo $(SHARED-C-CLIENT) > SHARED-C-CLIENT
+       echo $(MAJOR) > MAJOR
+       echo $(SHLIBEXT) > SHLIBEXT
        echo $(OS) > OSTYPE
        ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
        ./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
diff -ruN imap-2006k.orig/src/tmail/Makefile imap-2006k/src/tmail/Makefile
--- imap-2006k.orig/src/tmail/Makefile  2007-09-10 17:44:27.000000000 -0600
+++ imap-2006k/src/tmail/Makefile       2007-12-10 13:25:56.000000000 -0700
@@ -26,7 +26,7 @@
 
 
 C = ../c-client
-CCLIENTLIB = $C/c-client.a
+CCLIENTLIB = 
 SHELL = /bin/sh
 
 # Get local definitions from c-client directory


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to