Index: head/audio/praat/Makefile =================================================================== --- head/audio/praat/Makefile (revision 555011) +++ head/audio/praat/Makefile (revision 555012) @@ -1,57 +1,58 @@ # $FreeBSD$ PORTNAME= praat DISTVERSIONPREFIX= v -DISTVERSION= 6.1.28 +DISTVERSION= 6.1.31 CATEGORIES= audio science MAINTAINER= adridg@FreeBSD.org COMMENT= Phonetics by Computer LICENSE= GPLv2 LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libjack.so:audio/jack \ libasound.so:audio/alsa-lib USES= compiler:c++11-lang dos2unix gnome iconv pkgconfig -USE_GNOME= cairo gdkpixbuf2 gtk20 +USE_GNOME= cairo gdkpixbuf2 gtk30 USE_GITHUB= yes +USE_XORG= x11 DOS2UNIX_REGEX= .*Makefile PLIST_FILES= bin/praat man/man1/praat.1.gz HARDCPPFLAGS= ${WRKSRC}/EEG/Makefile \ ${WRKSRC}/FFNet/Makefile \ ${WRKSRC}/LPC/Makefile \ ${WRKSRC}/artsynth/Makefile \ ${WRKSRC}/dwsys/Makefile \ ${WRKSRC}/dwtools/Makefile \ ${WRKSRC}/external/espeak/Makefile \ ${WRKSRC}/external/flac/Makefile \ ${WRKSRC}/external/gsl/Makefile \ ${WRKSRC}/external/mp3/Makefile \ ${WRKSRC}/fon/Makefile \ ${WRKSRC}/gram/Makefile \ ${WRKSRC}/kar/Makefile \ ${WRKSRC}/main/Makefile \ ${WRKSRC}/melder/Makefile \ ${WRKSRC}/stat/Makefile \ ${WRKSRC}/sys/Makefile post-patch: @${REINPLACE_CMD} -e 's|^CPPFLAGS =|CPPFLAGS +=|' ${HARDCPPFLAGS} @${CP} ${FILESDIR}/makefile.defs.freebsd.alsa \ ${WRKSRC}/makefile.defs @${REINPLACE_CMD} -e 's|%%WRKSRC%%|${WRKSRC}|g' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/makefile.defs @${REINPLACE_CMD} -e 's| log2| NUMlog2|g' \ ${WRKSRC}/dwtools/Sound_extensions.cpp do-install: ${INSTALL_PROGRAM} ${WRKSRC}/praat ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${FILESDIR}/praat.1 ${STAGEDIR}${PREFIX}/man/man1 .include Index: head/audio/praat/distinfo =================================================================== --- head/audio/praat/distinfo (revision 555011) +++ head/audio/praat/distinfo (revision 555012) @@ -1,3 +1,3 @@ -TIMESTAMP = 1603738888 -SHA256 (praat-praat-v6.1.28_GH0.tar.gz) = c5d2d03d37584f5b94d30cd4df7974eec1a8225dd558ef9790f9ff32ba35bcfc -SIZE (praat-praat-v6.1.28_GH0.tar.gz) = 32235134 +TIMESTAMP = 1605223479 +SHA256 (praat-praat-v6.1.31_GH0.tar.gz) = aa2ce29b8b7228d6e39449565e976e6ed3e5670fe7a078662593aea3b0017229 +SIZE (praat-praat-v6.1.31_GH0.tar.gz) = 32235642 Index: head/audio/praat/files/patch-git-dcaf03d1f0d6d12689f604347d169bfc732af69a.diff =================================================================== --- head/audio/praat/files/patch-git-dcaf03d1f0d6d12689f604347d169bfc732af69a.diff (revision 555011) +++ head/audio/praat/files/patch-git-dcaf03d1f0d6d12689f604347d169bfc732af69a.diff (nonexistent) @@ -1,21 +0,0 @@ -From dcaf03d1f0d6d12689f604347d169bfc732af69a Mon Sep 17 00:00:00 2001 -From: David Lukes -Date: Thu, 27 Aug 2020 12:57:27 +0200 -Subject: [PATCH] Fix #199 - ---- - sys/praat.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sys/praat.cpp b/sys/praat.cpp -index 4c359e012..4f57f16b4 100644 ---- sys/praat.cpp -+++ sys/praat.cpp -@@ -1078,6 +1078,7 @@ void praat_init (conststring32 title, int argc, char **argv) - while (praatP.argumentNumber < argc && argv [praatP.argumentNumber] [0] == '-') { - if (strequ (argv [praatP.argumentNumber], "-")) { - praatP.hasCommandLineInput = true; -+ praatP.argumentNumber += 1; - } else if (strequ (argv [praatP.argumentNumber], "--open")) { - foundTheOpenOption = true; - praatP.argumentNumber += 1; Property changes on: head/audio/praat/files/patch-git-dcaf03d1f0d6d12689f604347d169bfc732af69a.diff ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/praat/files/makefile.defs.freebsd.alsa =================================================================== --- head/audio/praat/files/makefile.defs.freebsd.alsa (revision 555011) +++ head/audio/praat/files/makefile.defs.freebsd.alsa (revision 555012) @@ -1,32 +1,32 @@ # $FreeBSD$ # File: makefile.defs.linux.alsa # System: Linux # Paul Boersma, 23 March 2020 # J Bacon, 24 April 2020 CC ?= gcc CXX ?= g++ # -DALSA or -DJACK: Use ALSA or Jack audio in pa_unix_hostapis.c -COMMONFLAGS = -DUNIX -Dlinux -DALSA -D_FILE_OFFSET_BITS=64 `pkg-config --cflags gtk+-2.0` -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -pthread +COMMONFLAGS = -DUNIX -Dlinux -DALSA -D_FILE_OFFSET_BITS=64 `pkg-config --cflags gtk+-3.0` -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -pthread CFLAGS = -DHAVE_SYS_SOUNDCARD_H -std=gnu99 $(COMMONFLAGS) -Werror=implicit CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow -DHAVE_SYS_SOUNDCARD_H -Werror=implicit -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%%/melder -I%%WRKSRC%%/external/espeak -I%%WRKSRC%%/external/flac -I%%WRKSRC%%/external/mp3 -I%%WRKSRC%%/external/gsl -I%%WRKSRC%%/external/clapack -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/unicode LINK ?= $(CXX) EXECUTABLE = praat -LIBS = `pkg-config --libs gtk+-2.0` -L%%LOCALBASE%%/lib -lasound -lm -lpthread -ltinfow +LIBS = `pkg-config --libs gtk+-3.0` -L%%LOCALBASE%%/lib -lasound -lm -lpthread -ltinfow -lX11 AR = ar RANLIB = ls ICON = MAIN_ICON = # Replace pa_linux_alsa.o in portaudio/Makefile. # Does not seem necessary anymore. If not, the portaudio patches can probably # be removed as well. # PA_BACKEND = pa_unix_oss.o