aboutsummaryrefslogtreecommitdiffstats
path: root/comms
diff options
context:
space:
mode:
authordb <db@FreeBSD.org>2015-05-11 19:57:28 +0800
committerdb <db@FreeBSD.org>2015-05-11 19:57:28 +0800
commit5e85c22b670c946b78ec912199b74723546e3a09 (patch)
tree04dcd19568a7bfe5146124d3331d0bb39088d4b4 /comms
parent7fc5114aad4672e2b0cdb384a8a71f9389f8a9d5 (diff)
downloadfreebsd-ports-gnome-5e85c22b670c946b78ec912199b74723546e3a09.tar.gz
freebsd-ports-gnome-5e85c22b670c946b78ec912199b74723546e3a09.tar.zst
freebsd-ports-gnome-5e85c22b670c946b78ec912199b74723546e3a09.zip
Get portaudio2 dependencies right since libs are not in ${LOCALBASE}/lib
Clean up LOCAL slightly
Diffstat (limited to 'comms')
-rw-r--r--comms/fldigi/Makefile7
-rw-r--r--comms/fldigi/files/patch-Makefile.in2
2 files changed, 4 insertions, 5 deletions
diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 7f883b9270b0..e7d9d6753676 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 3.22.08
PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://www.w1hkj.com/downloads/fldigi/\
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= shurd
+ LOCAL/shurd
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Digital decoder for psk, cw, psk31, olivia
@@ -48,8 +47,8 @@ OSS_CONFIGURE_ENABLE= oss
SNDFILE_CONFIGURE_WITH= sndfile
SNDFILE_LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile
PORTAUDIO_CONFIGURE_WITH= portaudio
-PORTAUDIO_BUILD_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio2
-PORTAUDIO_RUN_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_BUILD_DEPENDS= ${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_RUN_DEPENDS= ${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2
PULSEAUDIO_CONFIGURE_WITH= pulseaudio
PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
HAMLIB_CONFIGURE_WITH= hamlib
diff --git a/comms/fldigi/files/patch-Makefile.in b/comms/fldigi/files/patch-Makefile.in
index 5b771480a214..ed3a7f9a879c 100644
--- a/comms/fldigi/files/patch-Makefile.in
+++ b/comms/fldigi/files/patch-Makefile.in
@@ -5,7 +5,7 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = "-I/usr/local/include/portaudio2 @CPPFLAGS@"
++CPPFLAGS = "-I%%LOCALBASE%%/include/portaudio2 @CPPFLAGS@"
CXX = @CXX@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@