<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3f9ad9cb7ac895a065cfd717afa11e23e5d49d88">https://github.com/macports/macports-ports/commit/3f9ad9cb7ac895a065cfd717afa11e23e5d49d88</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 3f9ad9c android: whitespace and modeline
</span>3f9ad9c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3f9ad9cb7ac895a065cfd717afa11e23e5d49d88
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri May 18 20:37:41 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> android: whitespace and modeline
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Tabs to spaces.
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/31826
</span>---
java/android/Portfile | 139 +++++++++++++++++++++++++-------------------------
1 file changed, 69 insertions(+), 70 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/android/Portfile b/java/android/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bd052d9..d89d6d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/android/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/android/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,59 +1,58 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 8; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# vim: set fileencoding=utf-8 tabstop=8 shiftwidth=4 softtabstop=4 noexpandtab filetype=tcl :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name android
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 23
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories java devel emulators
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license Apache-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Android SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name android
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories java devel emulators
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license Apache-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Android SDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description \
</span> The Android SDK allows development for the Android mobile platform.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs noarch
</span>
set patchversion 121820
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set appbundles ${name}-appbundles-r${patchversion}.tar.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set tools ${name}-tools-r${patchversion}.tar.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set prog ${name}-sdk_r${version}-macosx.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://developer.${name}.com/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://dl.google.com/${name}:prog \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports:${name}:appbundles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${prog}:prog \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${appbundles}:appbundles \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${tools}:appbundles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}-sdk-macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${name}-sdk-macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.only ${appbundles} ${tools}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${prog} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 fe64ec74a943572da9cfa4a90243461d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 7119841e5fcadd8ef2b75c1fe419c4cbc9a97336 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 801b01eb49c04ca43507b2c5f2f7baac598db50f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${appbundles} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 d363cae627e4922da942a1c115965eca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 54468931ffa347540d8627a0addb54c844e2c9de \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 623f21017f6d04c2a425f9e691fa138ad5ad2b7a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${tools} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 46e2caebec7ca9e25f97a924d09fb982 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 2c9c56246ed15ae82c90ff5da1f1a9c531b6189a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2dfbe666c93d701dab56728ad4eeaff0654ce608
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.keepdirs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/java/${worksrcdir}/add-ons \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/java/${worksrcdir}/docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/java/${worksrcdir}/platforms \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/java/${worksrcdir}/samples \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set appbundles ${name}-appbundles-r${patchversion}.tar.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set tools ${name}-tools-r${patchversion}.tar.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set prog ${name}-sdk_r${version}-macosx.zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://developer.${name}.com/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://dl.google.com/${name}:prog \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports:${name}:appbundles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${prog}:prog \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${appbundles}:appbundles \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${tools}:appbundles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-sdk-macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${name}-sdk-macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.only ${appbundles} ${tools}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${prog} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 fe64ec74a943572da9cfa4a90243461d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 7119841e5fcadd8ef2b75c1fe419c4cbc9a97336 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 801b01eb49c04ca43507b2c5f2f7baac598db50f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${appbundles} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 d363cae627e4922da942a1c115965eca \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 54468931ffa347540d8627a0addb54c844e2c9de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 623f21017f6d04c2a425f9e691fa138ad5ad2b7a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${tools} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 46e2caebec7ca9e25f97a924d09fb982 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 2c9c56246ed15ae82c90ff5da1f1a9c531b6189a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2dfbe666c93d701dab56728ad4eeaff0654ce608
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.keepdirs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/java/${worksrcdir}/add-ons \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/java/${worksrcdir}/docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/java/${worksrcdir}/platforms \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/java/${worksrcdir}/samples \
</span> ${destroot}${prefix}/share/java/${worksrcdir}/temp
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "unzip -q ${distpath}/${prog} -d ${workpath}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "unzip -q ${distpath}/${prog} -d ${workpath}"
</span> }
destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,46 +67,46 @@ destroot {
</span> xinstall -m 770 -d ${destroot}${prefix}/share/java/${distname}/temp
system "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- chgrp -R _developer ${destroot}${prefix}/share/java/${distname};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod -R g+w ${destroot}${prefix}/share/java/${distname};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chgrp -R _developer ${destroot}${prefix}/share/java/${distname};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod -R g+w ${destroot}${prefix}/share/java/${distname};
</span> "
ui_info "####################################################################"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "# add-ons, docs, platforms, samples and temp have been made #"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "# group _developer writable. You need to be member of the #"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "# _developer group to use the android tools. If you are not use: #"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "# #"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "# add-ons, docs, platforms, samples and temp have been made #"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "# group _developer writable. You need to be member of the #"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "# _developer group to use the android tools. If you are not use: #"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "# #"
</span> ui_info "# sudo dscl . append /Groups/_developer GroupMembership <username> #"
ui_info "####################################################################"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "# you need to download the actual SDKs. Because of the licence #"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "# querys this can not be done automaticaly. Use: #"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "# #"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "# @PREFIX@/share/java/android-sdk-macosx/tools/android update sdk #"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "# you need to download the actual SDKs. Because of the licence #"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "# querys this can not be done automaticaly. Use: #"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "# #"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "# @PREFIX@/share/java/android-sdk-macosx/tools/android update sdk #"
</span> ui_info "####################################################################"
}
platform macosx {
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${applications_dir}/Developer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${applications_dir}/Developer
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "touch ${destroot}${applications_dir}/Developer/.localized"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "touch ${destroot}${applications_dir}/Developer/.localized"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/tools-r${patchversion}/zipalign \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/java/android-sdk-macosx/tools/zipalign
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/tools-r${patchversion}/zipalign \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/java/android-sdk-macosx/tools/zipalign
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach comp { Android-DDMS Android-Draw9Patch Android-Emulator Android-Hierarchyviewer Android-Manager Android-Monitor} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/appbundles-r${patchversion}/${comp}.app \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/Developer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|@PREFIX@|${prefix}|g \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/Developer/${comp}.app/Contents/MacOS/Start.command
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach comp { Android-DDMS Android-Draw9Patch Android-Emulator Android-Hierarchyviewer Android-Manager Android-Monitor} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/appbundles-r${patchversion}/${comp}.app \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${applications_dir}/Developer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s|@PREFIX@|${prefix}|g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${applications_dir}/Developer/${comp}.app/Contents/MacOS/Start.command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
#
# post-install {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# system "( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | }${prefix}/share/java/android-sdk-macosx/tools/android update sdk --no-ui"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# system "( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | }${prefix}/share/java/android-sdk-macosx/tools/android update sdk --no-ui"
</span> # }
livecheck.type regex
</pre><pre style='margin:0'>
</pre>