[84894] trunk/dports/devel/nu2/files

[and.damore at macports.org]

Revision: 84894
          http://trac.macports.org/changeset/84894
Author:   and.damore at macports.org
Date:     2011-10-04 00:33:17 -0700 (Tue, 04 Oct 2011)
Log Message:
-----------
port nu2: added patchfiles

Added Paths:
-----------
    trunk/dports/devel/nu2/files/patch-Makefile.diff
    trunk/dports/devel/nu2/files/patch-Nukefile.diff

Added: trunk/dports/devel/nu2/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/nu2/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/devel/nu2/files/patch-Makefile.diff	2011-10-04 07:33:17 UTC (rev 84894)
@@ -0,0 +1,29 @@
+--- Makefile.orig	2011-10-04 08:05:53.000000000 +0200
++++ Makefile	2011-10-04 08:11:23.000000000 +0200
+@@ -10,15 +10,17 @@
+ 
+ DEVROOT = $(shell xcode-select -print-path)
+ 
+-ifeq ($(shell test -e /usr/lib/libffi.dylib && echo yes), yes)
+-	# Use the libffi that ships with OS X.
+-	FFI_LIB = -L/usr/lib -lffi
+-	FFI_INCLUDE = -I/usr/include/ffi
+-else
+-	# Use the libffi that is distributed with Nu.
+-	FFI_LIB = -L./libffi -lffi
+-	FFI_INCLUDE = -I./libffi/include
+-endif
++#ifeq ($(shell test -e /usr/lib/libffi.dylib && echo yes), yes)
++#	# Use the libffi that ships with OS X.
++#	FFI_LIB = -L/usr/lib -lffi
++#	FFI_INCLUDE = -I/usr/include/ffi
++#else
++#	# Use the libffi that is distributed with Nu.
++#	FFI_LIB = -L./libffi -lffi
++#	FFI_INCLUDE = -I./libffi/include
++#endif
++FFI_LIB := $(shell pkg-config libffi --libs)
++FFI_INCLUDE := $(shell pkg-config libffi --cflags)
+ 
+ ifeq ($(shell test -e $(DEVROOT)/SDKs/MacOSX10.7.sdk && echo yes), yes)
+         LION_CFLAGS = -isysroot $(DEVROOT)/SDKs/MacOSX10.7.sdk

Added: trunk/dports/devel/nu2/files/patch-Nukefile.diff
===================================================================
--- trunk/dports/devel/nu2/files/patch-Nukefile.diff	                        (rev 0)
+++ trunk/dports/devel/nu2/files/patch-Nukefile.diff	2011-10-04 07:33:17 UTC (rev 84894)
@@ -0,0 +1,57 @@
+--- Nukefile.orig	2011-10-04 08:21:17.000000000 +0200
++++ Nukefile	2011-10-04 08:25:35.000000000 +0200
+@@ -59,14 +59,6 @@
+ (if (NSFileManager directoryExistsNamed:"#{@prefix}/include") (@inc_dirs addObject:"#{@prefix}/include"))
+ (if (NSFileManager directoryExistsNamed:"#{@prefix}/lib") (@lib_dirs addObject:"#{@prefix}/lib"))
+ 
+-(ifDarwin
+-         (then (if (NSFileManager fileExistsNamed:"/usr/lib/libffi.dylib")
+-                   (then ;; Use the libffi that ships with OS X.
+-                         (@inc_dirs addObject:"/usr/include/ffi"))
+-                   (else ;; Use the libffi that is distributed with Nu.
+-                         (@inc_dirs addObject:"./libffi/include")
+-                         (@lib_dirs addObject:"./libffi")))))
+-
+ ;; framework description
+ (set @framework "Nu")
+ (set @framework_identifier   "nu.programming.framework")
+@@ -78,23 +70,10 @@
+ (set @dylib "libNu")
+ 
+ ;; build configuration
+-(set @cc "gcc")
+-(set @cc "#{DEVROOT}/usr/bin/clang")
+-
+-(set @sdkflags "")
+-(set @sdk
+-     (cond ((NSFileManager directoryExistsNamed:"#{DEVROOT}/SDKs/MacOSX10.7.sdk")
+-            (set @sdkflags "-D__OBJC2__ -DSNOWLEOPARD")
+-            ("-isysroot #{DEVROOT}/SDKs/MacOSX10.7.sdk"))
+-           ((NSFileManager directoryExistsNamed:"#{DEVROOT}/SDKs/MacOSX10.6.sdk")
+-            (set @sdkflags "-D__OBJC2__ -DSNOWLEOPARD")
+-            ("-isysroot #{DEVROOT}/SDKs/MacOSX10.6.sdk"))
+-           ((NSFileManager directoryExistsNamed:"#{DEVROOT}/SDKs/MacOSX10.5.sdk")
+-            (set @sdkflags "-D__OBJC2__")
+-            ("-isysroot #{DEVROOT}/SDKs/MacOSX10.5.sdk"))
+-           ((NSFileManager directoryExistsNamed:"#{DEVROOT}/SDKs/MacOSX10.4u.sdk")
+-            ("-isysroot #{DEVROOT}/SDKs/MacOSX10.4u.sdk"))
+-           (else "")))
++(set @cc "@CC@")
++(set @leopard "")
++(set @sdk "@SDKROOT@")
++(set @sdkflags "@SDKFLAGS@")
+ 
+ (set @cflags "-Wall -g -std=gnu99 -fPIC")
+ 
+@@ -114,10 +92,7 @@
+ (set @cflags (+ @cflags " -DHAVE_CONFIG_H"))
+ 
+ (ifDarwin
+-         (then (set @arch '("i386")))) ;; optionally add "ppc" or "ppc64" to the list
+-
+-(if (or isSnowLeopard isLion)
+-	(then (set @arch (append @arch '("x86_64")))))
++         (then (set @arch '("@ARCHS@"))))
+ 
+ (set @includes
+      ((@inc_dirs map: (do (inc) " -I#{inc}")) join))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111004/7be37b8d/attachment.html>