Index: head/Mk/Uses/ada.mk =================================================================== --- head/Mk/Uses/ada.mk (revision 413031) +++ head/Mk/Uses/ada.mk (revision 413032) @@ -1,41 +1,43 @@ # $FreeBSD$ # # Establish Ada-capable compiler as a build dependency # To change default compiler, define ADA_DEFAULT in make.conf to 5 # Note that gcc47-aux is being removed soon, so 47 is not a legal default # # Feature: ada # Usage: USES=ada # Valid ARGS: 49, 5, 6, run # # MAINTAINER: marino@FreeBSD.org .if !defined(_INCLUDE_USES_ADA_MK) _INCLUDE_USES_ADA_MK= yes CC= ada ADAXX= gcc5 # framework default . if ${ada_ARGS:M49} ADAXX= gcc +. elif ${ada_ARGS:M5} +ADAXX= gcc5 . elif ${ada_ARGS:M6} ADAXX= gcc6 . elif defined(ADA_DEFAULT) . if ${ADA_DEFAULT} == 49 ADAXX= gcc . elif ${ADA_DEFAULT} == 6 ADAXX= gcc6 . endif . endif . if ${ada_ARGS:Mrun} RUN_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada:lang/${ADAXX}-aux . endif BUILD_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada:lang/${ADAXX}-aux MAKE_ENV+= PATH=${LOCALBASE}/${ADAXX}-aux/bin:${PATH} \ ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat CONFIGURE_ENV+= PATH=${LOCALBASE}/${ADAXX}-aux/bin:${PATH} \ ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat .endif Index: head/devel/libspark2012/Makefile =================================================================== --- head/devel/libspark2012/Makefile (revision 413031) +++ head/devel/libspark2012/Makefile (revision 413032) @@ -1,17 +1,17 @@ # Created by: John Marino # $FreeBSD$ PORTNAME= libspark2012 PORTVERSION= 2012 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://downloads.dragonlace.net/src/ MAINTAINER= marino@FreeBSD.org COMMENT= SPARK 2012 Spark.Ada library LICENSE= GPLv3 -USES= ada tar:bzip2 +USES= ada:5 tar:bzip2 .include Index: head/dns/ironsides/Makefile =================================================================== --- head/dns/ironsides/Makefile (revision 413031) +++ head/dns/ironsides/Makefile (revision 413032) @@ -1,30 +1,30 @@ # Created by: John Marino # $FreeBSD$ PORTNAME= ironsides PORTVERSION= ${SNAPSHOT:S/_//g} CATEGORIES= dns MASTER_SITES= http://ironsides.martincarlisle.com/ DISTNAME= ironsides_authoritative-${SNAPSHOT} MAINTAINER= marino@FreeBSD.org COMMENT= Authoritative DNS server formally verified by SPARK/Ada LICENSE= Ironsides LICENSE_NAME= IRONSIDES - Free software, unlimited redistribution LICENSE_FILE= ${WRKSRC}/COPYRIGHT.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= ${LOCALBASE}/include/spark2012/spark.ads:devel/libspark2012 -USES= ada dos2unix zip +USES= ada:5 dos2unix zip DOS2UNIX_FILES= dfcs.usafa.edu.zonefile ironsides.1 SNAPSHOT= 2015_04_15 WRKSRC= ${WRKDIR}/${DISTFILES:S/.zip//} PLIST_FILES= sbin/ironsides man/man1/ironsides.1.gz PORTEXAMPLES= dfcs.usafa.edu.zonefile post-extract: @${CP} ${FILESDIR}/ironsides.gpr ${FILESDIR}/Makefile ${WRKSRC}/ .include