aboutsummaryrefslogtreecommitdiff
path: root/comms/wspr
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2015-05-30 20:39:12 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2015-05-30 20:39:12 +0000
commit3fef6c52f0fc4ef44d16f7c2f73fab20c9c251e5 (patch)
treec6487f309b5d29e868c4ea46df98e320c50df957 /comms/wspr
parent0b206685de74445cde7f184f18a43c7ac16172a6 (diff)
Update portaudio to v19/Remove portaudio2 [1]
Chase portaudio change Add patches from debian for games/cultivation Add patches from upsteam for audio/rezound Mark py-fastaudio as broken Approved by: maintainer
Notes
Notes: svn path=/head/; revision=387982
Diffstat (limited to 'comms/wspr')
-rw-r--r--comms/wspr/Makefile8
-rw-r--r--comms/wspr/files/patch-configure.ac29
2 files changed, 4 insertions, 33 deletions
diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index 3872e3435f51..22ca2fd9075b 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wspr
DISTVERSION= ${VERSION}.r${SVN_REV}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= comms hamradio
MASTER_SITES= LOCAL/db
DISTNAME= wspr-r${SVN_REV}
@@ -15,11 +15,11 @@ LICENSE= GPLv3
BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS= ${PYTHON_LIBDIR}/tkinter:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_SITELIBDIR}/PIL:${PORTSDIR}/graphics/py-pillow \
- ${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
- ${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2
+ ${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy
LIB_DEPENDS= libhamlib.so:${PORTSDIR}/comms/hamlib \
libfftw3f.so:${PORTSDIR}/math/fftw3-float \
- libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+ libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
+ libportaudio.so:${PORTSDIR}/audio/portaudio
DISABLE_MAKE_JOBS= yes
USE_AUTOTOOLS= autoconf
diff --git a/comms/wspr/files/patch-configure.ac b/comms/wspr/files/patch-configure.ac
index bebfbecc3bd6..30083fff3d46 100644
--- a/comms/wspr/files/patch-configure.ac
+++ b/comms/wspr/files/patch-configure.ac
@@ -150,35 +150,6 @@
FCV=gnu95
FC_LIB_PATH=`${FC} -print-file-name=`
AC_DEFINE_UNQUOTED([FC_LIB_PATH], ["${FC_LIB_PATH}"], [Path to Gfortran libs.])
-@@ -266,12 +300,27 @@
- dnl ----------------------------------------------------------------------------
- dnl check portaudio
- dnl ----------------------------------------------------------------------------
-+#
-+# This unpleasant hack due to FreeBSD supporting both portaudio2 (v19+)
-+# and older portaudio. Many programs depend on older. Sorry :-( - db
-+#
-+
-+case "${host_os}" in
-+ *freebsd* )
-+ AC_SUBST([PORTAUDIO_INCLUDE], ["-I/usr/local/include/portaudio2"])
-+ AC_SUBST([PORTAUDIO_LIBDIR], ["-L/usr/local/lib/portaudio2"])
-+ LDFLAGS="-L/usr/local/lib/portaudio2 ${LDFLAGS}"
-+ ;;
-+ *)
-+ ;;
-+esac
-
- AC_CHECK_LIB([portaudio], [Pa_Initialize], [], [])
- if test "$ac_cv_lib_portaudio_Pa_Initialize" = "yes"; then
-- LIBS="-lportaudio ${LIBS}"
-+ LIBS="-lportaudio ${LIBS}"
- fi
-
-+
- # if headers and libs found, set define
- if test "$ac_cv_header_portaudio_h" = "yes" -a "$ac_cv_lib_portaudio_Pa_Initialize" = "yes"; then
- HAVE_PORTAUDIO=1
@@ -279,7 +328,6 @@
AC_DEFINE([HAVE_PORTAUDIO_LIB], [1], [Portaudio Lib])
fi