[54292] trunk/dports/graphics/fontforge

[jmr at macports.org]

Revision: 54292
          http://trac.macports.org/changeset/54292
Author:   jmr at macports.org
Date:     2009-07-24 10:38:40 -0700 (Fri, 24 Jul 2009)
Log Message:
-----------
fontforge: multiple fixes and improvements:
 * update to 20090622
 * fix build failure (#20085)
 * ensure that libs and headers from $prefix are used
 * disable opportunistic linking to pango and cairo since they are not declared as dependencies
 * enable GB/T 12345 encoding support (#20255)

Modified Paths:
--------------
    trunk/dports/graphics/fontforge/Portfile

Added Paths:
-----------
    trunk/dports/graphics/fontforge/files/patch-configure.in.diff
    trunk/dports/graphics/fontforge/files/patch-inc_utype.h.diff

Modified: trunk/dports/graphics/fontforge/Portfile
===================================================================
--- trunk/dports/graphics/fontforge/Portfile	2009-07-24 17:24:03 UTC (rev 54291)
+++ trunk/dports/graphics/fontforge/Portfile	2009-07-24 17:38:40 UTC (rev 54292)
@@ -4,7 +4,7 @@
 PortSystem      1.0
 
 name            fontforge
-version         20090224
+version         20090622
 set ftversion   2.3.9
 categories      graphics fonts
 platforms       darwin
@@ -35,20 +35,22 @@
 
 patchfiles      patch-Makefile.dynamic.in.diff \
                 patch-fontforge_start.c.diff \
-                patch-gutils_dynamic.c.diff
+                patch-gutils_dynamic.c.diff \
+                patch-configure.in.diff \
+                patch-inc_utype.h.diff
 
 checksums       [suffix ${distname}] \
-                md5     5b564437e5e3db660b0202647b6f733b \
-                sha1    2e4a57d9c13f0d220e80d413c93cc559b6c14ed4 \
-                rmd160  82468be875c444cf5c9259f8226395ba05850f78 \
+                md5     3f4ff2d2dab200f47595bff38baa13ca \
+                sha1    bc638eeeb4cf2d540773bacc52cc6bac1c6ca76f \
+                rmd160  ba9983bf667091e0e9b88fcabf865c65ba2debbd \
                 cidmaps.tgz \
                 md5     063691163e592515b31514515bb3ce8c \
                 sha1    efbc7c9d3e95159f5600dc71f9cccb370e46bb94 \
                 rmd160  d194355e61813d31fe4813bdf10a62d66a9f6d04 \
                 [suffix ${docdistname}] \
-                md5     fdd4420934fe12575e7240642c0ffbe4 \
-                sha1    2e96ff2b62693ea51c5d57d4a05c72832cf69817 \
-                rmd160  599677649e0908a0a5326f050aec559c9768a250 \
+                md5     db6003b077e9fe6b9ba1d9f64dbe3569 \
+                sha1    657bd8ff73245fb04c765a3ecf2276ea050021ff \
+                rmd160  6b8a319a5b2825ffaa5436bed2434403f953b372 \
                 [suffix freetype-${ftversion}] \
                 md5     d76233108aca9c9606cdbd341562ad9a \
                 sha1    db08969cb5053879ff9e973fe6dd2c52c7ea2d4e \
@@ -89,9 +91,19 @@
                 port:tiff \
                 port:zlib
 
+depends_build   port:autoconf
+use_autoconf    yes
+
 configure.args  --mandir=${prefix}/share/man \
+                --enable-type3 \
+                --enable-devicetables \
+                --enable-gb12345 \
                 --without-python \
-                --without-freetype-bytecode
+                --without-freetype-bytecode \
+                --without-pango \
+                --without-cairo \
+                --x-includes=${prefix}/include \
+                --x-libraries=${prefix}/lib
 
 use_parallel_build  yes
 

Added: trunk/dports/graphics/fontforge/files/patch-configure.in.diff
===================================================================
--- trunk/dports/graphics/fontforge/files/patch-configure.in.diff	                        (rev 0)
+++ trunk/dports/graphics/fontforge/files/patch-configure.in.diff	2009-07-24 17:38:40 UTC (rev 54292)
@@ -0,0 +1,16 @@
+--- configure.in.orig	2008-12-25 08:04:17.000000000 +1100
++++ configure.in	2009-07-25 02:54:02.000000000 +1000
+@@ -331,9 +331,10 @@
+  ],AC_DEFINE(_NO_FREETYPE))])])
+ fi
+ 
+-AC_CHECK_FILE(/usr/include/libxml2/libxml,[CFLAGS="$CFLAGS -I/usr/include/libxml2/"],[
+- AC_CHECK_FILE(/usr/local/include/libxml2/libxml,[CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/"],
+-  AC_DEFINE(_NO_LIBXML))])
++AC_CHECK_FILE(${prefix}/include/libxml2/libxml,[CFLAGS="$CFLAGS -I${prefix}/include/libxml2"],[
++ AC_CHECK_FILE(/usr/include/libxml2/libxml,[CFLAGS="$CFLAGS -I/usr/include/libxml2/"],[
++  AC_CHECK_FILE(/usr/local/include/libxml2/libxml,[CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/"],
++   AC_DEFINE(_NO_LIBXML))])])
+ 
+ dnl Some old versions of lib(un)gif don't work for us, they've got the
+ dnl Function argument in the wrong place. So check the header files.

Added: trunk/dports/graphics/fontforge/files/patch-inc_utype.h.diff
===================================================================
--- trunk/dports/graphics/fontforge/files/patch-inc_utype.h.diff	                        (rev 0)
+++ trunk/dports/graphics/fontforge/files/patch-inc_utype.h.diff	2009-07-24 17:38:40 UTC (rev 54292)
@@ -0,0 +1,11 @@
+--- inc/utype.h.orig	2009-01-30 07:54:49.000000000 +1100
++++ inc/utype.h	2009-07-25 03:24:27.000000000 +1000
+@@ -1,6 +1,8 @@
+ #ifndef _UTYPE_H
+ #define _UTYPE_H
+ 
++#include <ctype.h>
++
+ #define ____L	0x1
+ #define ____U	0x2
+ #define ____TITLE	0x4
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090724/7b4f1cda/attachment.html>