Index: head/audio/asterisk-espeak/Makefile
===================================================================
--- head/audio/asterisk-espeak/Makefile	(revision 467142)
+++ head/audio/asterisk-espeak/Makefile	(revision 467143)
@@ -1,34 +1,50 @@
 # $FreeBSD$
 
-PORTNAME=	asterisk-espeak
+PORTNAME=	espeak
 PORTVERSION=	4.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Espeak dialplan application for Asterisk
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libespeak.so:audio/espeak \
 		libsamplerate.so:audio/libsamplerate
-BUILD_DEPENDS=	asterisk:net/asterisk13
-RUN_DEPENDS=	asterisk:net/asterisk13
 
+FLAVORS=			asterisk13 asterisk15
+FLAVOR?=			${FLAVORS[1]}
+
+asterisk13_PKGNAMEPREFIX=	asterisk13-
+asterisk13_CONFLICTS_INSTALL=	asterisk15-espeak
+asterisk13_BUILD_DEPENDS=	asterisk:net/asterisk13
+asterisk13_RUN_DEPENDS=		asterisk:net/asterisk13
+
+asterisk15_PKGNAMEPREFIX=	asterisk15-
+asterisk15_CONFLICTS_INSTALL=	asterisk13-espeak
+asterisk15_BUILD_DEPENDS=	asterisk:net/asterisk15
+asterisk15_RUN_DEPENDS=		asterisk:net/asterisk15
+
 USES=		compiler gmake localbase
 INSTALL_TARGET=	install samples
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zaf
 GH_PROJECT=	Asterisk-eSpeak
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CFLAGS+=	-fblocks
 .endif
+
+post-patch:
+	@${REINPLACE_CMD} -e '/ASTERISK_REGISTER_FILE/d' \
+		${WRKSRC}/app_espeak.c
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/asterisk/modules/app_espeak.so
 
 .include <bsd.port.post.mk>
Index: head/audio/asterisk-flite/Makefile
===================================================================
--- head/audio/asterisk-flite/Makefile	(revision 467142)
+++ head/audio/asterisk-flite/Makefile	(revision 467143)
@@ -1,33 +1,49 @@
 # $FreeBSD$
 
-PORTNAME=	asterisk-flite
+PORTNAME=	flite
 PORTVERSION=	3.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Flite dialplan application for Asterisk
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libflite.so:audio/flite
-BUILD_DEPENDS=	asterisk:net/asterisk13
-RUN_DEPENDS=	asterisk:net/asterisk13
 
+FLAVORS=			asterisk13 asterisk15
+FLAVOR?=			${FLAVORS[1]}
+
+asterisk13_PKGNAMEPREFIX=	asterisk13-
+asterisk13_CONFLICTS_INSTALL=	asterisk15-flite
+asterisk13_BUILD_DEPENDS=	asterisk:net/asterisk13
+asterisk13_RUN_DEPENDS=		asterisk:net/asterisk13
+
+asterisk15_PKGNAMEPREFIX=	asterisk15-
+asterisk15_CONFLICTS_INSTALL=	asterisk13-flite
+asterisk15_BUILD_DEPENDS=	asterisk:net/asterisk15
+asterisk15_RUN_DEPENDS=		asterisk:net/asterisk15
+
 USES=		compiler gmake localbase
 INSTALL_TARGET=	install samples
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zaf
 GH_PROJECT=	Asterisk-Flite
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CFLAGS+=	-fblocks
 .endif
+
+post-patch:
+	@${REINPLACE_CMD} -e '/ASTERISK_REGISTER_FILE/d' \
+		${WRKSRC}/app_flite.c
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/asterisk/modules/app_flite.so
 
 .include <bsd.port.post.mk>
Index: head/net/asterisk-g72x/Makefile
===================================================================
--- head/net/asterisk-g72x/Makefile	(revision 467142)
+++ head/net/asterisk-g72x/Makefile	(revision 467143)
@@ -1,31 +1,45 @@
 # $FreeBSD$
 
-PORTNAME=	asterisk-g72x
+PORTNAME=	g72x
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://asterisk.hosting.lv/src/
+DISTNAME=	asterisk-${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 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
 
+FLAVORS=			asterisk13 asterisk15
+FLAVOR?=			${FLAVORS[1]}
+
+asterisk13_PKGNAMEPREFIX=	asterisk13-
+asterisk13_CONFLICTS_INSTALL=	asterisk15-g72x
+asterisk13_BUILD_DEPENDS=	asterisk:net/asterisk13
+asterisk13_RUN_DEPENDS=		asterisk:net/asterisk13
+asterisk15_CONFIGURE_ARGS=	--with-asterisk130
+
+asterisk15_PKGNAMEPREFIX=	asterisk15-
+asterisk15_CONFLICTS_INSTALL=	asterisk13-g72x
+asterisk15_BUILD_DEPENDS=	asterisk:net/asterisk15
+asterisk15_RUN_DEPENDS=		asterisk:net/asterisk15
+asterisk15_CONFIGURE_ARGS=	--with-asterisk150
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-bcg729 \
-		--with-asterisk130
+CONFIGURE_ARGS=	--with-bcg729
 USES=		autoreconf compiler libtool localbase tar:bzip2
 
 PLIST_FILES=	lib/asterisk/modules/codec_g729.so
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CFLAGS+=	-fblocks
 .endif
 
 post-build:
 	${STRIP_CMD} ${WRKSRC}/.libs/codec_g729.so
 
 .include <bsd.port.post.mk>