<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[128190] trunk/dports/devel/nu2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/128190">128190</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-11-15 19:38:08 -0800 (Sat, 15 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>nu2: update to 2.1.1 (#45881)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelnu2Portfile">trunk/dports/devel/nu2/Portfile</a></li>
<li><a href="#trunkdportsdevelnu2filespatchMakefilediff">trunk/dports/devel/nu2/files/patch-Makefile.diff</a></li>
<li><a href="#trunkdportsdevelnu2filespatchNukefilediff">trunk/dports/devel/nu2/files/patch-Nukefile.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelnu2filespatchtoolsnukediff">trunk/dports/devel/nu2/files/patch-tools-nuke.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelnu2filespatchtools_nukediff">trunk/dports/devel/nu2/files/patch-tools_nuke.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelnu2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/nu2/Portfile (128189 => 128190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/nu2/Portfile 2014-11-16 01:16:03 UTC (rev 128189)
+++ trunk/dports/devel/nu2/Portfile 2014-11-16 03:38:08 UTC (rev 128190)
</span><span class="lines">@@ -1,10 +1,11 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</ins><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup github 1.0
</ins><span class="cx">
</span><ins>+github.setup timburks nu 2.1.1 v
</ins><span class="cx"> name nu2
</span><del>-version 2.0.1
-revision 3
</del><span class="cx"> categories devel
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> license Apache-2
</span><span class="lines">@@ -20,21 +21,19 @@
</span><span class="cx"> are implemented in Objective-C or Nu.
</span><span class="cx">
</span><span class="cx"> homepage http://programming.nu/
</span><del>-master_sites ${homepage}releases
-distname Nu-${version}
-extract.suffix .tgz
</del><span class="cx">
</span><span class="cx"> platforms darwin
</span><span class="cx">
</span><del>-checksums rmd160 b461b08fb7cf9e1a5569fbf85b411e62320f5cab \
- sha256 bfaf9f17a2dbf0ef85cb3db267f2d773b14504aedd78e16580a61cfed676c4f4
</del><ins>+checksums rmd160 9dbc66a462d1116659f4538eeff1f19216700dc2 \
+ sha256 3254b3e4aa55086af7e0a28919358033cccbac6aec7d7addb3df62d1010445e2
</ins><span class="cx">
</span><del>-use_configure no
</del><ins>+# error: instance variables may not be placed in class extension
</ins><span class="cx"> universal_variant no
</span><span class="cx"> supported_archs x86_64
</span><ins>+
</ins><span class="cx"> depends_build port:pkgconfig
</span><ins>+
</ins><span class="cx"> depends_lib port:libffi \
</span><del>- port:pcre \
</del><span class="cx"> port:libedit
</span><span class="cx">
</span><span class="cx"> platform darwin {
</span><span class="lines">@@ -45,45 +44,38 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-patchfiles patch-tools_nuke.diff \
- patch-Makefile.diff \
- patch-Nukefile.diff
</del><ins>+patchfiles patch-Makefile.diff \
+ patch-Nukefile.diff \
+ patch-tools-nuke.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- reinplace "s|\$(DEVROOT)/usr/bin/clang|${configure.cc}|" ${worksrcpath}/Makefile
- reinplace "s|#{DEVROOT}/usr/bin/clang|${configure.cc}|" ${worksrcpath}/Nukefile
- reinplace "s|{@destdir}/Library|{@destdir}${prefix}/Library|" ${worksrcpath}/Nukefile
</del><ins>+ reinplace -W ${worksrcpath} "s|@ARCHS@|[join [get_canonical_archs] {" "}]|g" Nukefile
+ reinplace -W ${worksrcpath} "s|@CC@|${configure.cc}|g" tools/nuke
+ reinplace -W ${worksrcpath} "s|@FRAMEWORKS_DIR@|${frameworks_dir}|g" tools/nuke
</ins><span class="cx">
</span><del>- # replace placeholders in source files
- reinplace "s|@ARCHS@|[join ${configure.build_arch} {" "}]|g" ${worksrcpath}/Nukefile
- reinplace "s|@CC@|${configure.cc}|g" ${worksrcpath}/Nukefile
- reinplace "s|@SDKROOT@|${configure.sdkroot}|g" ${worksrcpath}/Nukefile
-
- if {[vercmp $xcodeversion 4.3] < 0} {
- set SDK ${developer_dir}/SDKs/MacOSX${macosx_deployment_target}.sdk
</del><ins>+ if {${configure.sdkroot} ne ""} {
+ set sdk "-isysroot ${configure.sdkroot}"
</ins><span class="cx"> } else {
</span><del>- set SDK ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${macosx_deployment_target}.sdk
- }
- reinplace "s|@SDKFLAGS@|-isysroot ${SDK}|g" ${worksrcpath}/Nukefile
-
- reinplace "s|/Library/Frameworks|${frameworks_dir}|" ${worksrcpath}/tools/nuke
</del><ins>+ set sdk ""
+ }
+ reinplace -W ${worksrcpath} "s|@SDK@|${sdk}|g" Makefile Nukefile
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-test.run yes
-test.cmd nuke
</del><ins>+use_configure no
</ins><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url http://programming.nu/downloads
-livecheck.regex {Nu-([\d.]+).tgz}
-
</del><span class="cx"> pre-build {
</span><del>- system -W ${worksrcpath} "make PREFIX=${prefix} CC=${configure.cc}"
</del><ins>+ system -W ${worksrcpath} "${build.env} make -j${build.jobs}"
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-build.cmd "./mininush tools/nuke"
</del><ins>+build.cmd ./mininush tools/nuke
</ins><span class="cx"> build.target
</span><del>-build.env PREFIX=${prefix}
</del><ins>+build.env CC="${configure.cc}" \
+ PREFIX=${prefix}
</ins><span class="cx">
</span><ins>+test.run yes
+test.cmd nuke
+
</ins><span class="cx"> destroot.destdir
</span><del>-destroot.env-append PREFIX=${prefix} \
- DESTDIR=${destroot}
</del><ins>+destroot.env-append DESTDIR=${destroot} \
+ PREFIX=${prefix} \
+ FRAMEWORKS_DIR=${frameworks_dir}
</ins></span></pre></div>
<a id="trunkdportsdevelnu2filespatchMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/nu2/files/patch-Makefile.diff (128189 => 128190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/nu2/files/patch-Makefile.diff 2014-11-16 01:16:03 UTC (rev 128189)
+++ trunk/dports/devel/nu2/files/patch-Makefile.diff 2014-11-16 03:38:08 UTC (rev 128190)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>---- Makefile.orig 2011-10-04 08:05:53.000000000 +0200
-+++ Makefile 2011-10-04 08:11:23.000000000 +0200
-@@ -10,15 +10,17 @@
</del><ins>+--- Makefile.orig 2013-07-07 12:50:11.000000000 -0500
++++ Makefile 2014-11-15 19:46:41.000000000 -0600
+@@ -11,23 +11,10 @@
+ # TOOLCHAIN = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain
+ # SDKROOT = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer
</ins><span class="cx">
</span><del>- DEVROOT = $(shell xcode-select -print-path)
-
</del><span class="cx"> -ifeq ($(shell test -e /usr/lib/libffi.dylib && echo yes), yes)
</span><span class="cx"> - # Use the libffi that ships with OS X.
</span><span class="cx"> - FFI_LIB = -L/usr/lib -lffi
</span><span class="lines">@@ -13,17 +13,37 @@
</span><span class="cx"> - FFI_LIB = -L./libffi -lffi
</span><span class="cx"> - FFI_INCLUDE = -I./libffi/include
</span><span class="cx"> -endif
</span><del>-+#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
</del><ins>+-
+-ifeq ($(shell test -e $(SDKROOT)/SDKs/MacOSX10.7.sdk && echo yes), yes)
+- LION_CFLAGS = -isysroot $(SDKROOT)/SDKs/MacOSX10.7.sdk
+-else
+- LION_CFLAGS =
+-endif
</ins><span class="cx"> +FFI_LIB := $(shell pkg-config libffi --libs)
</span><span class="cx"> +FFI_INCLUDE := $(shell pkg-config libffi --cflags)
</span><span class="cx">
</span><del>- ifeq ($(shell test -e $(DEVROOT)/SDKs/MacOSX10.7.sdk && echo yes), yes)
- LION_CFLAGS = -isysroot $(DEVROOT)/SDKs/MacOSX10.7.sdk
</del><ins>+-INCLUDES = $(FFI_INCLUDE) -I./include
++INCLUDES = -I./include $(FFI_INCLUDE)
+
+ ifeq ($(shell test -d $(PREFIX)/include && echo yes), yes)
+ INCLUDES += -I$(PREFIX)/include
+@@ -43,17 +30,12 @@
+ GCC_FILES = $(OBJC_FILES) $(C_FILES)
+ GCC_OBJS = $(patsubst %.m, %.o, $(OBJC_FILES)) $(patsubst %.c, %.o, $(C_FILES))
+
+-CC = gcc
++CC ?= cc
+ CFLAGS = -g -Wall -DMININUSH
+ MFLAGS = -fobjc-exceptions
+
+ ifeq ($(SYSTEM), Darwin)
+- # as of around 10.7.3, clang becomes part of OS X
+- CC = /usr/bin/clang
+- ifneq ($(shell test -e $(CC) && echo yes), yes)
+- CC = $(TOOLCHAIN)/usr/bin/clang
+- endif
+- CFLAGS += -DMACOSX -DDARWIN $(LION_CFLAGS)
++ CFLAGS += -DMACOSX -DDARWIN @SDK@
+ else
+ # CFLAGS += -DLINUX
+ # MFLAGS += -fconstant-string-class=NSConstantString
</ins></span></pre></div>
<a id="trunkdportsdevelnu2filespatchNukefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/nu2/files/patch-Nukefile.diff (128189 => 128190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/nu2/files/patch-Nukefile.diff 2014-11-16 01:16:03 UTC (rev 128189)
+++ trunk/dports/devel/nu2/files/patch-Nukefile.diff 2014-11-16 03:38:08 UTC (rev 128190)
</span><span class="lines">@@ -1,34 +1,29 @@
</span><del>---- Nukefile.orig 2011-09-02 15:23:51.000000000 -0500
-+++ Nukefile 2012-01-15 02:34:31.000000000 -0600
-@@ -59,14 +59,6 @@
- (if (NSFileManager directoryExistsNamed:"#{@prefix}/include") (@inc_dirs addObject:"#{@prefix}/include"))
- (if (NSFileManager directoryExistsNamed:"#{@prefix}/lib") (@lib_dirs addObject:"#{@prefix}/lib"))
</del><ins>+--- Nukefile.orig 2013-07-07 12:50:11.000000000 -0500
++++ Nukefile 2014-11-15 20:51:01.000000000 -0600
+@@ -25,6 +25,9 @@
+ (if (env objectForKey:"PREFIX")
+ (then (set @prefix (env objectForKey:"PREFIX")))
+ (else (set @prefix "/usr/local")))
++ (if (env objectForKey:"FRAMEWORKS_DIR")
++ (then (set @frameworks_dir (env objectForKey:"FRAMEWORKS_DIR")))
++ (else (set @frameworks_dir "/Library/Frameworks")))
+ (if (env objectForKey:"DESTDIR")
+ (then (set @destdir (env objectForKey:"DESTDIR")))
+ (else (set @destdir ""))))
+@@ -79,28 +82,13 @@
</ins><span class="cx">
</span><del>--(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")
</del><ins>+ ;; build configuration
</ins><span class="cx">
</span><del>- ;; build configuration
--(set @cc "gcc")
--(set @cc "#{DEVROOT}/usr/bin/clang")
--
</del><span class="cx"> -(set @sdkflags "")
</span><span class="cx"> -(set @sdk
</span><del>-- (cond ((NSFileManager directoryExistsNamed:"#{DEVROOT}/SDKs/MacOSX10.7.sdk")
-- (set @sdkflags "-D__OBJC2__ -DSNOWLEOPARD")
</del><ins>+- (cond ((NSFileManager directoryExistsNamed:"#{DEVROOT}/SDKs/MacOSX10.8.sdk")
+- (set @sdkflags "-D__OBJC2__")
+- ("-isysroot #{DEVROOT}/SDKs/MacOSX10.8.sdk"))
+- ((NSFileManager directoryExistsNamed:"#{DEVROOT}/SDKs/MacOSX10.7.sdk")
+- (set @sdkflags "-D__OBJC2__")
</ins><span class="cx"> - ("-isysroot #{DEVROOT}/SDKs/MacOSX10.7.sdk"))
</span><span class="cx"> - ((NSFileManager directoryExistsNamed:"#{DEVROOT}/SDKs/MacOSX10.6.sdk")
</span><del>-- (set @sdkflags "-D__OBJC2__ -DSNOWLEOPARD")
</del><ins>+- (set @sdkflags "-D__OBJC2__")
</ins><span class="cx"> - ("-isysroot #{DEVROOT}/SDKs/MacOSX10.6.sdk"))
</span><span class="cx"> - ((NSFileManager directoryExistsNamed:"#{DEVROOT}/SDKs/MacOSX10.5.sdk")
</span><span class="cx"> - (set @sdkflags "-D__OBJC2__")
</span><span class="lines">@@ -36,14 +31,18 @@
</span><span class="cx"> - ((NSFileManager directoryExistsNamed:"#{DEVROOT}/SDKs/MacOSX10.4u.sdk")
</span><span class="cx"> - ("-isysroot #{DEVROOT}/SDKs/MacOSX10.4u.sdk"))
</span><span class="cx"> - (else "")))
</span><del>-+(set @cc "@CC@")
-+(set @leopard "")
-+(set @sdk "@SDKROOT@")
-+(set @sdkflags "@SDKFLAGS@")
</del><ins>++(set @sdkflags "-D__OBJC2__")
++(set @sdk "@SDK@")
</ins><span class="cx">
</span><del>- (set @cflags "-Wall -g -std=gnu99 -fPIC")
</del><ins>+ (ifDarwin
+ (then (set @cflags ( "-Wall -g -fPIC -O2 -DMACOSX #{@sdk} #{@sdkflags}"))
+ (set @mflags_nogc "-fobjc-exceptions")
+- (set @mflags (+ @mflags_nogc " -fobjc-gc"))) ;; To use garbage collection, add this flag: "-fobjc-gc"
++ (set @mflags @mflags_nogc))
+ (else (set @cflags "-Wall -g -std=gnu99 -fPIC")
+ (set @mflags ((NSString stringWithShellCommand:"gnustep-config --objc-flags") chomp))))
</ins><span class="cx">
</span><del>-@@ -113,10 +92,7 @@
</del><ins>+@@ -112,10 +100,7 @@
</ins><span class="cx"> (set @cflags (+ @cflags " -DHAVE_CONFIG_H"))
</span><span class="cx">
</span><span class="cx"> (ifDarwin
</span><span class="lines">@@ -51,7 +50,55 @@
</span><span class="cx"> -
</span><span class="cx"> -(if (or isSnowLeopard isLion)
</span><span class="cx"> - (then (set @arch (append @arch '("x86_64")))))
</span><del>-+ (then (set @arch '("@ARCHS@"))))
</del><ins>++ (then (set @arch '("@ARCHS@"))))
</ins><span class="cx">
</span><span class="cx"> (set @includes
</span><span class="cx"> ((@inc_dirs map: (do (inc) " -I#{inc}")) join))
</span><ins>+@@ -193,7 +178,7 @@
+
+ (task "default" => "nush")
+
+-;; Except for the Nu.framework (installed in /Library/Frameworks),
++;; Except for the Nu.framework (installed in #{@frameworks_dir}),
+ ;; all scripts and binaries are installed to #{@prefix}/bin
+
+ (set @installprefix "#{@destdir}#{@prefix}")
+@@ -201,25 +186,25 @@
+ (task "install" => "nush" is
+ ('("nuke" "nubile" "nutemplate" "nutest" "nudoc" "nubake" "nutmbundle") each:
+ (do (program)
+- (SH "sudo cp tools/#{program} #{@installprefix}/bin")))
+- (SH "sudo cp nush #{@installprefix}/bin")
++ (SH "cp tools/#{program} #{@installprefix}/bin")))
++ (SH "cp nush #{@installprefix}/bin")
+ (ifDarwin
+ ;; install the framework
+- (SH "sudo rm -rf #{@destdir}/Library/Frameworks/#{@framework}.framework")
+- (SH "sudo ditto #{@framework}.framework #{@destdir}/Library/Frameworks/#{@framework}.framework"))
++ (SH "rm -rf #{@destdir}#{@frameworks_dir}/#{@framework}.framework")
++ (SH "ditto #{@framework}.framework #{@destdir}#{@frameworks_dir}/#{@framework}.framework"))
+ (ifGNUstep
+ ;; install the dynamic library
+- (SH "sudo cp #{@library_executable_name} #{@installprefix}/lib")
++ (SH "cp #{@library_executable_name} #{@installprefix}/lib")
+ ;; copy the headers
+- (SH "sudo rm -rf #{@installprefix}/include/Nu")
+- (SH "sudo cp -rp include/Nu #{@installprefix}/include")
+- (SH "sudo cp -rp objc/*.h #{@installprefix}/include/Nu")
+- (SH "sudo cp -rp nu/ #{@installprefix}/share/libNu"))
+- (SH "sudo mkdir -p #{@installprefix}/share")
+- (SH "sudo rm -rf #{@installprefix}/share/nu")
+- (SH "sudo cp -rp share/nu #{@installprefix}/share/nu")
++ (SH "rm -rf #{@installprefix}/include/Nu")
++ (SH "cp -Rp include/Nu #{@installprefix}/include")
++ (SH "cp -Rp objc/*.h #{@installprefix}/include/Nu")
++ (SH "cp -Rp nu/ #{@installprefix}/share/libNu"))
++ (SH "mkdir -p #{@installprefix}/share")
++ (SH "rm -rf #{@installprefix}/share/nu")
++ (SH "cp -Rp share/nu #{@installprefix}/share/nu")
+ (ifDarwin
+- (SH "sudo ditto examples #{@installprefix}/share/nu/examples")))
++ (SH "ditto examples #{@installprefix}/share/nu/examples")))
+
+ ;; Build a disk image for distributing the framework.
+ (task "framework_image" => "framework" is
</ins></span></pre></div>
<a id="trunkdportsdevelnu2filespatchtoolsnukedifffromrev128186trunkdportsdevelnu2filespatchtools_nukediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/nu2/files/patch-tools-nuke.diff (from rev 128186, trunk/dports/devel/nu2/files/patch-tools_nuke.diff) (0 => 128190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/nu2/files/patch-tools-nuke.diff (rev 0)
+++ trunk/dports/devel/nu2/files/patch-tools-nuke.diff 2014-11-16 03:38:08 UTC (rev 128190)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+--- tools/nuke.orig 2013-07-07 12:50:11.000000000 -0500
++++ tools/nuke 2014-11-15 20:51:47.000000000 -0600
+@@ -271,17 +271,7 @@
+ momc)
+
+ (function select-compiler ()
+- (ifDarwin
+- ;; clang built-in to 10.7.3
+- (set clang "/usr/bin/clang")
+- (if (not (NSFileManager fileExistsNamed:clang))
+- ;; use xcode-select to get from e.g. /Developer or Xcode.app
+- (set DEVROOT (NSString stringWithShellCommand:"xcode-select -print-path"))
+- (set clang "#{DEVROOT}/usr/bin/clang")
+- (if (not (NSFileManager fileExistsNamed:clang))
+- (set clang nil))))
+- ;; default to gcc
+- (if clang clang (else "gcc")))
++ "@CC@")
+
+ ;; use this to create all the compilation tasks for the files in the @c_files and @m_files collections
+ (macro compilation-tasks ()
+@@ -552,7 +542,7 @@
+ (set @arch (list (NSString stringWithShellCommand:"arch"))))
+
+ (ifDarwin
+- (then (set FRAMEWORK_ROOT "/Library/Frameworks"))
++ (then (set FRAMEWORK_ROOT "@FRAMEWORKS_DIR@"))
+ (else (set FRAMEWORK_ROOT "/usr/local/frameworks")))
+
+ ;; framework directory tasks
+@@ -579,6 +569,7 @@
+
+ ;; framework architecture-specific executable
+ (set @framework_executables (NSMutableArray array))
++ (set @framework_install_path "#{FRAMEWORK_ROOT}")
+ (@arch each:
+ (do (architecture)
+ (set framework_executable "build/#{architecture}/framework-#{@framework}")
+@@ -707,7 +698,7 @@
+ (@framework_extra_install))
+ (SH "sudo mkdir -p #{FRAMEWORK_ROOT}")
+ (SH "sudo rm -rf #{FRAMEWORK_ROOT}/#{@framework}.framework")
+- (SH "sudo cp -rp #{@framework}.framework #{FRAMEWORK_ROOT}/#{@framework}.framework"))
++ (SH "sudo cp -Rp #{@framework}.framework #{FRAMEWORK_ROOT}/#{@framework}.framework"))
+
+ (task "test" => "framework" is
+ (SH "nutest test/test_*.nu"))
</ins></span></pre></div>
<a id="trunkdportsdevelnu2filespatchtools_nukediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/nu2/files/patch-tools_nuke.diff (128189 => 128190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/nu2/files/patch-tools_nuke.diff 2014-11-16 01:16:03 UTC (rev 128189)
+++ trunk/dports/devel/nu2/files/patch-tools_nuke.diff 2014-11-16 03:38:08 UTC (rev 128190)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>---- tools/nuke.orig 2011-09-02 15:23:51.000000000 -0500
-+++ tools/nuke 2012-01-15 02:32:45.000000000 -0600
-@@ -579,6 +579,7 @@
-
- ;; framework architecture-specific executable
- (set @framework_executables (NSMutableArray array))
-+ (set @framework_install_path "#{FRAMEWORK_ROOT}")
- (@arch each:
- (do (architecture)
- (set framework_executable "build/#{architecture}/framework-#{@framework}")
</del></span></pre>
</div>
</div>
</body>
</html>