6 files changed, 22 insertions, 85 deletions

diff --git a/audio/asterisk-espeak/Makefile b/audio/asterisk-espeak/Makefile
index 71de9d7eff94..073db67e26b8 100644
--- a/audio/asterisk-espeak/Makefile
+++ b/audio/asterisk-espeak/Makefile
@@ -12,6 +12,8 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libespeak.so:audio/espeak \
 		libsamplerate.so:audio/libsamplerate
+BUILD_DEPENDS=	asterisk:net/asterisk13
+RUN_DEPENDS=	asterisk:net/asterisk13
 
 USES=		compiler gmake localbase
 INSTALL_TARGET=	install samples
@@ -20,19 +22,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	zaf
 GH_PROJECT=	Asterisk-eSpeak
 
-OPTIONS_SINGLE=		ASTVER
-OPTIONS_SINGLE_ASTVER=	ASTERISK11 ASTERISK13
-OPTIONS_DEFAULT=	ASTERISK13
-
-ASTERISK11_DESC=	Depend on Asterisk 11
-ASTERISK13_DESC=	Depend on Asterisk 13
-
-ASTERISK11_BUILD_DEPENDS=	asterisk:net/asterisk11
-ASTERISK11_RUN_DEPENDS=		asterisk:net/asterisk11
-
-ASTERISK13_BUILD_DEPENDS=	asterisk:net/asterisk13
-ASTERISK13_RUN_DEPENDS=		asterisk:net/asterisk13
-
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
diff --git a/audio/asterisk-flite/Makefile b/audio/asterisk-flite/Makefile
index ad140ea2f58f..7e1f4e62ee52 100644
--- a/audio/asterisk-flite/Makefile
+++ b/audio/asterisk-flite/Makefile
@@ -11,6 +11,8 @@ COMMENT=	Flite dialplan application for Asterisk
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libflite.so:audio/flite
+BUILD_DEPENDS=	asterisk:net/asterisk13
+RUN_DEPENDS=	asterisk:net/asterisk13
 
 USES=		compiler gmake localbase
 INSTALL_TARGET=	install samples
@@ -19,19 +21,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	zaf
 GH_PROJECT=	Asterisk-Flite
 
-OPTIONS_SINGLE=	ASTVER
-OPTIONS_SINGLE_ASTVER=	ASTERISK11 ASTERISK13
-
-OPTIONS_DEFAULT=	ASTERISK13
-
-ASTERISK11_DESC=	Depend on Asterisk 11
-ASTERISK13_DESC=	Depend on Asterisk 13
-
-ASTERISK11_BUILD_DEPENDS=	asterisk:net/asterisk11
-ASTERISK11_RUN_DEPENDS=	asterisk:net/asterisk11
-ASTERISK13_BUILD_DEPENDS=	asterisk:net/asterisk13
-ASTERISK13_RUN_DEPENDS=	asterisk:net/asterisk13
-
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
diff --git a/japanese/asterisk-sounds/Makefile b/japanese/asterisk-sounds/Makefile
index 0f1ccbc40970..2346791902c6 100644
--- a/japanese/asterisk-sounds/Makefile
+++ b/japanese/asterisk-sounds/Makefile
@@ -14,6 +14,8 @@ DISTNAME=	asterisk-sound-jp_${PORTVERSION:S|.||}_pre
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Japanese sound files for Asterisk
 
+RUN_DEPENDS=	asterisk:net/asterisk13
+
 NO_BUILD=	yes
 ASTERISKDIR=	${PREFIX}/share/asterisk/sounds
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
@@ -22,16 +24,6 @@ SUB_LIST=	PORTSDIR=${PORTSDIR}
 
 OPTIONS_DEFINE=	DOCS
 
-OPTIONS_SINGLE=		ASTVER
-OPTIONS_SINGLE_ASTVER=	ASTERISK11 ASTERISK13
-OPTIONS_DEFAULT=	ASTERISK13
-
-ASTERISK11_DESC=	Depend on Asterisk 11
-ASTERISK13_DESC=	Depend on Asterisk 13
-
-ASTERISK11_RUN_DEPENDS=	asterisk:net/asterisk11
-ASTERISK13_RUN_DEPENDS=	asterisk:net/asterisk13
-
 do-install:
 	@-${MKDIR} ${STAGEDIR}${ASTERISKDIR}/ja
 	for gsm in ${WRKDIR}/ja/*.gsm; do \
diff --git a/net/appkonference/Makefile b/net/appkonference/Makefile
index fc8ce9c733ae..1a8ecc94f837 100644
--- a/net/appkonference/Makefile
+++ b/net/appkonference/Makefile
@@ -13,31 +13,21 @@ COMMENT=	High-performance Asterisk voice/video conferencing plugin
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_CSTD=	gnu89
-USES=		compiler:features gmake
-WRKSRC=		${WRKDIR}/${PORTNAME}/konference
-
-PLIST_FILES=	lib/asterisk/modules/app_konference.so
-
 ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386 powerpc
 ONLY_FOR_ARCHS_REASON=	not yet ported to this architecture
 
-OPTIONS_DEFINE=		OPTIMIZED_CFLAGS
-OPTIONS_DEFAULT=	ASTERISK13 OPTIMIZED_CFLAGS
-OPTIONS_SINGLE=		ASTERISK
-OPTIONS_SINGLE_ASTERISK=ASTERISK11 ASTERISK13
+BUILD_DEPENDS=	asterisk:net/asterisk13
+RUN_DEPENDS=	asterisk:net/asterisk13
 
-ASTERISK_DESC=		Asterisk version
-ASTERISK11_DESC=	Asterisk 11.x support
-ASTERISK13_DESC=	Asterisk 13.x support
+USES=		compiler:features gmake
+USE_CSTD=	gnu89
+WRKSRC=		${WRKDIR}/${PORTNAME}/konference
+MAKE_ARGS=	ASTERISK_SRC_VERSION=1300
 
-ASTERISK11_BUILD_DEPENDS=	asterisk11>0:net/asterisk11
-ASTERISK11_RUN_DEPENDS=	asterisk11>0:net/asterisk11
-ASTERISK11_MAKE_ARGS=	ASTERISK_SRC_VERSION=1100
+PLIST_FILES=	lib/asterisk/modules/app_konference.so
 
-ASTERISK13_BUILD_DEPENDS=	asterisk13>0:net/asterisk13
-ASTERISK13_RUN_DEPENDS=	asterisk13>0:net/asterisk13
-ASTERISK13_MAKE_ARGS=	ASTERISK_SRC_VERSION=1300
+OPTIONS_DEFINE=		OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
 
 OPTIMIZED_CFLAGS_CFLAGS=	-O3 -ffast-math
 
diff --git a/net/asterisk-chan_sccp/Makefile b/net/asterisk-chan_sccp/Makefile
index af747e57d61a..ef2fdf916692 100644
--- a/net/asterisk-chan_sccp/Makefile
+++ b/net/asterisk-chan_sccp/Makefile
@@ -14,6 +14,9 @@ COMMENT=		Replacement for the SCCP channel driver in Asterisk
 
 LICENSE=		GPLv1
 
+BUILD_DEPENDS=		asterisk:net/asterisk13
+RUN_DEPENDS=		asterisk:net/asterisk13
+
 GNU_CONFIGURE=		yes
 USES=			iconv compiler libtool
 CONFIGURE_ARGS+=	--enable-video \
@@ -30,19 +33,6 @@ PLIST_FILES=		lib/asterisk/modules/chan_sccp.so \
 			etc/asterisk/sccp.conf \
 			etc/asterisk/sccp.conf.annotated
 
-OPTIONS_SINGLE=		ASTVER
-OPTIONS_SINGLE_ASTVER=	ASTERISK11 ASTERISK13
-OPTIONS_DEFAULT=	ASTERISK13
-
-ASTERISK11_DESC=	Depend on Asterisk 11
-ASTERISK13_DESC=	Depend on Asterisk 13
-
-ASTERISK11_BUILD_DEPENDS=	asterisk:net/asterisk11
-ASTERISK11_RUN_DEPENDS=		asterisk:net/asterisk11
-
-ASTERISK13_BUILD_DEPENDS=	asterisk:net/asterisk13
-ASTERISK13_RUN_DEPENDS=		asterisk:net/asterisk13
-
 post-build:
 	${STRIP_CMD} ${WRKSRC}/src/.libs/chan_sccp.so
 
diff --git a/net/asterisk-g72x/Makefile b/net/asterisk-g72x/Makefile
index f035d1d245b1..27be7cf2f077 100644
--- a/net/asterisk-g72x/Makefile
+++ b/net/asterisk-g72x/Makefile
@@ -10,29 +10,16 @@ MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	G.729 codec for Asterisk PBX
 
 LIB_DEPENDS=	libbcg729.so:audio/bcg729
+BUILD_DEPENDS=	asterisk:net/asterisk13
+RUN_DEPENDS=	asterisk:net/asterisk13
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-bcg729
+CONFIGURE_ARGS=	--with-bcg729 \
+		--with-asterisk130
 USES=		autoreconf compiler libtool localbase tar:bzip2
-NO_OPTIONS_SORT=	yes
 
 PLIST_FILES=	lib/asterisk/modules/codec_g729.so
 
-OPTIONS_SINGLE=	ASTVER
-OPTIONS_SINGLE_ASTVER=	ASTERISK11 ASTERISK13
-
-OPTIONS_DEFAULT=	ASTERISK13
-
-ASTERISK11_DESC=	Depend on Asterisk 11
-ASTERISK13_DESC=	Depend on Asterisk 13
-
-ASTERISK11_BUILD_DEPENDS=	asterisk:net/asterisk11
-ASTERISK11_RUN_DEPENDS=	asterisk:net/asterisk11
-ASTERISK11_CONFIGURE_ON=	--with-asterisk100
-ASTERISK13_BUILD_DEPENDS=	asterisk:net/asterisk13
-ASTERISK13_RUN_DEPENDS=	asterisk:net/asterisk13
-ASTERISK13_CONFIGURE_ON=	--with-asterisk130
-
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang