[90799] trunk/dports/graphics/fontforge

[snc at macports.org]

Revision: 90799
          https://trac.macports.org/changeset/90799
Author:   snc at macports.org
Date:     2012-03-14 13:01:06 -0700 (Wed, 14 Mar 2012)
Log Message:
-----------
fontforge: patch include paths to use ${developer_dir}, #33284

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

Added Paths:
-----------
    trunk/dports/graphics/fontforge/files/patch-xcode-43.diff

Modified: trunk/dports/graphics/fontforge/Portfile
===================================================================
--- trunk/dports/graphics/fontforge/Portfile	2012-03-14 19:39:50 UTC (rev 90798)
+++ trunk/dports/graphics/fontforge/Portfile	2012-03-14 20:01:06 UTC (rev 90799)
@@ -39,7 +39,13 @@
 patchfiles      patch-Makefile.dynamic.in.diff \
                 patch-fontforge_start.c.diff \
                 patch-gutils_dynamic.c.diff \
+                patch-xcode-43.diff \
                 patch-configure.in.diff
+post-patch {
+    reinplace s|@@DEVDIR@@|${developer_dir}| ${worksrcpath}/fontforge/macbinary.c \
+                                               ${worksrcpath}/fontforge/startui.c \
+                                               ${worksrcpath}/gutils/giomime.c
+}
 
 checksums       [suffix ${distname}] \
                 sha1    8fada07647f102351bb1d7d1c4da487356e7142f \

Added: trunk/dports/graphics/fontforge/files/patch-xcode-43.diff
===================================================================
--- trunk/dports/graphics/fontforge/files/patch-xcode-43.diff	                        (rev 0)
+++ trunk/dports/graphics/fontforge/files/patch-xcode-43.diff	2012-03-14 20:01:06 UTC (rev 90799)
@@ -0,0 +1,37 @@
+--- fontforge/macbinary.c.orig	2012-03-14 15:43:22.000000000 -0400
++++ fontforge/macbinary.c	2012-03-14 15:51:15.000000000 -0400
+@@ -37,7 +37,7 @@
+ #include "psfont.h"
+ #if __Mac
+ # include <ctype.h>
+-# include </Developer/Headers/FlatCarbon/Files.h>
++# include <@@DEVDIR@@/Headers/FlatCarbon/Files.h>
+ #else
+ # include <utype.h>
+ #undef __Mac
+--- fontforge/startui.c.orig	2012-03-14 15:49:32.000000000 -0400
++++ fontforge/startui.c	2012-03-14 15:51:51.000000000 -0400
+@@ -47,10 +47,10 @@
+ #  endif
+ #endif
+ #ifdef __Mac
+-# include </Developer/Headers/FlatCarbon/Files.h>
++# include <@@DEVDIR@@/Headers/FlatCarbon/Files.h>
+ # define FontInfo	MacFontInfo
+ # define KernPair	MacKernPair
+-# include </Developer/Headers/FlatCarbon/CarbonEvents.h>
++# include <@@DEVDIR@@/Headers/FlatCarbon/CarbonEvents.h>
+ /* For reasons obscure to me RunApplicationEventLoop is not defined in */
+ /*  the mac header files if we are in 64 bit mode. Strangely it seems to */
+ /*  be in the libraries and functional */
+--- gutils/giomime.c.orig	2012-03-14 15:49:53.000000000 -0400
++++ gutils/giomime.c	2012-03-14 15:52:03.000000000 -0400
+@@ -65,7 +65,7 @@
+ unichar_t fontsnf[] = { 'a','p','p','l','i','c','a','t','i','o','n','/','x','-','f','o','n','t','-','s','n','f', '\0' };
+ 
+ #ifdef __Mac
+-#include </Developer/Headers/FlatCarbon/Files.h>
++#include <@@DEVDIR@@/Headers/FlatCarbon/Files.h>
+ #define CHR(ch1,ch2,ch3,ch4) (((ch1)<<24)|((ch2)<<16)|((ch3)<<8)|(ch4))
+ 
+ unichar_t *_GioMacMime(const char *path) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120314/b3cf6cc0/attachment.html>