diff -ruN --exclude=CVS --exclude=.svn /usr/ports/audio/praat/Makefile /usr/wip/audio/praat/Makefile --- /usr/ports/audio/praat/Makefile 2013-09-20 09:36:35.000000000 -0500 +++ /usr/wip/audio/praat/Makefile 2013-11-30 16:43:30.000000000 -0600 @@ -2,37 +2,43 @@ # $FreeBSD: audio/praat/Makefile 327706 2013-09-20 14:36:35Z bapt $ PORTNAME= praat -PORTVERSION= 4.6.39 -PORTREVISION= 3 +PORTVERSION= 5.3.59 CATEGORIES= audio science -MASTER_SITES= http://personalpages.tds.net/~jwbacon/Ports/distfiles/ -DISTNAME= praat4639_sources +MASTER_SITES= http://www.fon.hum.uva.nl/praat/ +DISTNAME= praat5359_sources MAINTAINER= jwbacon@tds.net COMMENT= Phonetics by Computer +LICENSE= GPLv2 + USE_DOS2UNIX= yes -NO_STAGE= yes DOS2UNIX_REGEX= .*Makefile USES= iconv motif -WRKSRC= ${WRKDIR}/sources_4639 +WRKSRC= ${WRKDIR}/sources_5359 MAKEFILE= makefile -PLIST_FILES= bin/praat -MAKE_JOBS_UNSAFE= yes +PLIST_FILES= bin/praat man/man1/praat.1.gz -MAN1= praat.1 +LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib post-patch: - @${REINPLACE_CMD} -e 's/ log2/ NUMlog2/' ${WRKSRC}/dwtools/Sound_extensions.c @${FIND} ${WRKSRC} -name Makefile -exec \ ${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|' "{}" \; - @${REINPLACE_CMD} -e 's/%%ICONV_LIB%%/${ICONV_LIB}/' \ - ${WRKSRC}/makefiles/makefile.defs.freebsd.dynamic - @${CP} ${WRKSRC}/makefiles/makefile.defs.freebsd.dynamic \ + @${FIND} ${WRKSRC} -name Makefile -exec \ + ${REINPLACE_CMD} -e 's|^CPPFLAGS =|CPPFLAGS +=|' "{}" \; + @${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' \ + -e 's|feof (f)|feof (f.get_ptr())|g' \ + -e 's|ferror (f)|ferror (f.get_ptr())|g' \ + ${WRKSRC}/dwtools/Sound_extensions.cpp \ + ${WRKSRC}/fon/Sound_files.cpp do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/praat ${PREFIX}/bin - ${INSTALL_MAN} ${FILESDIR}/praat.1 ${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/praat ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${FILESDIR}/praat.1 ${STAGEDIR}${PREFIX}/man/man1 .include diff -ruN --exclude=CVS --exclude=.svn /usr/ports/audio/praat/distinfo /usr/wip/audio/praat/distinfo --- /usr/ports/audio/praat/distinfo 2012-07-14 07:56:14.000000000 -0500 +++ /usr/wip/audio/praat/distinfo 2013-11-23 11:57:51.000000000 -0600 @@ -1,2 +1,2 @@ -SHA256 (praat4639_sources.tar.gz) = eba69ae300c9e86bea8a6dd69953b4436efb6519fb3ae228a9fe7d9e8cfa0c05 -SIZE (praat4639_sources.tar.gz) = 4928560 +SHA256 (praat5359_sources.tar.gz) = 0a2f27a0052f8197bd85036fa5c19e11b6854f3130a3fb66ad0055939ef6ed55 +SIZE (praat5359_sources.tar.gz) = 6856136 diff -ruN --exclude=CVS --exclude=.svn /usr/ports/audio/praat/files/makefile.defs.freebsd.alsa /usr/wip/audio/praat/files/makefile.defs.freebsd.alsa --- /usr/ports/audio/praat/files/makefile.defs.freebsd.alsa 1969-12-31 18:00:00.000000000 -0600 +++ /usr/wip/audio/praat/files/makefile.defs.freebsd.alsa 2013-11-23 13:44:23.000000000 -0600 @@ -0,0 +1,23 @@ +# File: makefile.defs.linux.alsa + +# System: Linux +# Paul Boersma, 26 October 2013 + +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 + +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 + +LINK ?= $(CXX) + +EXECUTABLE = praat + +LIBS = `pkg-config --libs gtk+-2.0` -L%%LOCALBASE%%/lib -lm -lasound -lpthread -ltinfow + +AR = ar +RANLIB = ls +ICON = +MAIN_ICON = diff -ruN --exclude=CVS --exclude=.svn /usr/ports/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic /usr/wip/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic --- /usr/ports/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic 2013-09-04 13:06:07.000000000 -0500 +++ /usr/wip/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic 1969-12-31 18:00:00.000000000 -0600 @@ -1,14 +0,0 @@ ---- makefiles/makefile.defs.freebsd.dynamic.orig 2007-12-02 15:47:18.000000000 +0200 -+++ makefiles/makefile.defs.freebsd.dynamic 2007-12-02 15:55:05.000000000 +0200 -@@ -3,9 +3,9 @@ - # System: FreeBSD - # Paul Boersma, January 31, 2007 - --CC = gcc -std=gnu99 -DUNIX -Dlinux -I /usr/X11R6/include -Wimplicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O -+CC += -std=gnu99 -DUNIX -Dlinux -I${LOCALBASE}/include -Wimplicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized - --LIBS = /usr/X11R6/lib/libXm.a -L /usr/X11R6/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm -+LIBS = ${LOCALBASE}/lib/libXm.a -L${LOCALBASE}/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm -lpng -ljpeg %%ICONV_LIB%% -lXft - - RANLIB = ls - ICON = diff -ruN --exclude=CVS --exclude=.svn /usr/ports/audio/praat/files/patch-sys-melder.h /usr/wip/audio/praat/files/patch-sys-melder.h --- /usr/ports/audio/praat/files/patch-sys-melder.h 1969-12-31 18:00:00.000000000 -0600 +++ /usr/wip/audio/praat/files/patch-sys-melder.h 2013-11-23 13:15:01.000000000 -0600 @@ -0,0 +1,14 @@ +--- 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 -ruN --exclude=CVS --exclude=.svn /usr/ports/audio/praat/pkg-descr /usr/wip/audio/praat/pkg-descr --- /usr/ports/audio/praat/pkg-descr 2012-07-14 07:56:14.000000000 -0500 +++ /usr/wip/audio/praat/pkg-descr 2013-11-30 16:35:36.000000000 -0600 @@ -1,3 +1,4 @@ -Praat: doing phonetics by computer. +Praat (the Dutch word for "talk") is a free scientific computer software +package for the analysis of speech in phonetics. WWW: http://www.praat.org