<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1a301e4f77779b6d4bb08f16278e4e6610fb6a90">https://github.com/macports/macports-ports/commit/1a301e4f77779b6d4bb08f16278e4e6610fb6a90</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 1a301e4f777 R-app: improve app bundle version info & allow arm64 build
</span>1a301e4f777 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1a301e4f77779b6d4bb08f16278e4e6610fb6a90
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Sat Aug 14 01:29:19 2021 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-app: improve app bundle version info & allow arm64 build
</span>---
math/R-app/Portfile | 14 ++++++++++++--
math/R-app/files/patch-implicit-function-declaration.diff | 11 -----------
2 files changed, 12 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/R-app/Portfile b/math/R-app/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index be20c69fe6e..43028c90487 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/R-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/R-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,11 @@ PortGroup xcode 1.0
</span>
name R-app
version 1.76
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set rel_r_ver 4.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The version of R when this version of R-app was released, used for changing version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# info of app bundle to match the actual R version. Should be updated for each R release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# if no new R-app is released at the same time.
</span> categories math science aqua
maintainers {me.com:kjell.konis @kjellpk} {i0ntempest @i0ntempest} openmaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +19,7 @@ long_description ${description}
</span>
homepage http://R.research.att.com/
platforms macosx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs x86_64 arm64
</span>
master_sites http://cran.rstudio.com/bin/macosx/ \
http://cran.us.r-project.org/bin/macosx/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +33,12 @@ checksums rmd160 2802cc4e3eab6510f54e85d1a7f1a3424379cbeb \
</span> post-patch {
reinplace "s|/Library/Frameworks/R.framework|${frameworks_dir}/R.framework|g" \
${worksrcpath}/R.xcodeproj/project.pbxproj
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set r_ver [lindex [split [exec ${prefix}/bin/r --version | head -n1] " "] 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|${rel_r_ver}|${r_ver}|g" ${worksrcpath}/InfoPlist.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rev_file [open ${worksrcpath}/REVISION r]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set r_rev [lindex [split [read $rev_file] "\n"] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close $rev_file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|%SVN%|${r_rev}|g" ${worksrcpath}/Info.plist
</span> }
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/R-app/files/patch-implicit-function-declaration.diff b/math/R-app/files/patch-implicit-function-declaration.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b95e94d6d30..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/R-app/files/patch-implicit-function-declaration.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- R.xcodeproj/project.pbxproj 2020-03-04 21:42:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ R.xcodeproj/project.pbxproj 2020-10-19 00:58:26.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -167,7 +167,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 68DEAEE8083271CA00C5D76C /* RTextView.h in Headers */ = {isa = PBXBuildFile; fileRef = 68DEAEE6083271CA00C5D76C /* RTextView.h */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 68DEAEE9083271CA00C5D76C /* RTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 68DEAEE7083271CA00C5D76C /* RTextView.m */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8D1107280486CEB800E47090 /* R_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 32CA4F630368D1EE00C91783 /* R_Prefix.pch */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); COMPILER_FLAGS = "-Wno-error=implicit-function-declaration"; }; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BC03E662133AA8E100456B01 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC03E661133AA8E100456B01 /* Quartz.framework */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BC0D319A1334B1410071B76A /* NSTextView_RAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = BC0D31981334B1410071B76A /* NSTextView_RAdditions.h */; };
</span></pre><pre style='margin:0'>
</pre>