<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8243355b84c77bd487c5352b7378ad7049acc717">https://github.com/macports/macports-ports/commit/8243355b84c77bd487c5352b7378ad7049acc717</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8243355 nu2: Update to 2.1.2
</span>8243355 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8243355b84c77bd487c5352b7378ad7049acc717
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Nov 26 09:59:24 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> nu2: Update to 2.1.2
</span>---
devel/nu2/Portfile | 7 +++--
devel/nu2/files/patch-Makefile.diff | 19 +++++++------
devel/nu2/files/patch-Nukefile.diff | 52 +++++++++++++++++------------------
devel/nu2/files/patch-tools-nuke.diff | 17 ++++++------
4 files changed, 50 insertions(+), 45 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nu2/Portfile b/devel/nu2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 162ffa7..255bed8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nu2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nu2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup timburks nu 2.1.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup nulang nu 2.1.2 v
</span> name nu2
categories devel
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,8 +23,9 @@ homepage http://programming.nu/
</span>
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9dbc66a462d1116659f4538eeff1f19216700dc2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3254b3e4aa55086af7e0a28919358033cccbac6aec7d7addb3df62d1010445e2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f2a7ef7366d577bbc91307f95e013c3d2401c1f2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9230551a2c15fe29703d409cef124a531995dc271ef7ec99919e731172c87532 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 994256
</span>
# error: instance variables may not be placed in class extension
universal_variant no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nu2/files/patch-Makefile.diff b/devel/nu2/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 022b2ce..2748f7d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nu2/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nu2/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2013-07-07 12:50:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2014-11-15 19:46:41.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2017-04-14 23:02:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2017-11-26 09:18:38.000000000 -0600
</span> @@ -11,23 +11,10 @@
# TOOLCHAIN = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain
# SDKROOT = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,14 +27,17 @@
</span>
ifeq ($(shell test -d $(PREFIX)/include && echo yes), yes)
INCLUDES += -I$(PREFIX)/include
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,17 +30,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +35,7 @@
</span> GCC_FILES = $(OBJC_FILES) $(C_FILES)
GCC_OBJS = $(patsubst %.m, %.o, $(OBJC_FILES)) $(patsubst %.c, %.o, $(C_FILES))
<span style='display:block; white-space:pre;background:#ffe0e0;'>--CC = gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CC ?= cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = -g -Wall -DMININUSH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MFLAGS = -fobjc-exceptions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC = clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CC ?= clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS = -g -O0 -Wall -DMININUSH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MFLAGS = -fobjc-exceptions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #MFLAGS += `gnustep-config --debug-flags`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,12 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -I/usr/include/GNUstep
</span>
ifeq ($(SYSTEM), Darwin)
- # as of around 10.7.3, clang becomes part of OS X
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,4 +49,4 @@
</span> + CFLAGS += -DMACOSX -DDARWIN @SDK@
else
# CFLAGS += -DLINUX
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # MFLAGS += -fconstant-string-class=NSConstantString
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MFLAGS += $(shell gnustep-config --debug-flags)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nu2/files/patch-Nukefile.diff b/devel/nu2/files/patch-Nukefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 14fe757..b4de724 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nu2/files/patch-Nukefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nu2/files/patch-Nukefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Nukefile.orig 2013-07-07 12:50:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Nukefile 2014-11-15 20:51:01.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Nukefile.orig 2017-04-14 23:02:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Nukefile 2017-11-26 09:25:43.000000000 -0600
</span> @@ -25,6 +25,9 @@
(if (env objectForKey:"PREFIX")
(then (set @prefix (env objectForKey:"PREFIX")))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span> (if (env objectForKey:"DESTDIR")
(then (set @destdir (env objectForKey:"DESTDIR")))
(else (set @destdir ""))))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,28 +82,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,23 +82,8 @@
</span>
;; build configuration
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,12 +36,6 @@
</span>
(ifDarwin
(then (set @cflags ( "-Wall -g -fPIC -O2 -DMACOSX #{@sdk} #{@sdkflags}"))
<span style='display:block; white-space:pre;background:#ffe0e0;'>- (set @mflags_nogc "-fobjc-exceptions")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (set @mflags (+ @mflags_nogc " -fobjc-gc"))) ;; To use garbage collection, add this flag: "-fobjc-gc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (set @mflags @mflags_nogc))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (else (set @cflags "-Wall -g -std=gnu99 -fPIC")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (set @mflags ((NSString stringWithShellCommand:"gnustep-config --objc-flags") chomp))))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> @@ -112,10 +100,7 @@
(set @cflags (+ @cflags " -DHAVE_CONFIG_H"))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,12 +43,12 @@
</span> - (then (set @arch '()))) ;; optionally add "ppc" or "ppc64" to the list
-
-(if (or isSnowLeopard isLion)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- (then (set @arch (append @arch '("x86_64")))))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (then (set @arch '("@ARCHS@"))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (then (set @arch (append @arch '("x86_64")))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (then (set @arch '("@ARCHS@"))))
</span>
(set @includes
((@inc_dirs map: (do (inc) " -I#{inc}")) join))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -193,7 +178,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -239,7 +224,7 @@
</span>
(task "default" => "nush")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,9 +57,9 @@
</span> ;; all scripts and binaries are installed to #{@prefix}/bin
(set @installprefix "#{@destdir}#{@prefix}")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,25 +186,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -247,28 +232,28 @@
</span> (task "install" => "nush" is
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ('("nuke" "nubile" "nutemplate" "nutest" "nudoc" "nubake" "nutmbundle") each:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('("nuke" "nustyle" "nutemplate" "nutest" "nudoc" "nubake" "nutmbundle") each:
</span> (do (program)
- (SH "sudo cp tools/#{program} #{@installprefix}/bin")))
- (SH "sudo cp nush #{@installprefix}/bin")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,21 +72,27 @@
</span> + (SH "rm -rf #{@destdir}#{@frameworks_dir}/#{@framework}.framework")
+ (SH "ditto #{@framework}.framework #{@destdir}#{@frameworks_dir}/#{@framework}.framework"))
(ifGNUstep
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ;; install the dynamic library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (SH "sudo cp #{@library_executable_name} #{@installprefix}/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (SH "cp #{@library_executable_name} #{@installprefix}/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;; copy the headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (SH "sudo rm -rf #{@installprefix}/include/Nu")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (SH "sudo cp -rp include/Nu #{@installprefix}/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (SH "sudo cp -rp objc/*.h #{@installprefix}/include/Nu")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (SH "sudo cp -rp nu/ #{@installprefix}/share/libNu"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; install the dynamic library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (SH "sudo mkdir -p #{@installprefix}/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (SH "sudo cp #{@library_executable_name} #{@installprefix}/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (SH "mkdir -p #{@installprefix}/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (SH "cp #{@library_executable_name} #{@installprefix}/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; copy the headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (SH "sudo rm -rf #{@installprefix}/include/Nu")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (SH "sudo mkdir -p #{@installprefix}/include/Nu")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (SH "sudo cp -rp objc/*.h #{@installprefix}/include/Nu")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (SH "sudo rm -rf #{@installprefix}/share/libNu")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (SH "sudo mkdir -p #{@installprefix}/share/libNu")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (SH "sudo cp -rp nu/* #{@installprefix}/share/libNu"))
</span> - (SH "sudo mkdir -p #{@installprefix}/share")
- (SH "sudo rm -rf #{@installprefix}/share/nu")
- (SH "sudo cp -rp share/nu #{@installprefix}/share/nu")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (SH "rm -rf #{@installprefix}/include/Nu")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (SH "cp -Rp include/Nu #{@installprefix}/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (SH "cp -Rp objc/*.h #{@installprefix}/include/Nu")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (SH "cp -Rp nu/ #{@installprefix}/share/libNu"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (SH "rm -rf #{@installprefix}/include/Nu")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (SH "mkdir -p #{@installprefix}/include/Nu")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (SH "cp -Rp objc/*.h #{@installprefix}/include/Nu")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (SH "rm -rf #{@installprefix}/share/libNu")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (SH "mkdir -p #{@installprefix}/share/libNu")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (SH "cp -Rp nu/* #{@installprefix}/share/libNu"))
</span> + (SH "mkdir -p #{@installprefix}/share")
+ (SH "rm -rf #{@installprefix}/share/nu")
+ (SH "cp -Rp share/nu #{@installprefix}/share/nu")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nu2/files/patch-tools-nuke.diff b/devel/nu2/files/patch-tools-nuke.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7754f0d..a7f4e3a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nu2/files/patch-tools-nuke.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nu2/files/patch-tools-nuke.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/nuke.orig 2013-07-07 12:50:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/nuke 2014-11-15 20:51:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -271,17 +271,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/nuke.orig 2017-04-14 23:02:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/nuke 2017-11-26 09:46:44.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -274,18 +274,7 @@
</span> momc)
(function select-compiler ()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,13 +13,14 @@
</span> - (set clang "#{DEVROOT}/usr/bin/clang")
- (if (not (NSFileManager fileExistsNamed:clang))
- (set clang nil))))
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- (ifLinux (set clang "/usr/bin/clang"))
</span> - ;; default to gcc
- (if clang clang (else "gcc")))
+ "@CC@")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ;; use this to create all the compilation tasks for the files in the @c_files and @m_files collections
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (macro compilation-tasks ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -552,7 +542,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (function select-debugger ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (if (command-exists "lldb") "lldb" (else "gdb")))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -559,7 +548,7 @@
</span> (set @arch (list (NSString stringWithShellCommand:"arch"))))
(ifDarwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +29,7 @@
</span> (else (set FRAMEWORK_ROOT "/usr/local/frameworks")))
;; framework directory tasks
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -579,6 +569,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -586,6 +575,7 @@
</span>
;; framework architecture-specific executable
(set @framework_executables (NSMutableArray array))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +37,7 @@
</span> (@arch each:
(do (architecture)
(set framework_executable "build/#{architecture}/framework-#{@framework}")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -707,7 +698,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -714,7 +704,7 @@
</span> (@framework_extra_install))
(SH "sudo mkdir -p #{FRAMEWORK_ROOT}")
(SH "sudo rm -rf #{FRAMEWORK_ROOT}/#{@framework}.framework")
</pre><pre style='margin:0'>
</pre>