lang/gnatcross-*aarch64: bump base version of FreeBSD from 11.0 to 11.3

- Unexpire lang/gnatcross-aarch64, it builds again on 11.3-amd64
- Clean up lang/gnatcross-sysroot-aarch64

Differential Revision:	https://reviews.freebsd.org/D21974 (part)

5 files changed, 17 insertions, 23 deletions

diff --git a/lang/gnatcross-aarch64/Makefile b/lang/gnatcross-aarch64/Makefile
index c3b6c9e19795..94f4f105c339 100644
--- a/lang/gnatcross-aarch64/Makefile
+++ b/lang/gnatcross-aarch64/Makefile
@@ -8,12 +8,8 @@ PKGNAMEPREFIX=	gnatcross-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C/Ada cross-compiler, target: ${LABEL_TARGET}
 
-BROKEN=		unfetchable
-DEPRECATED=	Unfetchable, unmaintained
-EXPIRATION_DATE=	2019-10-16
-
 LABEL_TARGET=	FreeBSD/ARM64
-DROID_TARGET=	aarch64-aux-freebsd11.0
+DROID_TARGET=	aarch64-aux-freebsd11.3
 ARG_ARCH=	# don't specify
 ARG_FPU=	# don't specify
 ARG_FLOATSOFT=	# don't specify
diff --git a/lang/gnatcross-binutils-aarch64/Makefile b/lang/gnatcross-binutils-aarch64/Makefile
index 92f22c7f2e9b..8df9279e29fb 100644
--- a/lang/gnatcross-binutils-aarch64/Makefile
+++ b/lang/gnatcross-binutils-aarch64/Makefile
@@ -1,7 +1,7 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMEPREFIX=	gnatcross-
 PKGNAMESUFFIX=	-aarch64
 
@@ -9,7 +9,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Infrastructure for C/Ada FreeBSD cross-compiler (aarch64)
 
 BRANCH2=	# Assume aarch64 will always be only CPU for FreeBSD/ARM64
-XCCTARGET=	aarch64-aux-freebsd11.0
+XCCTARGET=	aarch64-aux-freebsd11.3
 PREFIX=		${LOCALBASE}/FreeBSD_ARM64
 SRPREFIX=	${PREFIX}/sysroot
 SYSROOT=	gnatcross-sysroot-aarch64
diff --git a/lang/gnatcross-sysroot-aarch64/Makefile b/lang/gnatcross-sysroot-aarch64/Makefile
index 9ee0564f4b2d..a028b10c157c 100644
--- a/lang/gnatcross-sysroot-aarch64/Makefile
+++ b/lang/gnatcross-sysroot-aarch64/Makefile
@@ -3,32 +3,30 @@
 
 PORTNAME=	sysroot
 PORTVERSION=	1
+PORTREVISION=	1
 CATEGORIES=	lang
-MASTER_SITES=	${PUB_FREEBSD}/releases/arm64/aarch64/11.0-RELEASE/:R11
+MASTER_SITES=	${PUB_FREEBSD}/releases/arm64/aarch64/11.3-RELEASE/
 PKGNAMEPREFIX=	gnatcross-
 PKGNAMESUFFIX=	-aarch64
-DIST_SUBDIR=	gnatcross/arm64-aarch64/${RELEASE}
+DISTNAME=	base
+DIST_SUBDIR=	gnatcross/arm64-aarch64/R11_3
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FreeBSD sysroots for C/Ada cross-compiler (${ARCH})
 
+# avoid aarch64 x aarch64
+ONLY_FOR_ARCHS=		amd64 i386
+
+USES=		tar:txz
+
 NO_BUILD=	yes
 NO_MTREE=	yes
 
 PUB_FREEBSD=	ftp://ftp.freebsd.org/pub/FreeBSD
 PREFIX=		${LOCALBASE}/FreeBSD_ARM64
 
-ONLY_FOR_ARCHS=		i386 amd64	# avoid aarch64 x aarch64
 EXTRACT_AFTER_ARGS=	lib/ usr/include/ usr/lib/
 
-OPTIONS_SINGLE=		SG1
-OPTIONS_SINGLE_SG1=	RELEASE_11_0
-OPTIONS_DEFAULT=	RELEASE_11_0
-
-RELEASE_11_0_DESC=	FreeBSD 11.0 Release
-RELEASE_11_0_DISTFILES=	base.txz:R11
-RELEASE_11_0_VARS=	RELEASE=R11_0 CTARGET=aarch64-aux-freebsd11.0
-
 post-extract:
 	/bin/chflags -R noschg ${WRKDIR}
 
@@ -36,7 +34,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/sysroot
 	@${MV} ${WRKDIR}/lib ${STAGEDIR}${PREFIX}/sysroot
 	@${MV} ${WRKDIR}/usr ${STAGEDIR}${PREFIX}/sysroot
-	@echo ${CTARGET} > ${STAGEDIR}${PREFIX}/sysroot/target_triplet
+	@${ECHO_CMD} aarch64-aux-freebsd11.3 > ${STAGEDIR}${PREFIX}/sysroot/target_triplet
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} sysroot -type d -empty -delete)
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} sysroot \( -type f -or -type l \) \
 		| ${SORT} >> ${TMPPLIST})
diff --git a/lang/gnatcross-sysroot-aarch64/distinfo b/lang/gnatcross-sysroot-aarch64/distinfo
index 9af54e2a4d1f..36a9a7d3839a 100644
--- a/lang/gnatcross-sysroot-aarch64/distinfo
+++ b/lang/gnatcross-sysroot-aarch64/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486033400
-SHA256 (gnatcross/arm64-aarch64/R11_0/base.txz) = 16e9d744c39ef8ead3584815071a9086db10e71ef93e0108d5f490fe103b4bba
-SIZE (gnatcross/arm64-aarch64/R11_0/base.txz) = 78856068
+TIMESTAMP = 1570735680
+SHA256 (gnatcross/arm64-aarch64/R11_3/base.txz) = 0c1ee2bdbec3b6b404edef6858f38f5cdacd727abc53b1dee23910cab939d0c1
+SIZE (gnatcross/arm64-aarch64/R11_3/base.txz) = 97990888
diff --git a/lang/gnatcross-sysroot-aarch64/pkg-descr b/lang/gnatcross-sysroot-aarch64/pkg-descr
index 94676c392f3a..46aba744371b 100644
--- a/lang/gnatcross-sysroot-aarch64/pkg-descr
+++ b/lang/gnatcross-sysroot-aarch64/pkg-descr
@@ -1,4 +1,4 @@
 This package is used by the lang/gnatcross-aarch64 Ada cross-compiler to
-install the system root of FreeBSD ARM64 (aarch64).  
+install the system root of FreeBSD ARM64 (aarch64).
 
 WWW: http://www.dragonlace.net