Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14944/libs

Modified Files:
        fltk-x11.info fltk-x11.patch 
Log Message:
dep oberhaul


Index: fltk-x11.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/fltk-x11.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fltk-x11.patch      14 Aug 2007 20:58:38 -0000      1.3
+++ fltk-x11.patch      21 Jun 2010 17:15:43 -0000      1.4
@@ -57,6 +57,15 @@
          # MacOS X uses Carbon for graphics...
          LIBS="$LIBS -framework Carbon -framework ApplicationServices"
  
+@@ -10030,7 +10029,7 @@
+       LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS"
+       CFLAGS="$CFLAGS $X_CFLAGS"
+       CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-      LDFLAGS="$X_LIBS $LDFLAGS"
++      LDFLAGS="$LDFLAGS $X_LIBS"
+ 
+       if test "x$x_includes" != x; then
+           ac_cpp="$ac_cpp -I$x_includes"
 diff -Nurd -x'*~' fltk-1.1.7.orig/fluid/fluid.cxx fltk-1.1.7/fluid/fluid.cxx
 --- fltk-1.1.7.orig/fluid/fluid.cxx    2005-11-27 09:45:48.000000000 -0500
 +++ fltk-1.1.7/fluid/fluid.cxx 2007-08-03 15:39:00.000000000 -0400

Index: fltk-x11.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/fltk-x11.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fltk-x11.info       14 May 2008 15:49:01 -0000      1.11
+++ fltk-x11.info       21 Jun 2010 17:15:43 -0000      1.12
@@ -1,6 +1,6 @@
 Package: fltk-x11
 Version: 1.1.7
-Revision: 1002
+Revision: 1003
 Description: GUI toolkit
 DescDetail: <<
 FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
@@ -60,8 +60,22 @@
 Homepage: http://www.fltk.org/
 License: LGPL
 Maintainer: Daniel Macks <dma...@netspace.org>
-Depends: libjpeg-shlibs, libpng3-shlibs, x11-shlibs, xft2-shlibs, %n-shlibs (= 
%v-%r)
-BuildDepends: fink (>= 0.24.12-1), libjpeg, libpng3, x11, xft2, x11-dev
+Depends: <<
+       %n-shlibs (= %v-%r),
+       libjpeg8-shlibs,
+       libpng14-shlibs,
+       x11-shlibs,
+       xft2-shlibs (>= 2.1.14-1)
+<<
+BuildDepends: <<
+       fink (>= 0.24.12-1),
+       fontconfig2-dev (>= 2.8.0-4),
+       freetype219 (>= 2.3.12-1),
+       libjpeg8,
+       libpng14,
+       x11-dev,
+       xft2-dev (>= 2.1.14-1)
+<<
 Conflicts: fltk,fltk-aqua
 Replaces:  fltk,fltk-aqua
 BuildDependsOnly: True
@@ -79,7 +93,7 @@
 SourceDirectory: fltk-%v
 Source-MD5: 2e29319119adc9d63b2f26b72cae0a88
 PatchFile: %n.patch
-PatchFile-MD5: 86177a2eb593652ecabf4fd7e746b9f6
+PatchFile-MD5: 5edbcaf239f0df51bec0bdcd3b0ed814
 PatchScript: <<
        %{default_script}
   perl -ni -e 'print unless /echo.*COMMAND/' src/Makefile
@@ -89,14 +103,15 @@
   perl -ni -e 'print unless /mandir\)\/cat/' documentation/Makefile
   perl -pi -e 's|share/doc/fltk|share/doc/%n/html|' configure
 <<
-SetCPPFLAGS: -U__APPLE__ -I/usr/X11R6/include
-SetCXXFLAGS: -U__APPLE__ -I/usr/X11R6/include -I%p/include
-SetLDFLAGS: -framework OpenGL -dylib_file 
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+SetCPPFLAGS: -U__APPLE__ -I%p/lib/fontconfig2/include -I%p/lib/xft2/include -MD
+SetLDFLAGS: -framework OpenGL -dylib_file 
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
 -L%p/lib/fontconfig2/lib -L%p/lib/xft2/lib
 GCC: 4.0
 ConfigureParams: --enable-shared --with-x --enable-xft --mandir=%p/share/man 
--without-links --enable-threads --x-includes=/usr/X11R6/include 
--x-libraries=/usr/X11R6/lib
 CompileScript: <<
   ./configure %c
   make FONTCONFIGLIB=-lfontconfig
+#  make FONTCONFIGLIB="-lfontconfig -L%p/lib/fontconfig2/lib"
+       fink-package-precedence --depfile-ext='\.d' --prohibit-bdep %n .
 <<
 InstallScript: <<
   make install DESTDIR=%d docdir=%p/share/doc/%n/html
@@ -106,7 +121,13 @@
 SplitOff: <<
   Package: %N-shlibs
   Description: Runtime code for fltk-x11
-  Depends: libjpeg-shlibs, libpng3-shlibs, x11-shlibs, xft2-shlibs
+  Depends: <<
+       fontconfig2-shlibs (>= 2.8.0-4),
+       libjpeg8-shlibs,
+       libpng14-shlibs,
+       x11-shlibs,
+       xft2-shlibs (>= 2.1.14-1)
+  <<
   Conflicts: fltk
   Replaces:  fltk
   Files: <<


------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to