lang/gnatdroid-armv(5,7): Use lang/gcc-aux as base, not lang/gnat-aux

After a few additional patches for gcc-aux, gnatdroid-armv5 (and -armv7)
build and execute well when built and based on gcc 4.7-based gcc-aux.
The previous version was based on gcc 4.6-based gnat-aux.  This was the
final port requiring gnat-aux, and now its part of the Ada framework.

Running acats using an ASUS Transformer XF101 (Android 4.0.3) as a target
results in a nearly perfect result.  Only test cb1010a fails, which is
a failure to detect running out of stack space (-fstack-check).  I intend
to investigate further, but as the only problem, gnatdroid remains a
highly capable compiler despite the small regression.  Potentially
zero-cost exceptions were gained as a trade-off.

3 files changed, 12 insertions, 26 deletions

diff --git a/lang/gnatdroid-armv7/Makefile b/lang/gnatdroid-armv7/Makefile
index d71cf5665817..435952e0e27c 100644
--- a/lang/gnatdroid-armv7/Makefile
+++ b/lang/gnatdroid-armv7/Makefile
@@ -3,15 +3,12 @@
 
 PORTNAME=	armv7
 PORTVERSION=	${SNAPSHOT}
-PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	releases/gcc-${GCC_VERSION}
 PKGNAMEPREFIX=	gnatdroid-
 DISTNAME=	arm-gnat-${PORTVERSION}
-DISTFILES=	gcc-core-${GCC_VERSION}.tar.bz2 \
-		gcc-ada-${GCC_VERSION}.tar.bz2 \
-		gcc-testsuite-${GCC_VERSION}.tar.bz2
+DISTFILES=	gcc-${GCC_VERSION}.tar.bz2
 
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	C/Ada cross-compiler, target: Android ARMv7
@@ -19,18 +16,22 @@ COMMENT=	C/Ada cross-compiler, target: Android ARMv7
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \
-		gnatdroid-binutils>=2.21:${PORTSDIR}/lang/gnatdroid-binutils \
-		gnat-aux>=20110325:${PORTSDIR}/lang/gnat-aux
-RUN_DEPENDS:=	gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \
 		gnatdroid-binutils>=2.21:${PORTSDIR}/lang/gnatdroid-binutils
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_LICENSES_INSTALL= yes
 
-.include "${.CURDIR}/../gnat-aux/Makefile.common"
+.include "${.CURDIR}/../gcc-aux/Makefile.common"
 
+# DELETE NEXT LINE AFTER NEXT UPDATE TO GCC-AUX 4.7 TO AVOID PORTEPOCH
+# Without it, this port version regresses by a day
+SNAPSHOT:=	20130413 	# last portversion + 1
+
+USES+=		ada gmake
 LANGS=		c ada
 APPLY_DIFFS=	core ada ada-testsuite gcc-testsuite
 NO_MTREE=	YES
+DISTINFO_FILE=	${.CURDIR}/../gcc-aux/distinfo
 
 # Disable C++ until arm.cc/no-rtti issue resolved for libsupc++
 
@@ -47,12 +48,11 @@ ARMVERSION=		ARMv7
 FPU=			neon
 WRKSRC=			${WRKDIR}/gcc-${GCC_VERSION}
 BUILD_WRKSRC=		${WRKDIR}/build
-PATCHDIR=		${.CURDIR}/../gnat-aux/files
+PATCHDIR=		${.CURDIR}/../gcc-aux/files
 CFG_SCRIPT=		${WRKSRC}/configure
 REVFILE=		${WRKSRC}/gcc/REVISION
 SRPREFIX=		${LOCALBASE}/android9
 PREFIX=			${SRPREFIX}/${ARMVERSION}
-FULL_GNATGCC=		${LOCALBASE}/bin/gnatgcc
 INSTALLDIRS=		lib libexec share
 INSTALLDIRS+=		${DROID_TARGET}/lib
 PLIST_SUB+=		TARGET="${DROID_TARGET}"
@@ -60,7 +60,6 @@ PLIST_SUB+=		GCCVERS="${GCC_VERSION}"
 SUB_FILES=		pkg-message
 SUB_LIST=		TARGET="${DROID_TARGET}"
 
-ADA_CONFIGURE_ENV=	CC=${FULL_GNATGCC}
 ALL_TARGET=		all
 
 .include <bsd.port.pre.mk>
@@ -78,7 +77,6 @@ OS_LABEL4VERS=	"[${OPSYS}32 x Android ${ARMVERSION}]"
 .if ${PORT_OPTIONS:MCXX}
 LANGS+=		c++
 APPLY_DIFFS+=	cxx cxx-testsuite
-DISTFILES+=	gcc-g++-${GCC_VERSION}.tar.bz2
 INSTALLDIRS+=	include/c++/${GCC_VERSION}
 .endif
 
@@ -89,7 +87,6 @@ INSTALLDIRS+=	include/c++/${GCC_VERSION}
 .if ${PORT_OPTIONS:MFORT}
 LANGS+=		fortran
 APPLY_DIFFS+=	fortran
-DISTFILES+=	gcc-fortran-${GCC_VERSION}.tar.bz2
 .endif
 
 ###################
@@ -98,7 +95,6 @@ DISTFILES+=	gcc-fortran-${GCC_VERSION}.tar.bz2
 
 .if ${PORT_OPTIONS:MOBJC}
 LANGS+=		objc
-DISTFILES+=	gcc-objc-${GCC_VERSION}.tar.bz2
 .endif
 
 CONFIGURE_ARGS=		--enable-languages=${LANGS:Q}
@@ -144,7 +140,7 @@ post-extract:
 
 do-configure:
 	${MKDIR} ${BUILD_WRKSRC}
-	cd ${BUILD_WRKSRC} && ${SETENV} ${ADA_CONFIGURE_ENV} \
+	cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 	${CFG_SCRIPT} ${CONFIGURE_ARGS}
 
 pre-install:
diff --git a/lang/gnatdroid-armv7/distinfo b/lang/gnatdroid-armv7/distinfo
deleted file mode 100644
index 98afe87394ed..000000000000
--- a/lang/gnatdroid-armv7/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-SHA256 (gcc-core-4.6.4.tar.bz2) = 48b566f1288f099dff8fba868499a320f83586245ec69b8c82a9042566a5bf62
-SIZE (gcc-core-4.6.4.tar.bz2) = 30353380
-SHA256 (gcc-ada-4.6.4.tar.bz2) = 2a09bbf942b2557839722d4807e67559123037356f5cb1a3b12f44539968d0ad
-SIZE (gcc-ada-4.6.4.tar.bz2) = 6084085
-SHA256 (gcc-testsuite-4.6.4.tar.bz2) = bfa9a5188dde3332df3eaf1ab0bc2bec11aa5e02146a445c23547c8fbe8d895b
-SIZE (gcc-testsuite-4.6.4.tar.bz2) = 6388458
-SHA256 (gcc-fortran-4.6.4.tar.bz2) = 4f402e0d27995a02354570f0a63047f27463c72c62f1ba3c08ef5a7c6c9c3d1c
-SIZE (gcc-fortran-4.6.4.tar.bz2) = 1679632
-SHA256 (gcc-objc-4.6.4.tar.bz2) = f1f399fedc52d70d91e13211f0ccff56b7183f429d248010a5d7b43fa9bada3d
-SIZE (gcc-objc-4.6.4.tar.bz2) = 346591
diff --git a/lang/gnatdroid-armv7/pkg-descr b/lang/gnatdroid-armv7/pkg-descr
index f50fe26eac05..70f0fcdbc35b 100644
--- a/lang/gnatdroid-armv7/pkg-descr
+++ b/lang/gnatdroid-armv7/pkg-descr
@@ -1,4 +1,4 @@
-The gnatdroid-armv7 port builds a C/Ada cross-compiler based on GCC 4.6 that
+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
 ARM architecture (version 7).  This produces binaries that run natively on
 Android devices built with Cortex-A series chips.