3 files changed, 24 insertions, 27 deletions
diff --git a/audio/asterisk-flite/Makefile b/audio/asterisk-flite/Makefile
index 9f8e21f0e28c..1ae76763b0ae 100644
--- a/audio/asterisk-flite/Makefile
+++ b/audio/asterisk-flite/Makefile
@@ -1,7 +1,5 @@
 PORTNAME=	flite
-PORTVERSION=	3.0
-DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+DISTVERSION=	3.0.20230702
 CATEGORIES=	audio
 
 MAINTAINER=	ports@FreeBSD.org
@@ -9,24 +7,26 @@ COMMENT=	Flite dialplan application for Asterisk
 WWW=		https://zaf.github.io/Asterisk-Flite/
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libflite.so:audio/flite
 
-FLAVORS=			asterisk18
-FLAVOR?=			${FLAVORS:[1]}
+FLAVORS=	asterisk18 asterisk20 asterisk22
+FLAVOR?=	${FLAVORS:[3]}
 
-asterisk18_PKGNAMEPREFIX=       asterisk18-
-asterisk18_BUILD_DEPENDS=       asterisk:net/asterisk18
-asterisk18_RUN_DEPENDS=         asterisk:net/asterisk18
+${FLAVOR}_PKGNAMEPREFIX=	${FLAVOR}-
+${FLAVOR}_BUILD_DEPENDS=	asterisk:net/${FLAVOR}
+${FLAVOR}_RUN_DEPENDS=		asterisk:net/${FLAVOR}
 
 USES=		compiler:c11 gmake localbase
-INSTALL_TARGET=	install samples
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	zaf
 GH_PROJECT=	Asterisk-Flite
+GH_TAGNAME=	a3ed85151a1c875471568a959dce1bb35cca109b
 
-CONFLICTS_INSTALL=	asterisk[0-9][0-9]-flite # etc/asterisk/flite.conf.sample
+INSTALL_TARGET=	install samples
+
+CONFLICTS_INSTALL=	${FLAVORS:N${FLAVOR}:C|(.+)|\1-${PORTNAME}|} # etc/asterisk/flite.conf.sample
 
 .include <bsd.port.pre.mk>
 
@@ -34,10 +34,6 @@ CONFLICTS_INSTALL=	asterisk[0-9][0-9]-flite # etc/asterisk/flite.conf.sample
 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
 
diff --git a/audio/asterisk-flite/distinfo b/audio/asterisk-flite/distinfo
index f8b3918beb52..a247570d254a 100644
--- a/audio/asterisk-flite/distinfo
+++ b/audio/asterisk-flite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503328714
-SHA256 (zaf-Asterisk-Flite-v3.0_GH0.tar.gz) = 57f0a86716af6a6704de003b3779c44d55ac9747cb696430d88d3f93cd7e2399
-SIZE (zaf-Asterisk-Flite-v3.0_GH0.tar.gz) = 11992
+TIMESTAMP = 1753300000
+SHA256 (zaf-Asterisk-Flite-3.0.20230702-a3ed85151a1c875471568a959dce1bb35cca109b_GH0.tar.gz) = bd69ac5660fa513352c0b2e0b3811de28f7a28c5c58423baed886acf62ae8012
+SIZE (zaf-Asterisk-Flite-3.0.20230702-a3ed85151a1c875471568a959dce1bb35cca109b_GH0.tar.gz) = 12090
diff --git a/audio/asterisk-flite/files/patch-Makefile b/audio/asterisk-flite/files/patch-Makefile
index 8c7be9d7a200..249ae00cff44 100644
--- a/audio/asterisk-flite/files/patch-Makefile
+++ b/audio/asterisk-flite/files/patch-Makefile
@@ -1,10 +1,10 @@
---- Makefile.orig	2016-09-12 20:39:22 UTC
+--- Makefile.orig	2023-07-01 23:18:21 UTC
 +++ Makefile
-@@ -7,30 +7,16 @@
+@@ -6,31 +6,17 @@
+ # the GNU General Public License Version 2. See the COPYING file
  # at the top of the source tree.
  
- INSTALL:=install
--ASTLIBDIR:=$(shell awk '/moddir/{print $$3}' /etc/asterisk/asterisk.conf)
+-ASTLIBDIR:=$(shell awk '/moddir/{print $$3}' /etc/asterisk/asterisk.conf 2> /dev/null)
 -ifeq ($(strip $(ASTLIBDIR)),)
 -	MODULES_DIR:=$(INSTALL_PREFIX)/usr/lib/asterisk/modules
 -else
@@ -16,9 +16,10 @@
  SAMPLENAME:=flite.conf.sample
 -CONFNAME:=$(basename $(SAMPLENAME))
  
--CC=gcc
--OPTIMIZE=-O2
--DEBUG=-g
+ INSTALL:=install
+-CC:=gcc
+-OPTIMIZE:=-O2
+-DEBUG:=-g
 +CC?=gcc
  
 -LIBS+=-lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_awb -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite
@@ -34,8 +35,8 @@
 -	@echo " +-------------------------------------------+"
  
  app_flite.o: app_flite.c
- 	$(CC) $(CFLAGS) $(DEBUG) $(OPTIMIZE) -c -o app_flite.o app_flite.c
-@@ -44,20 +30,7 @@ clean:
+ 	$(CC) $(CFLAGS) $(DEBUG) $(OPTIMIZE) -c -o $@ $*.c
+@@ -44,20 +29,7 @@ install: all
  install: all
  	$(INSTALL) -m 755 -d $(DESTDIR)$(MODULES_DIR)
  	$(INSTALL) -m 755 app_flite.so $(DESTDIR)$(MODULES_DIR)