Update to 3.0

3 files changed, 23 insertions, 23 deletions

diff --git a/audio/asterisk-flite/Makefile b/audio/asterisk-flite/Makefile
index 2c26d933b17a..ad140ea2f58f 100644
--- a/audio/asterisk-flite/Makefile
+++ b/audio/asterisk-flite/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk-flite
-PORTVERSION=	2.3
+PORTVERSION=	3.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	audio
 
@@ -12,13 +12,13 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libflite.so:audio/flite
 
+USES=		compiler gmake localbase
+INSTALL_TARGET=	install samples
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	zaf
 GH_PROJECT=	Asterisk-Flite
 
-USES=		compiler gmake localbase
-INSTALL_TARGET=	install samples
-
 OPTIONS_SINGLE=	ASTVER
 OPTIONS_SINGLE_ASTVER=	ASTERISK11 ASTERISK13
 
diff --git a/audio/asterisk-flite/distinfo b/audio/asterisk-flite/distinfo
index 89dfc3365cc2..f8b3918beb52 100644
--- a/audio/asterisk-flite/distinfo
+++ b/audio/asterisk-flite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474382391
-SHA256 (zaf-Asterisk-Flite-v2.3_GH0.tar.gz) = 208a2dfd4c6345c99d6b15cd136fa938355b937fa5f9efe849fcf53106667e4c
-SIZE (zaf-Asterisk-Flite-v2.3_GH0.tar.gz) = 11977
+TIMESTAMP = 1503328714
+SHA256 (zaf-Asterisk-Flite-v3.0_GH0.tar.gz) = 57f0a86716af6a6704de003b3779c44d55ac9747cb696430d88d3f93cd7e2399
+SIZE (zaf-Asterisk-Flite-v3.0_GH0.tar.gz) = 11992
diff --git a/audio/asterisk-flite/files/patch-Makefile b/audio/asterisk-flite/files/patch-Makefile
index 81c463cad0fd..8c7be9d7a200 100644
--- a/audio/asterisk-flite/files/patch-Makefile
+++ b/audio/asterisk-flite/files/patch-Makefile
@@ -1,31 +1,31 @@
---- Makefile.orig	2016-03-20 14:01:21 UTC
+--- Makefile.orig	2016-09-12 20:39:22 UTC
 +++ Makefile
-@@ -7,30 +7,15 @@
+@@ -7,30 +7,16 @@
  # at the top of the source tree.
  
- INSTALL=install
+ INSTALL:=install
 -ASTLIBDIR:=$(shell awk '/moddir/{print $$3}' /etc/asterisk/asterisk.conf)
 -ifeq ($(strip $(ASTLIBDIR)),)
--	MODULES_DIR=$(INSTALL_PREFIX)/usr/lib/asterisk/modules
+-	MODULES_DIR:=$(INSTALL_PREFIX)/usr/lib/asterisk/modules
 -else
--	MODULES_DIR=$(INSTALL_PREFIX)$(ASTLIBDIR)
+-	MODULES_DIR:=$(INSTALL_PREFIX)$(ASTLIBDIR)
 -endif
--ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
+-ASTETCDIR:=$(INSTALL_PREFIX)/etc/asterisk
 +MODULES_DIR=$(PREFIX)/lib/asterisk/modules
 +ASTETCDIR=$(PREFIX)/etc/asterisk
- SAMPLENAME=flite.conf.sample
--CONFNAME=$(basename $(SAMPLENAME))
--
+ SAMPLENAME:=flite.conf.sample
+-CONFNAME:=$(basename $(SAMPLENAME))
+ 
 -CC=gcc
 -OPTIMIZE=-O2
 -DEBUG=-g
-+CONFNAME=$(SAMPLENAME)
++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
 +LIBS+=$(LDFLAGS) -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
- CFLAGS+=-pipe -fPIC -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -D_REENTRANT -D_GNU_SOURCE
+ CFLAGS+=-pipe -fPIC -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -D_REENTRANT -D_GNU_SOURCE -DAST_MODULE_SELF_SYM=__internal_app_flite_self
  
- all: _all
+ all: app_flite.so
 -	@echo " +--------- app_flite Build Complete --------+"
 -	@echo " + app_flite has successfully been built,    +"
 -	@echo " + and can be installed by running:          +"
@@ -33,10 +33,10 @@
 -	@echo " +               make install                +"
 -	@echo " +-------------------------------------------+"
  
- _all: app_flite.so
- 
-@@ -46,20 +31,7 @@ clean:
- install: _all
+ app_flite.o: app_flite.c
+ 	$(CC) $(CFLAGS) $(DEBUG) $(OPTIMIZE) -c -o app_flite.o app_flite.c
+@@ -44,20 +30,7 @@ clean:
+ install: all
  	$(INSTALL) -m 755 -d $(DESTDIR)$(MODULES_DIR)
  	$(INSTALL) -m 755 app_flite.so $(DESTDIR)$(MODULES_DIR)
 -	@echo " +---- app_flite Installation Complete ------+"