Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory 
fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21931/stable/main/finkinfo/graphics

Modified Files:
        giflib.info imlib.info imlib2.info 
Log Message:
finally get rid of the giflib/libungif dichotomy; libungif-shlibs and -bin 
stick around in case old packages need it, but the dev one is gone gone gone

Index: giflib.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/giflib.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- giflib.info 10 Aug 2008 15:41:42 -0000      1.3
+++ giflib.info 16 Apr 2009 12:38:01 -0000      1.4
@@ -1,47 +1,69 @@
 Package: giflib
-Version: 4.1.4
+Version: 4.1.6
 Revision: 2
-Depends: %N-shlibs (= %v-%r) | libungif-shlibs (>= %v-1), %N-bin (= %v-%r) | 
libungif-bin (>= %v-1)
+Depends: %N-shlibs (= %v-%r), %N-bin (= %v-%r)
+BuildDepends: fink (>= 0.28.0-1)
 BuildDependsOnly: True
-Conflicts: libungif
-Replaces: libungif
-Source: mirror:sourceforge:libungif/%n-%v.tar.bz2
-Source-MD5: 827d338961482a986f39c7f114531636
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
+Conflicts: libungif (<< 4.1.6-2)
+Replaces: libungif (<< 4.1.6-2)
+Source: mirror:sourceforge:%n/%n-%v.tar.bz2
+Source-MD5: 7125644155ae6ad33dbc9fc15a14735f
+PatchFile: %n.patch
+PatchFile-MD5: 4afe1a9f59418d6aa11b79dc0c82529a
+
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
 InstallScript: <<
-make install DESTDIR=%d
-(cd %i/lib/ && ln -s libgif.dylib libungif.dylib && ln -s libgif.a libungif.a)
+#!/bin/sh -ev
+
+       make -j1 install DESTDIR=%d
+       pushd %i/lib
+               ln -s libgif.dylib libungif.dylib
+               ln -s libgif.a libungif.a
+       popd
+
+       install -d -m 755 %i/share/doc/installed-packages
+       for package in libungif-shlibs libungif-bin; do
+               touch %i/share/doc/installed-packages/$package
+       done
 <<
 SplitOff: <<
-  Package: %N-shlibs
-  Depends: x11
-  Conflicts: libungif-shlibs
-  Replaces: libungif-shlibs, libungif (<= 4.1.0final-1), giflib (<= 4.1.0-2)
-  Files: lib/libgif.*.dylib
-  Shlibs: %p/lib/libgif.4.dylib 6.0.0 giflib-shlibs (>= 4.1.0-7) | 
libungif-shlibs (>= 4.1.0final-2)
-  DocFiles: README COPYING AUTHORS PATENT_PROBLEMS
+       Package: %N-shlibs
+       Depends: x11
+       Conflicts: libungif-shlibs (<< 4.1.6-1)
+       Replaces: libungif-shlibs (<< 4.1.6-1), libungif (<< 4.1.6-1), giflib 
(<= 4.1.0-2)
+       Files: lib/libgif.*.dylib
+       Shlibs: %p/lib/libgif.4.dylib 6.0.0 giflib-shlibs (>= 4.1.6-1)
+       DocFiles: README COPYING AUTHORS
 <<
 SplitOff2: <<
-  Package: %N-bin
-  Depends: x11, %N-shlibs (= %v-%r) | libungif-shlibs (>= %v-1)
-  Conflicts: libungif-bin
-  Replaces: libungif-bin, libungif (<= 4.1.0final-1), giflib (<= 4.1.0-2)
-  InstallScript: <<
-    mkdir -p %i/share/doc/%N
-    cp doc/*.txt %i/share/doc/%N/
-    mkdir -p %i/share/doc/%N/html
-    cp doc/*.png doc/*.html %i/share/doc/%N/html/
-  <<
-  Files: bin 
-  DocFiles: README COPYING AUTHORS PATENT_PROBLEMS
+       Package: %N-bin
+       Depends: x11, %N-shlibs (= %v-%r)
+       Conflicts: libungif-bin (<< 4.1.6-1)
+       Replaces: libungif-bin (<< 4.1.6-1), libungif (<< 4.1.6-1), giflib (<= 
4.1.0-2)
+       InstallScript: <<
+               mkdir -p %i/share/doc/%N
+               cp doc/*.txt %i/share/doc/%N/
+               mkdir -p %i/share/doc/%N/html
+               cp doc/*.png doc/*.html %i/share/doc/%N/html/
+       <<
+       Files: bin 
+       DocFiles: README COPYING AUTHORS
 <<
-DocFiles: README COPYING AUTHORS PATENT_PROBLEMS
-#
-Description: GIF image format handling library (LZW)
+SplitOff4: <<
+       Package: libungif-shlibs
+       Depends: %N-shlibs (>= %v-%r), fink-obsolete-packages
+       Files: share/doc/installed-packages/%n
+<<
+SplitOff5: <<
+       Package: libungif-bin
+       Depends: %N-bin (>= %v-%r), fink-obsolete-packages
+       Files: share/doc/installed-packages/%n
+<<
+
+DocFiles: README COPYING AUTHORS
+Description: GIF image format handling library
 DescPort: Uses autoconf and libtool. The usual fixes.
 License: OSI-Approved
-Homepage: http://libungif.sourceforge.net/
+Homepage: http://giflib.sourceforge.net/
 Maintainer: Benjamin Reed <gif...@fink.racoonfink.com>

Index: imlib2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/imlib2.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- imlib2.info 24 Mar 2009 07:04:31 -0000      1.6
+++ imlib2.info 16 Apr 2009 12:38:01 -0000      1.7
@@ -17,7 +17,7 @@
        libjpeg,
        libpng3,
        libtiff,
-       giflib | libungif,
+       giflib,
        x11-dev,
        xmkmf (>= 1.0.2-3)
 <<
@@ -59,7 +59,7 @@
                libjpeg-shlibs,
                libpng3-shlibs (>= 1.2.5-4),
                libtiff-shlibs,
-               giflib-shlibs | libungif-shlibs,
+               giflib-shlibs,
                x11
        <<
        DocFiles: COPYING

Index: imlib.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/imlib.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imlib.info  10 Aug 2008 15:44:15 -0000      1.4
+++ imlib.info  16 Apr 2009 12:38:01 -0000      1.5
@@ -51,7 +51,7 @@
                libiconv,
                libjpeg-bin,
                libtiff-bin,
-               giflib-bin | libungif-bin,
+               giflib-bin,
                libpng3-shlibs,
                netpbm-bin,
                x11-shlibs


------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and 
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today. 
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to