Index: head/audio/praat/Makefile =================================================================== --- head/audio/praat/Makefile (revision 557135) +++ head/audio/praat/Makefile (revision 557136) @@ -1,58 +1,65 @@ # $FreeBSD$ PORTNAME= praat DISTVERSIONPREFIX= v -DISTVERSION= 6.1.31 +DISTVERSION= 6.1.35 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 +# These are recommended but I can't tell the difference +# RUN_DEPENDS= CharisSIL>=0:x11-fonts/charis \ +# DoulosSIL>=0:x11-fonts/doulos USES= compiler:c++11-lang dos2unix gnome iconv pkgconfig USE_GNOME= cairo gdkpixbuf2 gtk30 USE_GITHUB= yes USE_XORG= x11 -DOS2UNIX_REGEX= .*Makefile +DOS2UNIX_FILES= \ + fon/Makefile \ + melder/Makefile \ + sys/Makefile \ + EEG/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 557135) +++ head/audio/praat/distinfo (revision 557136) @@ -1,3 +1,3 @@ -TIMESTAMP = 1605223479 -SHA256 (praat-praat-v6.1.31_GH0.tar.gz) = aa2ce29b8b7228d6e39449565e976e6ed3e5670fe7a078662593aea3b0017229 -SIZE (praat-praat-v6.1.31_GH0.tar.gz) = 32235642 +TIMESTAMP = 1607259331 +SHA256 (praat-praat-v6.1.35_GH0.tar.gz) = 60fbd7bb588562f4f9e253e9b3a672351c9d23d465acc2c887db3039b99c104c +SIZE (praat-praat-v6.1.35_GH0.tar.gz) = 32721488 Index: head/audio/praat/files/patch-external_portaudio_Makefile =================================================================== --- head/audio/praat/files/patch-external_portaudio_Makefile (revision 557135) +++ head/audio/praat/files/patch-external_portaudio_Makefile (nonexistent) @@ -1,14 +0,0 @@ ---- external/portaudio/Makefile.orig 2019-11-27 13:52:21 UTC -+++ external/portaudio/Makefile -@@ -3,8 +3,10 @@ - - include ../../makefile.defs - -+PA_BACKEND ?= pa_linux_alsa.o -+ - OBJECTS = \ -- pa_unix_hostapis.o pa_unix_util.o pa_linux_alsa.o pa_jack.o pa_ringbuffer.o \ -+ pa_unix_hostapis.o pa_unix_util.o $(PA_BACKEND) pa_jack.o pa_ringbuffer.o \ - pa_win_hostapis.o pa_win_util.o pa_win_wmme.o pa_win_waveformat.o \ - pa_front.o pa_debugprint.o pa_cpuload.o \ - pa_allocation.o pa_process.o pa_converters.o pa_dither.o \ Property changes on: head/audio/praat/files/patch-external_portaudio_Makefile ___________________________________________________________________ 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/patch-external_portaudio_pa__unix__hostapis.c =================================================================== --- head/audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c (revision 557135) +++ head/audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c (nonexistent) @@ -1,11 +0,0 @@ ---- external/portaudio/pa_unix_hostapis.c.orig 2019-11-26 11:48:46 UTC -+++ external/portaudio/pa_unix_hostapis.c -@@ -64,6 +64,8 @@ PaUtilHostApiInitializer *paHostApiInitializers[] = - #elif defined (JACK) - PaJack_Initialize, - #endif -+ #else -+ PaOSS_Initialize, - #endif - 0 /* NULL terminated array */ - }; Property changes on: head/audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c ___________________________________________________________________ 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 557135) +++ head/audio/praat/files/makefile.defs.freebsd.alsa (revision 557136) @@ -1,32 +1,28 @@ # $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+-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+-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