[cvs] dists/10.4/unstable/main/finkinfo/text scribus134-aqua.info, 1.1, 1.2

[Martin C. <cos...@us...>]

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

Modified Files:
	scribus134-aqua.info 
Log Message:
Update for cmake-2.6.0

Index: scribus134-aqua.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/scribus134-aqua.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scribus134-aqua.info	24 Nov 2007 09:32:34 -0000	1.1
+++ scribus134-aqua.info	31 Jul 2008 12:24:20 -0000	1.2
@@ -1,6 +1,6 @@
 Package: scribus134-aqua
 Version: 1.3.4
-Revision: 4
+Revision: 5
 Source: mirror:sourceforge:scribus/scribus-%v.tar.bz2
 Source-MD5: cd3bc6cc6c2e2826eb689342e439443d
 Source2: http://perso.wanadoo.fr/costabel/Scribusapp-skeleton.tar.bz2
@@ -13,15 +13,14 @@
 BuildConflicts: qt3, qt3-dev
 Conflicts: scribus-aqua
 Replaces: scribus-aqua 
+PatchFile: scribus.patch
+PatchFile-MD5: 92a9cd8f5a9e04c0aae486258bc8a85a
 PatchScript: <<
 #!/bin/sh -ev
 # Use Fink's freetype219
 # and place all source tree include dirs before %p/include
-  perl -pi.bak -e 's|/usr/local/|%p/lib/freetype219/|g' cmake/modules/FREETYPEConfig.cmake
-  perl -pi.bak -e '
-          s|libfreetype.so( FT.* )\"\"(.*)|libfreetype.dylib\1 \"%p/lib/freetype219/lib\"\2|g;
-          s|(\$\{CMAKE_BINARY_DIR\}/scribus)|\1\n\$\{CMAKE_SOURCE_DIR\}/scribus|g
-                  ' CMakeLists.txt
+# with cmake-2.6.0 this gets too messy to do with a patch script, we need a patch file now
+  patch -p1 < %{PatchFile}
 #don't build pixbuf stuff that wants to pull in X11
   perl -pi.bak -e 's|^.*pixbuf.*$||g; s|^.*PIXBUF.*$||g' scribus/CMakeLists.txt 
 # remove spurious qtplugins definitions; this fixes icon loading bug
@@ -42,7 +41,9 @@
  cd build
  cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
        -DCMAKE_INSTALL_PREFIX:PATH=%p/Applications/Scribus.app/Contents \
-       -DFREETYPE_INCLUDE_DIR_FT2BUILD:PATH=%p/lib/freetype219/include \
+       -DFREETYPE_DIR:PATH=%p/lib/freetype219 \
+       -DFREETYPE_INCLUDE_DIR_ft2build:PATH=%p/lib/freetype219/include \
+       -DFREETYPE_INCLUDE_DIR_freetype2:PATH=%p/lib/freetype219/include/freetype2 \
        -DFREETYPE_LIBRARY:FILEPATH=%p/lib/freetype219/lib/libfreetype.dylib \
        -DFONTCONFIG_INCLUDE_DIR:PATH=%p/lib/fontconfig2/include \
        -DFONTCONFIG_LIBRARY:FILEPATH=%p/lib/fontconfig2/lib/libfontconfig.dylib \
@@ -80,6 +81,9 @@
  Underneath the modern and user friendly interface, Scribus
  supports professional publishing features, such as CMYK color,
  separations, ICC color management and versatile PDF creation.
+
+ Version 1.3.4 corresponds to a discontinued development branch.
+ No updates, not even bugfixes, are expected for it.
 <<
 DescUsage: <<
  This version does not need X11 for running.