[130542] trunk/dports/perl/p5-macosx-file

[larryv at macports.org]

Revision: 130542
          https://trac.macports.org/changeset/130542
Author:   larryv at macports.org
Date:     2014-12-31 13:16:51 -0800 (Wed, 31 Dec 2014)
Log Message:
-----------
p5-macosx-file: Don't include Carbon headers directly (#46367)

The build assumes that /Developer/Headers/FlatCarbon exists, which is
false for Xcode 4 and later. The FlatCarbon headers just used
CoreServices' CarbonCore subframework anyway, so we should do the right
thing and use the CoreServices framework header.

Modified Paths:
--------------
    trunk/dports/perl/p5-macosx-file/Portfile

Added Paths:
-----------
    trunk/dports/perl/p5-macosx-file/files/use-correct-headers.patch

Modified: trunk/dports/perl/p5-macosx-file/Portfile
===================================================================
--- trunk/dports/perl/p5-macosx-file/Portfile	2014-12-31 20:52:48 UTC (rev 130541)
+++ trunk/dports/perl/p5-macosx-file/Portfile	2014-12-31 21:16:51 UTC (rev 130542)
@@ -25,7 +25,8 @@
 if {${perl5.major} ne ""} {
 supported_archs     i386 ppc
 patchfiles          use-FSPathCopyObjectSync.patch \
-                    fix-Copy-tiger.patch
+                    fix-Copy-tiger.patch \
+                    use-correct-headers.patch
 post-patch {
     reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/Makefile.PL
 }

Added: trunk/dports/perl/p5-macosx-file/files/use-correct-headers.patch
===================================================================
--- trunk/dports/perl/p5-macosx-file/files/use-correct-headers.patch	                        (rev 0)
+++ trunk/dports/perl/p5-macosx-file/files/use-correct-headers.patch	2014-12-31 21:16:51 UTC (rev 130542)
@@ -0,0 +1,78 @@
+Index: Copy/filecopy.c
+===================================================================
+--- Copy/filecopy.c.orig
++++ Copy/filecopy.c
+@@ -3,7 +3,7 @@
+  */
+ 
+ #undef I_POLL
+-#include <Files.h>
++#include <CoreServices/CoreServices.h>
+ #include "common/util.c"
+ 
+ #ifndef kPOSIXErrorBase
+Index: common/util.c
+===================================================================
+--- common/util.c.orig
++++ common/util.c
+@@ -7,7 +7,7 @@
+ 
+ #include <sys/param.h>
+ #undef I_POLL
+-#include <Files.h>
++#include <CoreServices/CoreServices.h>
+ 
+ #ifdef _INC_PERL_XSUB_H
+ static int
+Index: common/macdate.c
+===================================================================
+--- common/macdate.c.orig
++++ common/macdate.c
+@@ -2,7 +2,7 @@
+  * $Id: macdate.c,v 0.70 2005/08/09 15:47:00 dankogai Exp $
+  */
+ 
+-#include <DateTimeUtils.h>
++#include <CoreServices/CoreServices.h>
+ # include <math.h>
+ 
+ #define EPOCH_DELTA 2082844800
+Index: Catalog/Catalog.xs
+===================================================================
+--- Catalog/Catalog.xs.orig
++++ Catalog/Catalog.xs
+@@ -15,7 +15,7 @@ not_here(char *s)
+ 
+ #include "common/util.c"
+ #include "common/macdate.c"
+-#include <Finder.h>
++#include <CoreServices/CoreServices.h>
+ 
+ static SV *
+ xs_getcatalog(char *path){
+Index: Info/Info.xs
+===================================================================
+--- Info/Info.xs.orig
++++ Info/Info.xs
+@@ -15,7 +15,7 @@ not_here(char *s)
+ 
+ #include "common/util.c"
+ #include "common/macdate.c"
+-#include <Finder.h>
++#include <CoreServices/CoreServices.h>
+ 
+ /* #define CATALOGINFONEEDED kFSCatInfoGettableInfo */
+ #define CATALOGINFONEEDED (kFSCatInfoNodeFlags|kFSCatInfoCreateDate|kFSCatInfoContentMod|kFSCatInfoFinderInfo)
+Index: Spec/Spec.xs
+===================================================================
+--- Spec/Spec.xs.orig
++++ Spec/Spec.xs
+@@ -10,7 +10,7 @@ not_here(char *s)
+ }
+ 
+ #undef I_POLL
+-#include <Finder.h>
++#include <CoreServices/CoreServices.h>
+ #include "common/util.c"
+ 
+ #define ClassName "MacOSX::File::Spec"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141231/8f1c0ce1/attachment.html>