svn commit: r386073 - in head/comms/fldigi: . files

[Diane Bruce]

Author: db
Date: Mon May 11 11:57:28 2015
New Revision: 386073
URL: https://svnweb.freebsd.org/changeset/ports/386073

Log:
  Get portaudio2 dependencies right since libs are not in ${LOCALBASE}/lib
  Clean up LOCAL slightly

Modified:
  head/comms/fldigi/Makefile
  head/comms/fldigi/files/patch-Makefile.in   (contents, props changed)

Modified: head/comms/fldigi/Makefile
==============================================================================
--- head/comms/fldigi/Makefile	Mon May 11 11:55:55 2015	(r386072)
+++ head/comms/fldigi/Makefile	Mon May 11 11:57:28 2015	(r386073)
@@ -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 at 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

Modified: head/comms/fldigi/files/patch-Makefile.in
==============================================================================
--- head/comms/fldigi/files/patch-Makefile.in	Mon May 11 11:55:55 2015	(r386072)
+++ head/comms/fldigi/files/patch-Makefile.in	Mon May 11 11:57:28 2015	(r386073)
@@ -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@