svn commit: r557187 - in head/audio/praat: . files
Adriaan de Groot
adridg at FreeBSD.org
Sun Dec 6 23:40:39 UTC 2020
Author: adridg
Date: Sun Dec 6 23:40:38 2020
New Revision: 557187
URL: https://svnweb.freebsd.org/changeset/ports/557187
Log:
Simplify both the patches and the Makefile.
Remove various patches and bodges that have since landed upstream.
Modified:
head/audio/praat/Makefile
head/audio/praat/files/makefile.defs.freebsd.alsa
Modified: head/audio/praat/Makefile
==============================================================================
--- head/audio/praat/Makefile Sun Dec 6 23:36:41 2020 (r557186)
+++ head/audio/praat/Makefile Sun Dec 6 23:40:38 2020 (r557187)
@@ -3,6 +3,7 @@
PORTNAME= praat
DISTVERSIONPREFIX= v
DISTVERSION= 6.1.35
+PORTREVISION= 1
CATEGORIES= audio science
MAINTAINER= adridg at FreeBSD.org
@@ -17,7 +18,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
# RUN_DEPENDS= CharisSIL>=0:x11-fonts/charis \
# DoulosSIL>=0:x11-fonts/doulos
-USES= compiler:c++11-lang dos2unix gnome iconv pkgconfig
+USES= compiler:c++11-lang dos2unix gnome iconv pkgconfig xorg
USE_GNOME= cairo gdkpixbuf2 gtk30
USE_GITHUB= yes
USE_XORG= x11
@@ -30,33 +31,12 @@ DOS2UNIX_FILES= \
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}
+ @${REINPLACE_CMD} -e 's|^CPPFLAGS =|CPPFLAGS +=|' \
+ ${WRKSRC}/*/Makefile \
+ ${WRKSRC}/external/*/Makefile
@${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
Modified: head/audio/praat/files/makefile.defs.freebsd.alsa
==============================================================================
--- head/audio/praat/files/makefile.defs.freebsd.alsa Sun Dec 6 23:36:41 2020 (r557186)
+++ head/audio/praat/files/makefile.defs.freebsd.alsa Sun Dec 6 23:40:38 2020 (r557187)
@@ -1,25 +1,36 @@
# $FreeBSD$
-# File: makefile.defs.linux.alsa
+# File: makefile.defs.freebsd.alsa
-# System: Linux
+# System: FreeBSD
# Paul Boersma, 23 March 2020
# J Bacon, 24 April 2020
+# Adriaan de Groot, 30 September 2020
-CC ?= gcc
-CXX ?= g++
+# Where external / third-party software is installed; needs to be
+# added to include and linker paths. (In the FreeBSD ports system,
+# this is already set so nothing is overridden)
+LOCALBASE ?= /usr/local
+# FreeBSD defaults to clang, not gcc
+CC ?= cc
+CXX ?= c++
+LINK ?= $(CXX)
+
# -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
+AUDIO=-DALSA
+# FreeBSD pretends to be Linux for most of the code; add CPPFLAGS
+# explicitly because GNU make / gcc uses those preprocessor flags,
+# but clang does not.
+COMMONFLAGS = -DUNIX -Dlinux $(AUDIO) -D_FILE_OFFSET_BITS=64 `pkg-config --cflags gtk+-3.0` -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -pthread $(CPPFLAGS)
+
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
+CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow -DHAVE_SYS_SOUNDCARD_H -Werror=implicit -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
+LIBS = `pkg-config --libs gtk+-3.0` -L$(LOCALBASE)/lib -lasound -lm -lpthread -ltinfow -lX11
AR = ar
RANLIB = ls
More information about the svn-ports-all
mailing list