espeak: Merge changes done in wip/espeak

- Remove MINOR_VER
- Use upstream `install' target instead of defining our own, inject PREFIX and
  INCDIR make flags accordingly and adjust permissions of static libraries via
  patch-src_Makefile
- Avoid to inject portaudio v19 related make flags, they are already the
  default in src/Makefile
- Do not pass `-funsigned-char' and avoid narrowing conversion errors by using
  wchar_t instead

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/espeak/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile	20 Oct 2019 11:10:47 -0000	1.13
+++ Makefile	6 Jan 2020 13:55:07 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.13 2019/10/20 11:10:47 nia Exp $
 
-MINOR_VER=	48
-DISTNAME=	espeak-1.${MINOR_VER}.04-source
+DISTNAME=	espeak-1.48.04-source
 PKGNAME=	${DISTNAME:S/-source//}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=espeak/}
@@ -14,35 +13,18 @@ LICENSE=	gnu-gpl-v3
 
 BUILD_DIRS=	src
 USE_LANGUAGES=	c c++03
-USE_TOOLS+=	gmake pax
+USE_TOOLS+=	gmake
 
+MAKE_FLAGS+=	PREFIX=${PREFIX}
+MAKE_FLAGS+=	INCDIR=${PREFIX}/include
 MAKE_FLAGS+=	DATADIR=${PREFIX}/share/espeak-data
 
-# use portaudio v19
-MAKE_FLAGS+=	WAVE=wave.cpp
-MAKE_FLAGS+=	LIB_AUDIO=-lportaudio
-MAKE_FLAGS+=	USE_AUDIO=-DUSE_PORTAUDIO
-
-PLIST_SUBST+=	MINOR_VER=${MINOR_VER}
-
-CXXFLAGS+=	-funsigned-char
-
-INSTALLATION_DIRS=	bin include lib share
-
 pre-configure:
 	${CP} ${WRKSRC}/src/portaudio19.h ${WRKSRC}/src/portaudio.h
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/espeak ${DESTDIR}${PREFIX}/bin
-	${INSTALL_LIB} ${WRKSRC}/src/libespeak.so.1.1.${MINOR_VER} ${DESTDIR}${PREFIX}/lib
-	${LN} -sf libespeak.so.1.1.${MINOR_VER} \
-		${DESTDIR}${PREFIX}/lib/libespeak.so.1
-	${LN} -sf libespeak.so.1.1.${MINOR_VER} \
-		${DESTDIR}${PREFIX}/lib/libespeak.so
-	${INSTALL_LIB} ${WRKSRC}/src/libespeak.a ${DESTDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/src/speak_lib.h ${DESTDIR}${PREFIX}/include
-	cd ${WRKSRC}/espeak-data && \
-		${PAX} -rw -pp . ${DESTDIR}${PREFIX}/share/espeak-data
+post-install:
+	cd ${WRKSRC} && ${FIND} ${DESTDIR}${PREFIX}/share -type f \
+	    -exec ${CHMOD} ${SHAREMODE} {} \;
 
 .include "../../audio/portaudio/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/audio/espeak/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- PLIST	21 Jul 2019 22:47:56 -0000	1.5
+++ PLIST	6 Jan 2020 13:55:07 -0000
@@ -4,7 +4,7 @@ include/speak_lib.h
 lib/libespeak.a
 lib/libespeak.so
 lib/libespeak.so.1
-lib/libespeak.so.1.1.${MINOR_VER}
+lib/libespeak.so.1.1.48
 share/espeak-data/af_dict
 share/espeak-data/am_dict
 share/espeak-data/an_dict
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/espeak/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo	21 Jul 2019 22:47:56 -0000	1.6
+++ distinfo	6 Jan 2020 13:55:07 -0000
@@ -4,4 +4,7 @@ SHA1 (espeak-1.48.04-source.zip) = b22c0
 RMD160 (espeak-1.48.04-source.zip) = 95f45d86c86756c3bd3b359aaba3c844f4a1c23c
 SHA512 (espeak-1.48.04-source.zip) = f0759e6ace2604c8cbb19e8c3fd4b106edf4dcece247a6677f6b734af7746c35a367126edfbe585396c98f6c54f07e25d64bfab35e258e64f09bd2c0833247fa
 Size (espeak-1.48.04-source.zip) = 3019245 bytes
-SHA1 (patch-src_Makefile) = ad90e699c15c266c6e6b2db73340fdf5506389d8
+SHA1 (patch-numbers.cpp) = 94a9c4fcf7976ad5517f936d3ac0010ccb14a585
+SHA1 (patch-src_Makefile) = d47ff893d019a13484fe66bcb16549a989cc60d4
+SHA1 (patch-tr__languages.cpp) = db694593cc0a0bc4dd0eb7c8158e3fb63c388975
+SHA1 (patch-translate.h) = ef36264171dbcd65c53d0835085528978d1024b2
Index: patches/patch-numbers.cpp
===================================================================
RCS file: patches/patch-numbers.cpp
diff -N patches/patch-numbers.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-numbers.cpp	6 Jan 2020 13:55:07 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Avoid narrowing conversion errors.
+
+--- src/numbers.cpp.orig	2014-03-04 16:47:15.000000000 +0000
++++ src/numbers.cpp
+@@ -1226,7 +1226,7 @@ int TranslateRoman(Translator *tr, char 
+ 		p = &ph_out[strlen(ph_roman)];
+ 	}
+ 
+-	sprintf(number_chars,"  %d %s    ",acc, tr->langopts.roman_suffix);
++	sprintf(number_chars,"  %d %ls    ",acc, tr->langopts.roman_suffix);
+ 
+ 	if(word[0] == '.')
+ 	{
Index: patches/patch-src_Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/espeak/patches/patch-src_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_Makefile
--- patches/patch-src_Makefile	21 Jul 2019 22:47:56 -0000	1.1
+++ patches/patch-src_Makefile	6 Jan 2020 13:55:07 -0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_Makefile,v 1.1 2019/07/21 22:47:56 nia Exp $
+$NetBSD$
 
-Do not ignore CXXFLAGS.
+- Do not ignore CXXFLAGS
+- Install static library without execute permissions
 
 --- src/Makefile.orig	2014-02-02 10:58:11.000000000 +0000
 +++ src/Makefile
@@ -14,3 +15,12 @@ Do not ignore CXXFLAGS.
  all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
  
  .cpp.o:
+@@ -143,7 +140,7 @@ install: all
+ 	# Install shared library
+ 	$(INSTALL) -m 755 $(LIB_NAME).$(LIBTAG) $(DESTDIR)$(LIBDIR)
+ 	# Install static library
+-	$(INSTALL) -m 755 $(STATIC_LIB_NAME) $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 644 $(STATIC_LIB_NAME) $(DESTDIR)$(LIBDIR)
+ 	$(LN_SF) $(LIB_NAME).$(LIBTAG) $(DESTDIR)$(LIBDIR)/$(LIB_NAME).$(LIB_VERSION)
+ 	$(LN_SF) $(LIB_NAME).$(LIB_VERSION) $(DESTDIR)$(LIBDIR)/$(LIB_NAME)
+ 	# Install development headers
Index: patches/patch-tr__languages.cpp
===================================================================
RCS file: patches/patch-tr__languages.cpp
diff -N patches/patch-tr__languages.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-tr__languages.cpp	6 Jan 2020 13:55:07 -0000
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Avoid narrowing conversion errors.
+
+--- src/tr_languages.cpp.orig	2014-03-04 16:47:15.000000000 +0000
++++ src/tr_languages.cpp
+@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
+ 	0x200d,  1, // zero width joiner
+ 	0, 0 };
+ 
+-const char string_ordinal[] = {0xc2,0xba,0};  // masculine ordinal character, UTF-8
++const wchar_t string_ordinal[] = {0xc2,0xba,0};  // masculine ordinal character, UTF-8
+ 
+ 
+ static Translator* NewTranslator(void)
+@@ -296,7 +296,7 @@ static const char transpose_map_latin[] 
+ 	tr->langopts.replace_chars = NULL;
+ 	tr->langopts.ascii_language[0] = 0;    // Non-Latin alphabet languages, use this language to speak Latin words, default is English
+ 	tr->langopts.alt_alphabet_lang = L('e','n');
+-	tr->langopts.roman_suffix = "";
++	tr->langopts.roman_suffix = L"";
+ 
+ 	SetLengthMods(tr,201);
+ //	tr->langopts.length_mods = length_mods_en;
Index: patches/patch-translate.h
===================================================================
RCS file: patches/patch-translate.h
diff -N patches/patch-translate.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-translate.h	6 Jan 2020 13:55:07 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Avoid narrowing conversion errors.
+
+--- src/translate.h.orig	2014-03-04 16:47:15.000000000 +0000
++++ src/translate.h
+@@ -545,7 +545,7 @@ typedef struct {
+ 	int decimal_sep;
+ 	int max_digits;    // max number of digits which can be spoken as an integer number (rather than individual digits)
+ 	const char *ordinal_indicator;   // UTF-8 string
+-	const char *roman_suffix;    // add this (ordinal) suffix to Roman numbers (LANG=an)
++	const wchar_t *roman_suffix;    // add this (ordinal) suffix to Roman numbers (LANG=an)
+ 
+ 	// bit 0, accent name before the letter name, bit 1 "capital" after letter name
+ 	int accents;