From e61f6205b6d5e6ef8d979b0b03a386071ebdd1ae Mon Sep 17 00:00:00 2001 From: Diane Bruce Date: Mon, 11 May 2015 11:57:28 +0000 Subject: [PATCH] Get portaudio2 dependencies right since libs are not in ${LOCALBASE}/lib Clean up LOCAL slightly --- comms/fldigi/Makefile | 7 +++---- comms/fldigi/files/patch-Makefile.in | 2 +- 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@