festival: Give up on trying to support multiple curses implementations

(it doesn't work).

bump PKGREVISION

3 files changed, 3 insertions, 38 deletions

diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index a23df72d4e4..55541b19a41 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2019/09/13 10:54:47 nia Exp $
+# $NetBSD: Makefile,v 1.81 2019/11/10 21:31:00 nia Exp $
 
 DISTNAME=	festival-2.5.0-release
 PKGNAME=	${DISTNAME:S/-release//}
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://festvox.org/packed/festival/2.5/
 DISTFILES=	${DISTNAME}.tar.gz \
@@ -115,11 +116,6 @@ do-install:
 	${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1		\
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/festival_client.1
 
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
-.if ${OPSYS} == "Linux"
-# See DebianGNULinux.mak
-.include "../../mk/curses.buildlink3.mk"
-.endif
-MAKE_ENV+=		BUILDLINK_CPPFLAGS=${BUILDLINK_CPPFLAGS:Q}
-MAKE_ENV+=		BUILDLINK_LDFLAGS=${BUILDLINK_LDADD.termcap:Q}
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festival/patches/patch-speech__tools_config_modules_editline.mak b/audio/festival/patches/patch-speech__tools_config_modules_editline.mak
deleted file mode 100644
index 7ae2fe7c3ea..00000000000
--- a/audio/festival/patches/patch-speech__tools_config_modules_editline.mak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-speech__tools_config_modules_editline.mak,v 1.1 2017/04/21 12:33:15 jperkin Exp $
-
-Ensure the chosen termcap library can be found.
-
---- speech_tools/config/modules/editline.mak.orig	2002-07-22 22:57:53.000000000 +0000
-+++ speech_tools/config/modules/editline.mak
-@@ -43,7 +43,7 @@ INCLUDE_EDITLINE=1
- MOD_DESC_EDITLINE=Use editline for command line editing and history
- 
- IO_DEFINES   += -DSUPPORT_EDITLINE $(MODULE_EDITLINE_OPTIONS:%=-DEDITLINE_%)
--MODULE_LIBS  += $(TERMCAPLIB)
-+MODULE_LIBS  += ${BUILDLINK_LDFLAGS} $(TERMCAPLIB)
- 
- ifeq ($(DIRNAME),siod)
-     CSRCS := $(CSRCS) el_complete.c editline.c el_sys_unix.c
diff --git a/audio/festival/patches/patch-speech__tools_configure.in b/audio/festival/patches/patch-speech__tools_configure.in
deleted file mode 100644
index 57e78a44481..00000000000
--- a/audio/festival/patches/patch-speech__tools_configure.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-speech__tools_configure.in,v 1.1 2013/10/11 11:16:12 roy Exp $
-
-Test for termcap before ncurses
-
---- speech_tools/configure.in.orig	2013-10-11 10:22:22.000000000 +0000
-+++ speech_tools/configure.in
-@@ -42,7 +42,8 @@ AC_CHECK_TOOL(AR, ar)
- 
- AC_C_BIGENDIAN
- 
--AC_CHECK_LIB(ncurses, tputs, [TERMCAPLIB=-lncurses], [TERMCAPLIB=-lcurses])
-+AC_CHECK_LIB(termcap, tputs, [TERMCAPLIB=-ltermcap],
-+[AC_CHECK_LIB(ncurses, tputs, [TERMCAPLIB=-lncurses], [TERMCAPLIB=-lcurses])])
- dnl if test "$TERMCAPLIB" != "-ltermcap"; then
- dnl    AC_CHECK_LIB(termcap, tputs, [TERMCAPLIB=-ltermcap], [TERMCAPLIB=-lncurses])
- dnl