Rebase gnatdroid to gcc6-aux (6.0), add support for MARSHMELLOW

The gnatdroid cross-compilers (*BSD => Android) were the last two users
of gcc-aux (gcc 4.9 Ada compiler).  They are now based on gcc6-aux.

The Android NDK release 11 just came out with support for Android API 23
(Marshmellow) so now gnatdroid supports it.  I removed API 8 and 9
(Froyo and Gingerbread) from gnatdroid-armv7.  Froyo currently is installed
on less than 0.1% of Android devices, and Gingerbread is dropping under 2%
soon.  Many sysroot distfiles were re-rolled to gain required headers, so
a distfiles subdirectory was added as well.

3 files changed, 24 insertions, 28 deletions

diff --git a/lang/gnatdroid-sysroot/Makefile b/lang/gnatdroid-sysroot/Makefile
index d173a4688adb..5a5e1ba7a031 100644
--- a/lang/gnatdroid-sysroot/Makefile
+++ b/lang/gnatdroid-sysroot/Makefile
@@ -2,11 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	sysroot
-PORTVERSION=	21
+PORTVERSION=	23
 CATEGORIES=	lang
-MASTER_SITES=	http://downloads.dragonlace.net/src/
+MASTER_SITES=	http://downloads.dragonlace.net/src/gnatdroid/
 PKGNAMEPREFIX=	gnatdroid-
 DISTNAME=	android-${API}-arm
+DIST_SUBDIR=	gnatdroid-ndk11
 
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Android sysroots for C/Ada Android cross-compiler
@@ -23,26 +24,20 @@ STAT_PATCH=	${FILESDIR}/extra-stat.h
 EXTRA_PATCHES=	${STAT_PATCH}
 
 OPTIONS_SINGLE=		SG1
-OPTIONS_SINGLE_SG1=	FROYO GBREAD ICS JBEAN16 JBEAN17 JBEAN18 KITKAT \
-			LOLLIPOP
+OPTIONS_SINGLE_SG1=	ICS JBEAN16 JBEAN17 JBEAN18 KITKAT LOLLIPOP MARSH
 OPTIONS_DEFAULT=	KITKAT
 
-FROYO_DESC=	Android 2.2 - API level 08 - Froyo
-GBREAD_DESC=	Android 2.3 - API level 09 - Gingerbread 1
 ICS_DESC=	Android 4.0 - API level 15 - Ice Cream Sandwich 2
 JBEAN16_DESC=	Android 4.1 - API level 16 - Jelly Bean 1
 JBEAN17_DESC=	Android 4.2 - API level 17 - Jelly Bean 2
 JBEAN18_DESC=	Android 4.3 - API level 18 - Jelly Bean 3
 KITKAT_DESC=	Android 4.4 - API level 19 - Kitkat
 LOLLIPOP_DESC=	Android 5.0 - API level 21 - Lollipop
+MARSH_DESC=	Android 6.0 - API Level 23 - Marshmellow
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MFROYO}
-API=	8
-.elif ${PORT_OPTIONS:MGBREAD}
-API=	9
-.elif ${PORT_OPTIONS:MICS}
+.if ${PORT_OPTIONS:MICS}
 API=	15
 .elif ${PORT_OPTIONS:MJBEAN16}
 API=	16
@@ -55,6 +50,9 @@ API=	19
 .elif ${PORT_OPTIONS:MLOLLIPOP}
 API=	21
 STAT_PATCH=	${FILESDIR}/extra-21-stat.h
+.elif ${PORT_OPTIONS:MMARSH}
+API=	23
+STAT_PATCH=	${FILESDIR}/extra-21-stat.h
 .else
 IGNORE=	the API option is improperly selected
 .endif
diff --git a/lang/gnatdroid-sysroot/distinfo b/lang/gnatdroid-sysroot/distinfo
index ad12135e8eda..2b7785edf2f2 100644
--- a/lang/gnatdroid-sysroot/distinfo
+++ b/lang/gnatdroid-sysroot/distinfo
@@ -1,16 +1,14 @@
-SHA256 (android-8-arm.tar.bz2) = d352ecf413c7bf12561d3f5766e94be5e9da3232b3aa5a48c2186e41fdc0c549
-SIZE (android-8-arm.tar.bz2) = 1646555
-SHA256 (android-9-arm.tar.bz2) = 682cee5219f171a8bf4d0b35a33bc00d265a8c5a0b1d81ddd04389b402783190
-SIZE (android-9-arm.tar.bz2) = 1924233
-SHA256 (android-15-arm.tar.bz2) = 67836bdc1e5e2bd0db796e8e32f9faf5705f42b48b610fe479e0d92ff42280c2
-SIZE (android-15-arm.tar.bz2) = 1717174
-SHA256 (android-16-arm.tar.bz2) = a6966779c31663f60fddc2fab86287be74c06c376e8ffb3704e2b5c53a612dc9
-SIZE (android-16-arm.tar.bz2) = 1716973
-SHA256 (android-17-arm.tar.bz2) = 3ff8d76ba9f5f0aa129e7c69a5da2ec63696f553d5ad14d0859f51e7a38f992a
-SIZE (android-17-arm.tar.bz2) = 1716909
-SHA256 (android-18-arm.tar.bz2) = 73ceb5894c4436ca1477e0a535c3a014f334acf0683ab43bd22565f6c8ec6920
-SIZE (android-18-arm.tar.bz2) = 1736810
-SHA256 (android-19-arm.tar.bz2) = 734b37fa2c3aff05540ce9d8c73d0ad92623b281f0e267a05fd2f0c3a86e08ea
-SIZE (android-19-arm.tar.bz2) = 4621476
-SHA256 (android-21-arm.tar.bz2) = 7729bcd05fdc10b930d1f99920ed756681fe8cd6c2ecddb002a56e4badcfd2a3
-SIZE (android-21-arm.tar.bz2) = 5920624
+SHA256 (gnatdroid-ndk11/android-15-arm.tar.bz2) = 188711876e49285f6c06a54b12e4b1c1da21f059062ed6721453998c9b2bcd22
+SIZE (gnatdroid-ndk11/android-15-arm.tar.bz2) = 1724251
+SHA256 (gnatdroid-ndk11/android-16-arm.tar.bz2) = 3ecee83a807a474ff77943684caf14dcec8667608c03ed0e102ca05751a390f0
+SIZE (gnatdroid-ndk11/android-16-arm.tar.bz2) = 1723800
+SHA256 (gnatdroid-ndk11/android-17-arm.tar.bz2) = 88e7001a9489ae16098ad971188047bbceda9f5a7c8a5305433d3420c873df88
+SIZE (gnatdroid-ndk11/android-17-arm.tar.bz2) = 1724127
+SHA256 (gnatdroid-ndk11/android-18-arm.tar.bz2) = c91a5927e307ee5fdadcd38be2ecc599fa53e4a5eb4e7314ac0730b805143d0a
+SIZE (gnatdroid-ndk11/android-18-arm.tar.bz2) = 1736762
+SHA256 (gnatdroid-ndk11/android-19-arm.tar.bz2) = 51f94fc2a0de0c34f145cca1394ad0201ffd82aab93f9d3986b24120d739d408
+SIZE (gnatdroid-ndk11/android-19-arm.tar.bz2) = 4611404
+SHA256 (gnatdroid-ndk11/android-21-arm.tar.bz2) = 7729bcd05fdc10b930d1f99920ed756681fe8cd6c2ecddb002a56e4badcfd2a3
+SIZE (gnatdroid-ndk11/android-21-arm.tar.bz2) = 5920624
+SHA256 (gnatdroid-ndk11/android-23-arm.tar.bz2) = 64699a1193223bba3fce28130aa064937a237c8a695041cc4637b48e29cdd75e
+SIZE (gnatdroid-ndk11/android-23-arm.tar.bz2) = 3326272
diff --git a/lang/gnatdroid-sysroot/pkg-descr b/lang/gnatdroid-sysroot/pkg-descr
index 5a77c5327b74..61554cd021f8 100644
--- a/lang/gnatdroid-sysroot/pkg-descr
+++ b/lang/gnatdroid-sysroot/pkg-descr
@@ -1,5 +1,5 @@
 This package is used by lang/gnatdroid to install the system root of
-Android 2.2 to 5.0 (API Level 8 to API Level 21) of the ARM architecture.
+Android 4.0 to 6.0 (API Level 15 to API Level 23) of the ARM architecture.
 The ARM cross-tools are built using these files, which in turn is required
 for the GNAT FreeBSD->ARM cross-compiler that is gnatdroid.