lang/gnatdroid-*: Update sysroot to Android API level 9 -> level 19

This is the first of two steps to update the gnatdroid ARM cross-
compilers.  The sysroot was 10 versions behind the current API level
of 19.  The latest API level drops ARMv5 support, but the API is
backwards compatible, so if applications restrict themselves to
level 18 features, then ARMv5 should still be usable.

The next step is to base the cross compilers on GCC 4.9 instead of the
GCC 4.7-based gcc47-aux port.

4 files changed, 14 insertions, 20 deletions

diff --git a/lang/gnatdroid-armv7/Makefile b/lang/gnatdroid-armv7/Makefile
index 91867c9bcb60..756a842a26fa 100644
--- a/lang/gnatdroid-armv7/Makefile
+++ b/lang/gnatdroid-armv7/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	armv7
 PORTVERSION=	${SNAPSHOT}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	releases/gcc-${GCC_VERSION}
@@ -17,7 +17,7 @@ COMMENT=	C/Ada cross-compiler, target: Android ARMv7
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \
+BUILD_DEPENDS=	gnatdroid-sysroot=19:${PORTSDIR}/lang/gnatdroid-sysroot \
 		gnatdroid-binutils>=2.21:${PORTSDIR}/lang/gnatdroid-binutils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
@@ -53,7 +53,7 @@ BUILD_WRKSRC=		${WRKDIR}/build
 PATCHDIR=		${.CURDIR}/../gcc47-aux/files
 CFG_SCRIPT=		${WRKSRC}/configure
 REVFILE=		${WRKSRC}/gcc/REVISION
-SRPREFIX=		${LOCALBASE}/android9
+SRPREFIX=		${LOCALBASE}/android19
 PREFIX=			${SRPREFIX}/${ARMVERSION}
 INSTALLDIRS=		lib libexec share
 INSTALLDIRS+=		${DROID_TARGET}/lib
@@ -154,20 +154,10 @@ pre-install:
 #	Manually rename products so it doesn't rebuild them with new name
 .for X in ${CROSS}
 	${CP} -a ${BUILD_WRKSRC}/gcc/${X}-cross ${BUILD_WRKSRC}/gcc/${X}
-.endfor	
+.endfor
 
 do-install:
 	cd ${BUILD_WRKSRC} && ${GMAKE} install-strip DESTDIR=${STAGEDIR}
-	${MV} ${STAGEDIR}${PREFIX}/bin/${DROID_TARGET}-gcc \
-	   ${STAGEDIR}${PREFIX}/bin/${DROID_TARGET}-gnatgcc
-	${MV} ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin/gcc \
-	   ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin/gnatgcc
-.if ${PORT_OPTIONS:MFORT}
-	${MV} ${STAGEDIR}${PREFIX}/bin/${DROID_TARGET}-gfortran \
-	   ${STAGEDIR}${PREFIX}/bin/${DROID_TARGET}-gnatgfortran
-	${MV} ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin/gfortran \
-	   ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin/gnatgfortran
-.endif
 
 post-install:
 .for d in ${INSTALLDIRS}
diff --git a/lang/gnatdroid-armv7/files/pkg-message.in b/lang/gnatdroid-armv7/files/pkg-message.in
index 1687fec3d7d4..d11ea339b8c8 100644
--- a/lang/gnatdroid-armv7/files/pkg-message.in
+++ b/lang/gnatdroid-armv7/files/pkg-message.in
@@ -1,4 +1,4 @@
   Add to path: %%PREFIX%%/bin
   All binaries have prefix of %%TARGET%%-
-  e.g. %%TARGET%%-gnatgcc
+  e.g. %%TARGET%%-gcc
        %%TARGET%%-gnatmake
diff --git a/lang/gnatdroid-armv7/pkg-descr b/lang/gnatdroid-armv7/pkg-descr
index 70f0fcdbc35b..0d702cebad4d 100644
--- a/lang/gnatdroid-armv7/pkg-descr
+++ b/lang/gnatdroid-armv7/pkg-descr
@@ -1,5 +1,5 @@
 The gnatdroid-armv7 port builds a C/Ada cross-compiler based on GCC 4.7 that
-targets the Android operating system (version 2.3, API level 9) running on
+targets the Android operating system (version 4.4, API level 19) running on
 ARM architecture (version 7).  This produces binaries that run natively on
 Android devices built with Cortex-A series chips.
 
diff --git a/lang/gnatdroid-armv7/pkg-plist b/lang/gnatdroid-armv7/pkg-plist
index 4179a1122b7a..412273ab0cf7 100644
--- a/lang/gnatdroid-armv7/pkg-plist
+++ b/lang/gnatdroid-armv7/pkg-plist
@@ -1,13 +1,17 @@
+bin/ada
 bin/%%TARGET%%-cpp
 bin/%%TARGET%%-gcc-%%GCCVERS%%
 bin/%%TARGET%%-gcov
+bin/%%TARGET%%-gcc
+bin/%%TARGET%%-gcc-ar
+bin/%%TARGET%%-gcc-nm
+bin/%%TARGET%%-gcc-ranlib
+%%FORT%%bin/%%TARGET%%-gfortran
 bin/%%TARGET%%-gnat
 bin/%%TARGET%%-gnatbind
 bin/%%TARGET%%-gnatchop
 bin/%%TARGET%%-gnatclean
 bin/%%TARGET%%-gnatfind
-bin/%%TARGET%%-gnatgcc
-%%FORT%%bin/%%TARGET%%-gnatgfortran
 bin/%%TARGET%%-gnatkr
 bin/%%TARGET%%-gnatlink
 bin/%%TARGET%%-gnatls
@@ -15,11 +19,11 @@ bin/%%TARGET%%-gnatmake
 bin/%%TARGET%%-gnatname
 bin/%%TARGET%%-gnatprep
 bin/%%TARGET%%-gnatxref
+%%TARGET%%/bin/gcc
+%%FORT%%%%TARGET%%/bin/gfortran
 %%TARGET%%/bin/gnat
 %%TARGET%%/bin/gnatbind
 %%TARGET%%/bin/gnatchop
-%%TARGET%%/bin/gnatgcc
-%%FORT%%%%TARGET%%/bin/gnatgfortran
 %%TARGET%%/bin/gnatkr
 %%TARGET%%/bin/gnatlink
 %%TARGET%%/bin/gnatls