Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/text
In directory sc8-pr-cvs17:/tmp/cvs-serv20327/10.3/unstable/main/finkinfo/text

Modified Files:
        xpdf.info xpdf.patch 
Log Message:
Use freetype-config to determine freetype configs. Switch to ft219


Index: xpdf.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/text/xpdf.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xpdf.patch  7 Sep 2005 17:48:02 -0000       1.5
+++ xpdf.patch  23 Jul 2007 01:16:18 -0000      1.6
@@ -1,3 +1,30 @@
+diff -Nurd -x'*`' xpdf-3.02.orig/configure xpdf-3.02/configure
+--- xpdf-3.02.orig/configure   2007-02-27 17:05:51.000000000 -0500
++++ xpdf-3.02/configure        2007-07-22 20:57:43.000000000 -0400
+@@ -9902,9 +9902,8 @@
+           elif test -d "$smr_cv_with_freetype2_library"; then
+             freetype2_LIBS="-L$smr_cv_with_freetype2_library -lfreetype"
+           else
+-            { { echo "$as_me:$LINENO: error: argument must be boolean, file, 
or directory" >&5
+-echo "$as_me: error: argument must be boolean, file, or directory" >&2;}
+-   { (exit 1); exit 1; }; }
++          # blindly assume user knows what he's doing...
++            freetype2_LIBS="$smr_cv_with_freetype2_library"
+           fi
+           with_freetype2=yes
+           ;;
+@@ -9948,9 +9947,8 @@
+     if test -d "$smr_cv_with_freetype2_includes"; then
+       freetype2_CFLAGS="-I$smr_cv_with_freetype2_includes"
+     else
+-      { { echo "$as_me:$LINENO: error: argument must be a directory" >&5
+-echo "$as_me: error: argument must be a directory" >&2;}
+-   { (exit 1); exit 1; }; }
++      # blindly assume user knows what he's doing...
++      freetype2_CFLAGS="$smr_cv_with_freetype2_includes"
+     fi
+   else
+     freetype2_CFLAGS=
 --- xpdf/doc/sample-xpdfrc.orig        Wed Sep  7 11:31:56 2005
 +++ xpdf/doc/sample-xpdfrc     Wed Sep  7 11:35:05 2005
 @@ -29,20 +29,20 @@

Index: xpdf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/text/xpdf.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- xpdf.info   21 Jul 2007 22:06:55 -0000      1.14
+++ xpdf.info   23 Jul 2007 01:16:18 -0000      1.15
@@ -1,11 +1,11 @@
 Package: xpdf
 Version: 3.02
-Revision: 1
+Revision: 2
 GCC: 3.3
 Source: ftp://www.foolabs.com/pub/%n/%n-%v.tar.gz
 Source-MD5: 599dc4cc65a07ee868cf92a667a913d2
-Depends: x11, ghostscript-fonts, t1lib5-shlibs, openmotif3-shlibs, 
libpaper1-shlibs
-BuildDepends: t1lib5, openmotif3, x11-dev, libpaper1-dev
+Depends: x11, ghostscript-fonts, t1lib5-shlibs, openmotif3-shlibs, 
libpaper1-shlibs, freetype219-shlibs
+BuildDepends: t1lib5, openmotif3, x11-dev, libpaper1-dev, freetype219
 Conflicts: poppler-bin
 Replaces: poppler-bin
 PatchScript: <<
@@ -20,11 +20,10 @@
        perl -pi -e 's/\$\(CXXFLAGS\)// if /LDFLAGS/' xpdf/Makefile.in
 <<
 SetCXXFLAGS: -I%p/include
-SetCPPFLAGS: -I/usr/X11R6/include
-SetLDFLAGS: -L/usr/X11R6/lib
 ConfigureParams: <<
        --mandir=%p/share/man \
-       --with-freetype2-includes=/usr/X11R6/include/freetype2 
--with-freetype2-library=/usr/X11R6/lib \
+       --with-freetype2-includes="`%p/lib/freetype219/bin/freetype-config 
--cflags`" \
+        --with-freetype2-library="`%p/lib/freetype219/bin/freetype-config 
--libs`" \
        --enable-a4-paper
 <<
 InstallScript: make install DESTDIR=%d
@@ -35,6 +34,8 @@
        search for them.
 
        Don't bother passing compiler flags to the linker.
+
+       Patch to allow the multiple freetype flags to be passed (thanks 
Martin!).
 <<
 Description: Portable Document Format (PDF) file viewer
 License: GPL


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to