Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31327
Modified Files: linuxdcpp.info Log Message: 'clean up' the linking so everyone is the same Index: linuxdcpp.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/linuxdcpp.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- linuxdcpp.info 1 Dec 2008 07:51:52 -0000 1.6 +++ linuxdcpp.info 3 Dec 2008 16:43:15 -0000 1.7 @@ -1,6 +1,6 @@ Package: linuxdcpp Version: 1.0.2 -Revision: 4 +Revision: 6 Description: Direct Connect protocol GTK client License: GPL Maintainer: Hanspeter Niederstrasser <[EMAIL PROTECTED]> @@ -14,6 +14,8 @@ gtk+2-shlibs (>= 2.12.3-1), libgettext3-shlibs, libglade2-shlibs (>= 2.4-1), + libiconv, + libxml2-shlibs, pango1-xft2-ft219-shlibs (>= 1.22.0-3), x11-shlibs << @@ -24,11 +26,12 @@ fink (>= 0.24.12), fontconfig2-dev, freetype219 (>= 2.3.7-4), - glitz, glib2-dev (>= 2.14.0-1), gtk+2-dev (>= 2.12.3-1), libgettext3-dev, libglade2 (>= 2.4-1), + libiconv-dev, + libxml2, pango1-xft2-ft219-dev (>= 1.22.0-3), pixman (>= 0.10.0-1), pkgconfig (>= 0.23), @@ -38,22 +41,33 @@ << Source: http://launchpad.net/%n/1.0/%v/+download/%n-%v.tar.bz2 Source-MD5: 905d572357cbdbc66c8d45fe394f80fc -PatchFile: %n.patch -PatchFile-MD5: b8521582fbfb6b4ac9be7622e9e9bad2 +#PatchFile: %n.patch +#PatchFile-MD5: b8521582fbfb6b4ac9be7622e9e9bad2 PatchScript: << #!/bin/sh -ev if [ `/usr/bin/sw_vers -productVersion | cut -d'.' -f1-2` == 10.4 ]; then - /usr/bin/patch -p1 < %{PatchFile} + #/usr/bin/patch -p1 < %{PatchFile} + /usr/bin/perl -pi -e 's|libs libglade-2.0|$& fontconfig xcursor|' SConstruct fi -/usr/bin/perl -pi -e 's|libs libglade-2.0|$& fontconfig x11 xext xrender xinerama xrandr xcursor xfixes xcomposite xdamage|' SConstruct +if [ `/usr/bin/sw_vers -productVersion | cut -d'.' -f1-2` == 10.5 ]; then + /usr/bin/perl -pi -e 's|libs libglade-2.0|$& fontconfig x11 xext xrender xinerama xrandr xcursor xfixes xcomposite xdamage|' SConstruct +fi +### get rid of lone -L/usr/lib +/usr/bin/sed -i.bak -e '\X/usr/libXd' SConstruct << -NoSetCFLAGS: true -SetCFLAGS: -I%p/lib/system-openssl/include +NoSetCXXFLAGS: true +SetCXXFLAGS: -I%p/lib/system-openssl/include -I%p/lib/fontconfig2/include -I%p/lib/pango-ft219/include-pango-1.0 -I%p/lib/pango-ft219/include -I%p/include/freetype2 -Os -Wall NoSetLDFLAGS: true -SetLDFLAGS: -L%p/lib/system-openssl/lib +SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/lib/fontconfig2/lib -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib GCC: 4.0 CompileScript: << #!/bin/sh -ev +if [ `/usr/bin/sw_vers -productVersion | cut -d'.' -f1-2` == 10.4 ]; then + export LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lXrandr -lXrender -lXinerama -lXext -lX11" + #export LIBRARY_PATH:"%p/lib/fontconfig2/lib:%p/lib/pango-ft219/lib:%p/lib:/usr/X11R6/lib" +fi +export PKG_CONFIG_PATH=%p/lib/system-openssl/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig:/usr/X11R6/lib/pkgconfig +export CPATH=%p/include %p/bin/scons PREFIX=%p << InstallScript: << ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs