From owner-svn-ports-all@FreeBSD.ORG Mon May 11 11:57:29 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6661CBA2; Mon, 11 May 2015 11:57:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3CB4E171A; Mon, 11 May 2015 11:57:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4BBvTIY008043; Mon, 11 May 2015 11:57:29 GMT (envelope-from db@FreeBSD.org) Received: (from db@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4BBvSJ3008041; Mon, 11 May 2015 11:57:28 GMT (envelope-from db@FreeBSD.org) Message-Id: <201505111157.t4BBvSJ3008041@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: db set sender to db@FreeBSD.org using -f From: Diane Bruce Date: Mon, 11 May 2015 11:57:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386073 - in head/comms/fldigi: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2015 11:57:29 -0000 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@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@