Index: head/comms/fldigi/Makefile =================================================================== --- head/comms/fldigi/Makefile (revision 386072) +++ head/comms/fldigi/Makefile (revision 386073) @@ -1,91 +1,90 @@ # $FreeBSD$ PORTNAME= fldigi 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 LICENSE= GPLv3 BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconf \ asciidoc:${PORTSDIR}/textproc/asciidoc\ docbook-xsl>=1.0:${PORTSDIR}/textproc/docbook-xsl\ xsltproc:${PORTSDIR}/textproc/libxslt LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ libsamplerate.so:${PORTSDIR}/audio/libsamplerate\ libboost_system.so:${PORTSDIR}/devel/boost-libs\ libfltk.so:${PORTSDIR}/x11-toolkits/fltk USE_CXXSTD= gnu++0x GNU_CONFIGURE= yes USES= gmake pkgconfig compiler:c++11-lib perl5 shebangfix CONFIGURE_ENV= FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" \ EXTRA_LIBS="-lexecinfo" OPTIONS_DEFINE= NATIVE_OPT FLARQ OSS SNDFILE PORTAUDIO PULSEAUDIO HAMLIB NLS DOCS NATIVE_OPT_DESC= Enable Native Optimizations FLARQ_DESC= Compile flarq OSS_DESC= Support OSS SNDFILE_DESC= Support for libsndfile PORTAUDIO_DESC= PortAudio support PULSEAUDIO_DESC= PulseAudio support HAMLIB_DESC= Support rig control via hamlib OPTIONS_DEFAULT= FLARQ OSS HAMLIB OPTIONS_SUB= yes NATIVE_OPT_CONFIGURE_ON= --enable-optimizations=native NATIVE_OPT_CONFIGURE_OFF= --enable-optimizations=none FLARQ_CONFIGURE_ENABLE= flarq 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 HAMLIB_LIB_DEPENDS= libhamlib.so:${PORTSDIR}/comms/hamlib NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext .include .if ${ARCH} == "sparc64" BROKEN= Fails to install .endif .if ${PORT_OPTIONS:MFLARQ} MAN1+= flarq.1 .endif PLIST_SUB+= XMLRPC="" # Always need asciidoc for man pages CONFIGURE_ARGS+=--with-asciidoc post-patch: @${REINPLACE_CMD} -e 's|png_infopp_NULL|NULL|' \ ${WRKSRC}/src/widgets/picture.cxx @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/Makefile.in post-configure: @${REINPLACE_CMD} -e 's|^CPPFLAGS|#CPPFLAGS|' \ ${WRKSRC}/src/Makefile # force rebuild of man pages ${RM} ${WRKSRC}/doc/*.1 post-install: .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${STAGEDIR}${DOCSDIR} .endif .include Index: head/comms/fldigi/files/patch-Makefile.in =================================================================== --- head/comms/fldigi/files/patch-Makefile.in (revision 386072) +++ head/comms/fldigi/files/patch-Makefile.in (revision 386073) @@ -1,11 +1,11 @@ --- Makefile.in.orig 2015-04-24 12:55:28 UTC +++ Makefile.in @@ -145,7 +145,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ 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@ Property changes on: head/comms/fldigi/files/patch-Makefile.in ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property