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

Modified Files:
        fontforge.info fontforge.patch 
Log Message:
New upstream version, now with python scripting.

Index: fontforge.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/fontforge.info,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- fontforge.info      10 Jun 2007 13:19:09 -0000      1.53
+++ fontforge.info      26 Jul 2007 01:48:07 -0000      1.54
@@ -1,5 +1,5 @@
 Package: fontforge
-Version: 20070607
+Version: 20070723
 Revision: 1
 License: BSD
 Description: Outline font editor
@@ -16,15 +16,16 @@
        Makefile ignores CPPFLAGS and LDFLAGS so we use CFLAGS instead.
        Had to remove setting of DYLD_LIBRARY_PATH in start.c.
        Caused ImageIO problems. Yuck.
+       Enabled python scripting. Uses system python.
 <<
 Homepage: http://fontforge.sourceforge.net/
 Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
 
 Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2
-Source-MD5: f25ab79dc5edeabeb557cdefe9b2ccc7
+Source-MD5: 22b6e40e72a0b0054acedee148e07a34
 SourceDirectory: %n-%v
 Source2: mirror:sourceforge:%n/%n_htdocs-%v.tar.bz2
-Source2-MD5: ceeb62634aee2ea40cc41c91255eef57
+Source2-MD5: 034087e569cf4fc88b17b691149bdddd
 Source2ExtractDir: %n-%v/htdocs
 
 Depends: <<
@@ -60,10 +61,11 @@
 DocFiles: AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html VERSION
 
 PatchFile: %n.patch
-PatchFile-MD5: 3ee816d4302eddf54d7a632851b695f3
+PatchFile-MD5: e1ac8b9f4f70ea7579f2f4b77af20097
 PatchScript: <<
        patch -p1 <%{PatchFile}
        perl -pi -e 's/#ifndef NODYNAMIC/#if 1/' gdraw/gio.c
+       perl -pi -e 's,python -c,/usr/bin/python -c,g' configure
 <<
 
 NoSetMAKEFLAGS: true
@@ -77,7 +79,7 @@
        --with-x\
        --with-regular-link\
        --with-devicetables\
-       --without-python\
+       --with-python\
        --enable-shared=no\
        --enable-static=yes
 <<

Index: fontforge.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/fontforge.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- fontforge.patch     11 May 2007 00:42:30 -0000      1.15
+++ fontforge.patch     26 Jul 2007 01:48:07 -0000      1.16
@@ -1,6 +1,6 @@
-diff -ru fontforge-20070509.orig/Makefile.dynamic.in 
fontforge-20070509/Makefile.dynamic.in
---- fontforge-20070509.orig/Makefile.dynamic.in        2006-11-20 
15:09:56.000000000 -0500
-+++ fontforge-20070509/Makefile.dynamic.in     2007-05-10 20:26:39.000000000 
-0400
+diff -ru fontforge-20070723.orig/Makefile.dynamic.in 
fontforge-20070723/Makefile.dynamic.in
+--- fontforge-20070723.orig/Makefile.dynamic.in        2007-05-28 
15:34:59.000000000 -0400
++++ fontforge-20070723/Makefile.dynamic.in     2007-07-24 14:43:38.000000000 
-0400
 @@ -92,7 +92,7 @@
        $(INSTALL_DATA) $(srcdir)/fontforge/fontimage.1 $(mandir)/man1
  #explicit use of sh to make sure we don't invoke csh with different "if" 
syntax
@@ -10,9 +10,9 @@
  
  uninstall:
        -rm $(bindir)/fontforge
-diff -ru fontforge-20070509.orig/configure fontforge-20070509/configure
---- fontforge-20070509.orig/configure  2007-04-29 21:53:16.000000000 -0400
-+++ fontforge-20070509/configure       2007-05-10 20:26:39.000000000 -0400
+diff -ru fontforge-20070723.orig/configure fontforge-20070723/configure
+--- fontforge-20070723.orig/configure  2007-07-13 23:19:53.000000000 -0400
++++ fontforge-20070723/configure       2007-07-24 14:43:39.000000000 -0400
 @@ -2684,9 +2684,7 @@
   gww_define_caps_for_alt="1"
  
@@ -24,7 +24,7 @@
   LIBS="-Wl,/System/Library/Frameworks/CoreServices.framework/CoreServices 
$LIBS"
  
   ;;
-@@ -19093,7 +19091,7 @@
+@@ -19096,7 +19094,7 @@
  echo "$as_me:$LINENO: result: $ac_cv_file__usr_include_libxml2_libxml" >&5
  echo "${ECHO_T}$ac_cv_file__usr_include_libxml2_libxml" >&6
  if test $ac_cv_file__usr_include_libxml2_libxml = yes; then
@@ -33,7 +33,7 @@
  else
  
   echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5
-@@ -19114,7 +19112,7 @@
+@@ -19117,7 +19115,7 @@
  echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_libxml2_libxml" 
>&5
  echo "${ECHO_T}$ac_cv_file__usr_local_include_libxml2_libxml" >&6
  if test $ac_cv_file__usr_local_include_libxml2_libxml = yes; then
@@ -42,9 +42,9 @@
  else
    cat >>confdefs.h <<\_ACEOF
  #define _NO_LIBXML 1
-diff -ru fontforge-20070509.orig/fontforge/Makefile.dynamic.in 
fontforge-20070509/fontforge/Makefile.dynamic.in
---- fontforge-20070509.orig/fontforge/Makefile.dynamic.in      2007-04-06 
13:53:44.000000000 -0400
-+++ fontforge-20070509/fontforge/Makefile.dynamic.in   2007-05-10 
20:26:39.000000000 -0400
+diff -ru fontforge-20070723.orig/fontforge/Makefile.dynamic.in 
fontforge-20070723/fontforge/Makefile.dynamic.in
+--- fontforge-20070723.orig/fontforge/Makefile.dynamic.in      2007-07-23 
10:41:54.000000000 -0400
++++ fontforge-20070723/fontforge/Makefile.dynamic.in   2007-07-24 
14:43:39.000000000 -0400
 @@ -53,9 +53,9 @@
  
  #I used to include -L/usr/lib explicitly after static_libs. Not sure why. 
Should be implied & breaks 64bit compiles
@@ -58,9 +58,9 @@
  
  all: fontforge sfddiff fontimage
  
-diff -ru fontforge-20070509.orig/fontforge/Makefile.in 
fontforge-20070509/fontforge/Makefile.in
---- fontforge-20070509.orig/fontforge/Makefile.in      2007-04-06 
13:53:44.000000000 -0400
-+++ fontforge-20070509/fontforge/Makefile.in   2007-05-10 20:26:39.000000000 
-0400
+diff -ru fontforge-20070723.orig/fontforge/Makefile.in 
fontforge-20070723/fontforge/Makefile.in
+--- fontforge-20070723.orig/fontforge/Makefile.in      2007-07-23 
10:41:54.000000000 -0400
++++ fontforge-20070723/fontforge/Makefile.in   2007-07-24 14:43:39.000000000 
-0400
 @@ -82,10 +82,10 @@
  # disasterous effects. This file may not be compiled with the optimizer.
  # On the other hand we do need CPPFLAGS to get the right includes...
@@ -74,10 +74,22 @@
  
  %.o: %.c
  
-diff -ru fontforge-20070509.orig/fontforge/start.c 
fontforge-20070509/fontforge/start.c
---- fontforge-20070509.orig/fontforge/start.c  2007-05-07 16:33:23.000000000 
-0400
-+++ fontforge-20070509/fontforge/start.c       2007-05-10 20:26:39.000000000 
-0400
-@@ -207,7 +207,6 @@
+diff -ru fontforge-20070723.orig/fontforge/start.c 
fontforge-20070723/fontforge/start.c
+--- fontforge-20070723.orig/fontforge/start.c  2007-07-23 00:11:16.000000000 
-0400
++++ fontforge-20070723/fontforge/start.c       2007-07-24 14:46:44.000000000 
-0400
+@@ -38,9 +38,9 @@
+ #include <sys/time.h>
+ #include <locale.h>
+ #include <unistd.h>
+-#if !defined(_NO_LIBUNINAMESLIST) && !defined(_STATIC_LIBUNINAMESLIST) && 
!defined(NODYNAMIC)
++//#if !defined(_NO_LIBUNINAMESLIST) && !defined(_STATIC_LIBUNINAMESLIST) && 
!defined(NODYNAMIC)
+ #  include <dynamic.h>
+-#endif
++//#endif
+ #ifdef __Mac
+ # include <stdlib.h>          /* getenv,setenv */
+ #endif
+@@ -363,7 +363,6 @@
      /*  install image libs. For some reason fink installs in a place */
      /*  the dynamic loader doesn't find */
      /* (And fink's attempts to set the PATH variables generally don't work */


-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to