Index: audio/praat/Makefile =================================================================== --- audio/praat/Makefile (revision 412912) +++ audio/praat/Makefile (working copy) @@ -4,7 +4,7 @@ PORTNAME= praat PORTVERSION= 5.4.08 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio science MAINTAINER= bacon4000@gmail.com @@ -19,8 +19,6 @@ USE_GNOME= gtk20 MAKEFILE= makefile PLIST_FILES= bin/praat man/man1/praat.1.gz -LIB_DEPENDS+= libasound.so:audio/alsa-lib - .include .if ${OSVERSION} < 1000000 Index: audio/praat/files/makefile.defs.freebsd.alsa =================================================================== --- audio/praat/files/makefile.defs.freebsd.alsa (revision 412912) +++ audio/praat/files/makefile.defs.freebsd.alsa (working copy) @@ -8,17 +8,18 @@ CC ?= gcc CXX ?= g++ -CFLAGS = -std=gnu99 -DUNIX -Dlinux -DALSA `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 +CFLAGS = -std=gnu99 -DUNIX -Dlinux -DHAVE_SYS_SOUNDCARD_H `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -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 +CXXFLAGS = -std=gnu++11 -Wshadow -DUNIX -Dlinux -DHAVE_SYS_SOUNDCARD_H `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) EXECUTABLE = praat -LIBS = `pkg-config --libs gtk+-2.0` -L%%LOCALBASE%%/lib -lm -lasound -lpthread -ltinfow +LIBS = `pkg-config --libs gtk+-2.0` -L%%LOCALBASE%%/lib -lm -lpthread -ltinfow AR = ar RANLIB = ls ICON = MAIN_ICON = +PA_BACKEND = pa_unix_oss.o Index: audio/praat/files/patch-external_portaudio_Makefile =================================================================== --- audio/praat/files/patch-external_portaudio_Makefile (nonexistent) +++ audio/praat/files/patch-external_portaudio_Makefile (working copy) @@ -0,0 +1,13 @@ +--- external/portaudio/Makefile.orig 2015-05-20 01:47:31 UTC ++++ external/portaudio/Makefile +@@ -3,8 +3,9 @@ + + include ../../makefile.defs + ++PA_BACKEND ?= pa_linux_alsa.o + OBJECTS = \ +- pa_unix_hostapis.o pa_unix_util.o pa_linux_alsa.o \ ++ pa_unix_hostapis.o pa_unix_util.o $(PA_BACKEND) \ + 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: audio/praat/files/patch-external_portaudio_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c =================================================================== --- audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c (nonexistent) +++ audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c (working copy) @@ -0,0 +1,11 @@ +--- external/portaudio/pa_unix_hostapis.c.orig 2015-05-20 01:47:31 UTC ++++ external/portaudio/pa_unix_hostapis.c +@@ -60,6 +60,8 @@ PaUtilHostApiInitializer *paHostApiIniti + { + #if defined (linux) && defined (ALSA) + PaAlsa_Initialize, // ppgb ++ #else ++ PaOSS_Initialize, + #endif + 0 /* NULL terminated array */ + }; Property changes on: audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property