From owner-svn-ports-branches@FreeBSD.ORG Fri May 15 14:09:24 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42589C32; Fri, 15 May 2015 14:09:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2EB771072; Fri, 15 May 2015 14:09:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4FE9OcV062878; Fri, 15 May 2015 14:09:24 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4FE9MbU062868; Fri, 15 May 2015 14:09:22 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201505151409.t4FE9MbU062868@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Fri, 15 May 2015 14:09:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386407 - in branches/2015Q2/audio/praat: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2015 14:09:24 -0000 Author: riggs Date: Fri May 15 14:09:21 2015 New Revision: 386407 URL: https://svnweb.freebsd.org/changeset/ports/386407 Log: MFH: r386406 - Un-break build - Update to upstream version 5.4.08 - General cleanup / pet portlint PR: 199634 Submitted by: jwbacon@tds.net (maintainer) Approved by: portmgr (erwin) Added: branches/2015Q2/audio/praat/files/patch-sys_melder.h - copied unchanged from r386406, head/audio/praat/files/patch-sys_melder.h branches/2015Q2/audio/praat/files/patch-sys_melder__alloc.cpp - copied unchanged from r386406, head/audio/praat/files/patch-sys_melder__alloc.cpp branches/2015Q2/audio/praat/files/patch-sys_melder__files.cpp - copied unchanged from r386406, head/audio/praat/files/patch-sys_melder__files.cpp branches/2015Q2/audio/praat/files/patch-sys_melder__strings.cpp - copied unchanged from r386406, head/audio/praat/files/patch-sys_melder__strings.cpp Deleted: branches/2015Q2/audio/praat/files/patch-sys-melder.h Modified: branches/2015Q2/audio/praat/Makefile branches/2015Q2/audio/praat/distinfo branches/2015Q2/audio/praat/files/makefile.defs.freebsd.alsa Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/audio/praat/Makefile ============================================================================== --- branches/2015Q2/audio/praat/Makefile Fri May 15 13:21:56 2015 (r386406) +++ branches/2015Q2/audio/praat/Makefile Fri May 15 14:09:21 2015 (r386407) @@ -2,10 +2,10 @@ # $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 @@ -15,12 +15,19 @@ LICENSE= GPLv2 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 + +.if ${OSVERSION} < 1000000 +# Requires std=g++11 +USE_GCC= yes +.endif + post-patch: @${FIND} ${WRKSRC} -name Makefile -exec \ ${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|' "{}" \; @@ -41,4 +48,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/praat ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${FILESDIR}/praat.1 ${STAGEDIR}${PREFIX}/man/man1 -.include +.include Modified: branches/2015Q2/audio/praat/distinfo ============================================================================== --- branches/2015Q2/audio/praat/distinfo Fri May 15 13:21:56 2015 (r386406) +++ branches/2015Q2/audio/praat/distinfo Fri May 15 14:09:21 2015 (r386407) @@ -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 Modified: branches/2015Q2/audio/praat/files/makefile.defs.freebsd.alsa ============================================================================== --- branches/2015Q2/audio/praat/files/makefile.defs.freebsd.alsa Fri May 15 13:21:56 2015 (r386406) +++ branches/2015Q2/audio/praat/files/makefile.defs.freebsd.alsa Fri May 15 14:09:21 2015 (r386407) @@ -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) Copied: branches/2015Q2/audio/praat/files/patch-sys_melder.h (from r386406, head/audio/praat/files/patch-sys_melder.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/audio/praat/files/patch-sys_melder.h Fri May 15 14:09:21 2015 (r386407, copy of r386406, head/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 ++ + 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 { Copied: branches/2015Q2/audio/praat/files/patch-sys_melder__alloc.cpp (from r386406, head/audio/praat/files/patch-sys_melder__alloc.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/audio/praat/files/patch-sys_melder__alloc.cpp Fri May 15 14:09:21 2015 (r386407, copy of r386406, head/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); + } + Copied: branches/2015Q2/audio/praat/files/patch-sys_melder__files.cpp (from r386406, head/audio/praat/files/patch-sys_melder__files.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/audio/praat/files/patch-sys_melder__files.cpp Fri May 15 14:09:21 2015 (r386407, copy of r386406, head/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) { Copied: branches/2015Q2/audio/praat/files/patch-sys_melder__strings.cpp (from r386406, head/audio/praat/files/patch-sys_melder__strings.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/audio/praat/files/patch-sys_melder__strings.cpp Fri May 15 14:09:21 2015 (r386407, copy of r386406, head/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) {