- Un-break build

- Update to upstream version 5.4.08
- General cleanup / pet portlint

PR:		199634
Submitted by:	jwbacon@tds.net (maintainer)
MFH:		2015Q2

8 files changed, 130 insertions, 22 deletions

diff --git a/audio/praat/Makefile b/audio/praat/Makefile
index 5fa3f20d9697..a16aa7919347 100644
--- a/audio/praat/Makefile
+++ b/audio/praat/Makefile
@@ -2,26 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	praat
-PORTVERSION=	5.3.59
+PORTVERSION=	5.4.08
 CATEGORIES=	audio science
 MASTER_SITES=	http://www.fon.hum.uva.nl/praat/
-DISTNAME=	praat5359_sources
+DISTNAME=	praat5408_sources
 
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Phonetics by Computer
 
 LICENSE=	GPLv2
 
-BROKEN=		Unfetchable
 DOS2UNIX_REGEX=	.*Makefile
 USES=		dos2unix iconv motif pkgconfig
 USE_GNOME=	gtk20
-WRKSRC=		${WRKDIR}/sources_5359
+WRKSRC=		${WRKDIR}/sources_5408
 MAKEFILE=	makefile
 PLIST_FILES=	bin/praat man/man1/praat.1.gz
 
 LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000000
+# Requires std=g++11
+USE_GCC=	yes
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile -exec \
 		${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|' "{}" \;
@@ -42,4 +48,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/praat ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${FILESDIR}/praat.1 ${STAGEDIR}${PREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/praat/distinfo b/audio/praat/distinfo
index 3f286ce7f1f5..881dda3610d1 100644
--- a/audio/praat/distinfo
+++ b/audio/praat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (praat5359_sources.tar.gz) = 0a2f27a0052f8197bd85036fa5c19e11b6854f3130a3fb66ad0055939ef6ed55
-SIZE (praat5359_sources.tar.gz) = 6856136
+SHA256 (praat5408_sources.tar.gz) = 7390668af1b221cdfed14f215e3ef7b27229cef2a9d416c9549e9a15f6bc1315
+SIZE (praat5408_sources.tar.gz) = 7383306
diff --git a/audio/praat/files/makefile.defs.freebsd.alsa b/audio/praat/files/makefile.defs.freebsd.alsa
index d6dee0ebe3da..f7ad69901ba0 100644
--- a/audio/praat/files/makefile.defs.freebsd.alsa
+++ b/audio/praat/files/makefile.defs.freebsd.alsa
@@ -10,7 +10,7 @@ CXX ?= g++
 
 CFLAGS = -std=gnu99 -DUNIX -Dlinux -DALSA `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1
 
-CXXFLAGS = -Wshadow -DUNIX -Dlinux -DALSA `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -I%%WRKSRC%%/sys -I%%WRKSRC%%/dwsys -I%%WRKSRC%%/num -I%%WRKSRC%%/stat -I%%WRKSRC%%/kar -I%%WRKSRC%%/dwtools -I%%WRKSRC%%/fon -I%%WRKSRC%%/LPC -I%%WRKSRC%%/EEG -I%%WRKSRC%%/external/espeak -I%%WRKSRC%%/external/flac -I%%WRKSRC%%/external/mp3 -I%%WRKSRC%%/external/gsl -I%%LOCALBASE%%/include
+CXXFLAGS = -std=gnu++11 -Wshadow -DUNIX -Dlinux -DALSA `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -I%%WRKSRC%%/sys -I%%WRKSRC%%/dwsys -I%%WRKSRC%%/num -I%%WRKSRC%%/stat -I%%WRKSRC%%/kar -I%%WRKSRC%%/dwtools -I%%WRKSRC%%/fon -I%%WRKSRC%%/LPC -I%%WRKSRC%%/EEG -I%%WRKSRC%%/external/espeak -I%%WRKSRC%%/external/flac -I%%WRKSRC%%/external/mp3 -I%%WRKSRC%%/external/gsl -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/unicode
 
 LINK ?= $(CXX)
 
diff --git a/audio/praat/files/patch-sys-melder.h b/audio/praat/files/patch-sys-melder.h
deleted file mode 100644
index a4cb6144051c..000000000000
--- a/audio/praat/files/patch-sys-melder.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- sys/melder.h.orig	2013-10-22 08:29:40.000000000 -0500
-+++ sys/melder.h	2013-11-23 12:43:08.000000000 -0600
-@@ -1073,6 +1073,11 @@
- 			Melder_fclose (file, tmp);
- 		}
- 	}
-+	// operator () is not working in Sound_files.cpp:226 for some reason
-+	FILE * get_ptr(void)
-+	{
-+		return ptr;
-+	}
- };
- 
- class autoMelderFile {
diff --git a/audio/praat/files/patch-sys_melder.h b/audio/praat/files/patch-sys_melder.h
new file mode 100644
index 000000000000..14449446ce3c
--- /dev/null
+++ b/audio/praat/files/patch-sys_melder.h
@@ -0,0 +1,81 @@
+--- sys/melder.h.orig	2015-03-22 17:29:26 UTC
++++ sys/melder.h
+@@ -51,6 +51,8 @@
+ 	#define INT54_MIN  -9007199254740991LL
+ #endif
+ 
++#include <uchar.h>
++
+ typedef wchar_t wchar;
+ typedef uint8_t  char8_t;
+ typedef char32_t char32;
+@@ -222,7 +224,7 @@ static inline int64_t str16len (const ch
+ 		return (int64_t) wcslen ((const wchar_t *) string);
+ 	} else {
+ 		int64_t result = 0;
+-		while (* string ++ != u'\0') result ++;
++		while (* string ++ != (char16_t)'\0') result ++;
+ 		return result;
+ 	}
+ }
+@@ -230,8 +232,8 @@ static inline void str16cpy (char16_t *t
+ 	if (sizeof (wchar_t) == 2) {
+ 		wcscpy ((wchar_t *) target, (const wchar_t *) source);
+ 	} else {
+-		while (* source != u'\0') * target ++ = * source ++;
+-		* target = u'\0';
++		while (* source != (char16_t)'\0') * target ++ = * source ++;
++		* target = (char16_t)'\0';
+ 	}
+ }
+ static inline int str16cmp (const char16_t *string1, const char16_t *string2) {
+@@ -239,7 +241,7 @@ static inline int str16cmp (const char16
+ 		return wcscmp ((const wchar_t *) string1, (const wchar_t *) string2);
+ 	} else {
+ 		while (*string1 == *string2 ++) {
+-			if (*string1 ++ == u'\0') {
++			if (*string1 ++ == (char16_t)'\0') {
+ 				return 0;
+ 			}
+ 		}
+@@ -251,7 +253,7 @@ static inline int64_t str32len (const ch
+ 		return (int64_t) wcslen ((const wchar_t *) string);
+ 	} else {
+ 		int64_t result = 0;
+-		while (* string ++ != U'\0') result ++;
++		while (* string ++ != (char32_t)'\0') result ++;
+ 		return result;
+ 	}
+ }
+@@ -259,8 +261,8 @@ static inline void str32cpy (char32_t *t
+ 	if (sizeof (wchar_t) == 4) {
+ 		wcscpy ((wchar_t *) target, (const wchar_t *) source);
+ 	} else {
+-		while (* source != U'\0') * target ++ = * source ++;
+-		* target = U'\0';
++		while (* source != (char32_t)'\0') * target ++ = * source ++;
++		* target = (char32_t)'\0';
+ 	}
+ }
+ static inline int str32cmp (const char32_t *string1, const char32_t *string2) {
+@@ -268,7 +270,7 @@ static inline int str32cmp (const char32
+ 		return wcscmp ((const wchar_t *) string1, (const wchar_t *) string2);
+ 	} else {
+ 		while (*string1 == *string2 ++) {
+-			if (*string1 ++ == U'\0') {
++			if (*string1 ++ == (char32_t)'\0') {
+ 				return 0;
+ 			}
+ 		}
+@@ -1171,6 +1173,11 @@ public:
+ 			Melder_fclose (file, tmp);
+ 		}
+ 	}
++	// operator () is not working in Sound_files.cpp:226 for some reason
++	FILE * get_ptr(void)
++	{
++	        return ptr;
++	}
+ };
+ 
+ class autoMelderFile {
diff --git a/audio/praat/files/patch-sys_melder__alloc.cpp b/audio/praat/files/patch-sys_melder__alloc.cpp
new file mode 100644
index 000000000000..e68e90b9a550
--- /dev/null
+++ b/audio/praat/files/patch-sys_melder__alloc.cpp
@@ -0,0 +1,13 @@
+--- sys/melder_alloc.cpp.orig	2015-01-30 17:35:26 UTC
++++ sys/melder_alloc.cpp
+@@ -317,8 +317,8 @@ int Melder_strcmp (const char *string1, 
+ }
+ 
+ int Melder_str32cmp (const char32 *string1, const char32 *string2) {
+-	if (string1 == NULL) string1 = U"";
+-	if (string2 == NULL) string2 = U"";
++	if (string1 == NULL) string1 = (char32 *)"";
++	if (string2 == NULL) string2 = (char32 *)"";
+ 	return str32cmp (string1, string2);
+ }
+ 
diff --git a/audio/praat/files/patch-sys_melder__files.cpp b/audio/praat/files/patch-sys_melder__files.cpp
new file mode 100644
index 000000000000..67377a49c69f
--- /dev/null
+++ b/audio/praat/files/patch-sys_melder__files.cpp
@@ -0,0 +1,11 @@
+--- sys/melder_files.cpp.orig	2015-03-24 09:58:31 UTC
++++ sys/melder_files.cpp
+@@ -301,7 +301,7 @@ void MelderFile_setToNull (MelderFile fi
+ }
+ 
+ bool MelderFile_isNull (MelderFile file) {
+-	return file == nullptr || file -> path [0] == '\0';
++	return file == NULL || file -> path [0] == '\0';
+ }
+ 
+ void MelderDir_setToNull (MelderDir dir) {
diff --git a/audio/praat/files/patch-sys_melder__strings.cpp b/audio/praat/files/patch-sys_melder__strings.cpp
new file mode 100644
index 000000000000..505600428377
--- /dev/null
+++ b/audio/praat/files/patch-sys_melder__strings.cpp
@@ -0,0 +1,11 @@
+--- sys/melder_strings.cpp.orig	2015-02-01 16:38:59 UTC
++++ sys/melder_strings.cpp
+@@ -386,7 +386,7 @@ void MelderString32_appendCharacter (Mel
+ 	expandIfNecessary (char32)
+ 	my string [my length] = character;
+ 	my length ++;
+-	my string [my length] = U'\0';
++	my string [my length] = (char32)'\0';
+ }
+ 
+ void MelderString_get (MelderString *me, wchar_t *destination) {