[98123] trunk/dports/graphics/fontforge

[jmr at macports.org]

Revision: 98123
          http://trac.macports.org//changeset/98123
Author:   jmr at macports.org
Date:     2012-09-25 07:35:12 -0700 (Tue, 25 Sep 2012)
Log Message:
-----------
fontforge: fix carbon includes (#35379)

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

Modified: trunk/dports/graphics/fontforge/Portfile
===================================================================
--- trunk/dports/graphics/fontforge/Portfile	2012-09-25 13:52:50 UTC (rev 98122)
+++ trunk/dports/graphics/fontforge/Portfile	2012-09-25 14:35:12 UTC (rev 98123)
@@ -44,16 +44,9 @@
                 patch-configure.in.diff
 post-patch {
     if {${os.major} > 11} {
-        reinplace s|@@DEVDIR@@|${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/Developer| ${worksrcpath}/fontforge/macbinary.c \
-                                                   ${worksrcpath}/fontforge/startui.c \
-                                                   ${worksrcpath}/gutils/giomime.c
         foreach file [glob ${worksrcpath}/fontforge/*.c] {
             reinplace s|AnchorPoint|FFAnchorPoint|g $file
         }
-    } else {
-        reinplace s|@@DEVDIR@@|${developer_dir}| ${worksrcpath}/fontforge/macbinary.c \
-                                                   ${worksrcpath}/fontforge/startui.c \
-                                                   ${worksrcpath}/gutils/giomime.c
     }
 }
 post-configure {

Modified: trunk/dports/graphics/fontforge/files/patch-xcode-43.diff
===================================================================
--- trunk/dports/graphics/fontforge/files/patch-xcode-43.diff	2012-09-25 13:52:50 UTC (rev 98122)
+++ trunk/dports/graphics/fontforge/files/patch-xcode-43.diff	2012-09-25 14:35:12 UTC (rev 98123)
@@ -5,7 +5,7 @@
  #if __Mac
  # include <ctype.h>
 -# include </Developer/Headers/FlatCarbon/Files.h>
-+# include <@@DEVDIR@@/Headers/FlatCarbon/Files.h>
++# include <CoreServices/CoreServices.h>
  #else
  # include <utype.h>
  #undef __Mac
@@ -16,11 +16,11 @@
  #endif
  #ifdef __Mac
 -# include </Developer/Headers/FlatCarbon/Files.h>
-+# include <@@DEVDIR@@/Headers/FlatCarbon/Files.h>
++# include <CoreServices/CoreServices.h>
  # define FontInfo	MacFontInfo
  # define KernPair	MacKernPair
 -# include </Developer/Headers/FlatCarbon/CarbonEvents.h>
-+# include <@@DEVDIR@@/Headers/FlatCarbon/CarbonEvents.h>
++# include <Carbon/Carbon.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 */
@@ -31,7 +31,7 @@
  
  #ifdef __Mac
 -#include </Developer/Headers/FlatCarbon/Files.h>
-+#include <@@DEVDIR@@/Headers/FlatCarbon/Files.h>
++#include <CoreServices/CoreServices.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/20120925/95eddc21/attachment.html>