From owner-svn-ports-head@FreeBSD.ORG Mon May 11 09:31:43 2015 Return-Path: Delivered-To: svn-ports-head@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 B329B4D8; Mon, 11 May 2015 09:31:43 +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 951B71720; Mon, 11 May 2015 09:31:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4B9VhCS035959; Mon, 11 May 2015 09:31:43 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4B9VdCl035939; Mon, 11 May 2015 09:31:39 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201505110931.t4B9VdCl035939@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd Date: Mon, 11 May 2015 09:31:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386058 - 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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2015 09:31:43 -0000 Author: shurd Date: Mon May 11 09:31:38 2015 New Revision: 386058 URL: https://svnweb.freebsd.org/changeset/ports/386058 Log: Add patch to fix OSS support (bump PORTREVISION) Switch to Options-NG. Use makepatch for patchs. PR: 200039 Submitted by: takefu@airport.fm Added: head/comms/fldigi/files/patch-src_dialogs_fl__digi.cxx (contents, props changed) head/comms/fldigi/files/patch-src_include_data__io.h (contents, props changed) head/comms/fldigi/files/patch-src_misc_newinstall.cxx (contents, props changed) head/comms/fldigi/files/patch-src_soundcard_sound.cxx (contents, props changed) head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcBase64.h (contents, props changed) Deleted: head/comms/fldigi/files/patch-misc_newinstall.cxx head/comms/fldigi/files/patch-src_data_io.h head/comms/fldigi/files/patch-src_dialogs_fl_digi.cxx head/comms/fldigi/files/patch-src_xmrpcpp_XmlRpcBase64.h Modified: head/comms/fldigi/Makefile head/comms/fldigi/files/patch-Makefile.in head/comms/fldigi/files/patch-src_dominoex_dominoex.cxx (contents, props changed) head/comms/fldigi/files/patch-src_include_qrunner.h head/comms/fldigi/files/patch-src_logbook_lookupcall.cxx (contents, props changed) head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx (contents, props changed) head/comms/fldigi/files/patch-src_spot_pskrep.cxx head/comms/fldigi/files/patch-src_thor_thor.cxx head/comms/fldigi/files/patch-src_wefax_wefax.cxx Modified: head/comms/fldigi/Makefile ============================================================================== --- head/comms/fldigi/Makefile Mon May 11 09:19:24 2015 (r386057) +++ head/comms/fldigi/Makefile Mon May 11 09:31:38 2015 (r386058) @@ -2,6 +2,7 @@ PORTNAME= fldigi PORTVERSION= 3.22.08 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= http://www.w1hkj.com/downloads/fldigi/\ ${MASTER_SITE_LOCAL} @@ -38,64 +39,33 @@ 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 +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:MNATIVE_OPT} -CONFIGURE_ARGS+=--enable-optimizations=native -.else -CONFIGURE_ARGS+=--enable-optimizations=none -.endif .if ${PORT_OPTIONS:MFLARQ} -CONFIGURE_ARGS+=--enable-flarq MAN1+= flarq.1 -PLIST_SUB+= FLARQ="" -.else -CONFIGURE_ARGS+=--disable-flarq -PLIST_SUB+= FLARQ="@comment " .endif PLIST_SUB+= XMLRPC="" -.if ${PORT_OPTIONS:MOSS} -CONFIGURE_ARGS+=--enable-oss -.else -CONFIGURE_ARGS+=--disable-oss -.endif -.if ${PORT_OPTIONS:MSNDFILE} -CONFIGURE_ARGS+=--with-sndfile -LIB_DEPENDS+= libsndfile.so:${PORTSDIR}/audio/libsndfile -.else -CONFIGURE_ARGS+=--without-sndfile -.endif -.if ${PORT_OPTIONS:MPORTAUDIO} -CONFIGURE_ARGS+=--with-portaudio -BUILD_DEPENDS+= ${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 -RUN_DEPENDS+= ${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 -.else -CONFIGURE_ARGS+=--without-portaudio -.endif -.if ${PORT_OPTIONS:MPULSEAUDIO} -CONFIGURE_ARGS+=--with-pulseaudio -LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio -.else -CONFIGURE_ARGS+=--without-pulseaudio -.endif -.if ${PORT_OPTIONS:MHAMLIB} -CONFIGURE_ARGS+=--with-hamlib -LIB_DEPENDS+= libhamlib.so:${PORTSDIR}/comms/hamlib -.else -CONFIGURE_ARGS+=--without-hamlib -.endif -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif # Always need asciidoc for man pages CONFIGURE_ARGS+=--with-asciidoc Modified: head/comms/fldigi/files/patch-Makefile.in ============================================================================== --- head/comms/fldigi/files/patch-Makefile.in Mon May 11 09:19:24 2015 (r386057) +++ head/comms/fldigi/files/patch-Makefile.in Mon May 11 09:31:38 2015 (r386058) @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2013-02-08 22:19:37.000000000 -0500 -+++ Makefile.in 2013-03-31 19:02:18.000000000 -0500 -@@ -145,7 +145,7 @@ +--- 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%%LOCALBASE%%/include/portaudio2 @CPPFLAGS@" ++CPPFLAGS = "-I/usr/local/include/portaudio2 @CPPFLAGS@" CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ Added: head/comms/fldigi/files/patch-src_dialogs_fl__digi.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_dialogs_fl__digi.cxx Mon May 11 09:31:38 2015 (r386058) @@ -0,0 +1,10 @@ +--- src/dialogs/fl_digi.cxx.orig 2015-04-23 11:39:24 UTC ++++ src/dialogs/fl_digi.cxx +@@ -26,6 +26,7 @@ + #include + + #include ++#include + + #ifdef __WOE32__ + # ifdef __CYGWIN__ Modified: head/comms/fldigi/files/patch-src_dominoex_dominoex.cxx ============================================================================== --- head/comms/fldigi/files/patch-src_dominoex_dominoex.cxx Mon May 11 09:19:24 2015 (r386057) +++ head/comms/fldigi/files/patch-src_dominoex_dominoex.cxx Mon May 11 09:31:38 2015 (r386058) @@ -1,6 +1,6 @@ ---- src/dominoex/dominoex.cxx.orig 2014-03-21 11:25:57.000000000 -0500 -+++ src/dominoex/dominoex.cxx 2014-03-21 18:19:42.000000000 -0500 -@@ -63,7 +63,7 @@ +--- src/dominoex/dominoex.cxx.orig 2015-04-22 15:17:06 UTC ++++ src/dominoex/dominoex.cxx +@@ -63,7 +63,7 @@ void dominoex::tx_init(SoundBase *sc) strSecXmtText = progdefaults.secText; if (strSecXmtText.length() == 0) Added: head/comms/fldigi/files/patch-src_include_data__io.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_include_data__io.h Mon May 11 09:31:38 2015 (r386058) @@ -0,0 +1,11 @@ +--- src/include/data_io.h.orig 2015-04-18 13:26:19 UTC ++++ src/include/data_io.h +@@ -27,6 +27,8 @@ + #ifndef fldigi_data_io_h + #define fldigi_data_io_h + ++#include // For time_t ++ + #define DEFAULT_ARQ_IP_ADDRESS "127.0.0.1" + #define DEFAULT_ARQ_IP_PORT "7322" + Modified: head/comms/fldigi/files/patch-src_include_qrunner.h ============================================================================== --- head/comms/fldigi/files/patch-src_include_qrunner.h Mon May 11 09:19:24 2015 (r386057) +++ head/comms/fldigi/files/patch-src_include_qrunner.h Mon May 11 09:31:38 2015 (r386058) @@ -1,5 +1,5 @@ ---- src/include/qrunner.h.orig 2014-11-27 01:43:12.000000000 -0800 -+++ src/include/qrunner.h 2014-11-27 01:43:46.000000000 -0800 +--- src/include/qrunner.h.orig 2015-03-21 00:29:03 UTC ++++ src/include/qrunner.h @@ -32,6 +32,7 @@ #include #include Modified: head/comms/fldigi/files/patch-src_logbook_lookupcall.cxx ============================================================================== --- head/comms/fldigi/files/patch-src_logbook_lookupcall.cxx Mon May 11 09:19:24 2015 (r386057) +++ head/comms/fldigi/files/patch-src_logbook_lookupcall.cxx Mon May 11 09:31:38 2015 (r386058) @@ -1,6 +1,6 @@ ---- src/logbook/lookupcall.cxx.orig 2014-03-21 11:25:57.000000000 -0500 -+++ src/logbook/lookupcall.cxx 2014-03-21 18:19:53.000000000 -0500 -@@ -1188,7 +1188,7 @@ +--- src/logbook/lookupcall.cxx.orig 2015-04-23 11:39:24 UTC ++++ src/logbook/lookupcall.cxx +@@ -1188,7 +1188,7 @@ static void *EQSL_loop(void *args) return NULL; size_t p; Added: head/comms/fldigi/files/patch-src_misc_newinstall.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_misc_newinstall.cxx Mon May 11 09:31:38 2015 (r386058) @@ -0,0 +1,11 @@ +--- src/misc/newinstall.cxx.orig 2015-03-21 00:29:03 UTC ++++ src/misc/newinstall.cxx +@@ -84,7 +84,7 @@ Age: \n\ + Rig: \n\ + Pwr: \n\ + Ant: \n\ +-OS: Linux\n\ ++OS: FreeBSD\n\ + Soft: \n\ + Web: \n\ + Email: "; Modified: head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx ============================================================================== --- head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx Mon May 11 09:19:24 2015 (r386057) +++ head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx Mon May 11 09:31:38 2015 (r386058) @@ -1,6 +1,6 @@ ---- src/qrunner/qrunner.cxx.orig 2014-10-14 21:19:37.000000000 -0400 -+++ src/qrunner/qrunner.cxx 2014-10-24 14:39:00.000000000 -0400 -@@ -103,7 +103,7 @@ +--- src/qrunner/qrunner.cxx.orig 2015-03-21 00:29:04 UTC ++++ src/qrunner/qrunner.cxx +@@ -103,7 +103,7 @@ void qrunner::execute(int fd, void *arg) return; qr->inprog = true; Added: head/comms/fldigi/files/patch-src_soundcard_sound.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_soundcard_sound.cxx Mon May 11 09:31:38 2015 (r386058) @@ -0,0 +1,20 @@ +--- src/soundcard/sound.cxx.orig 2015-05-11 09:19:59 UTC ++++ src/soundcard/sound.cxx +@@ -689,7 +689,7 @@ size_t SoundOSS::Read(float *buffer, siz + + for (size_t i = 0; i < buffersize; i++) + buffer[i] = src_buffer[2*i + +- progdefaults.ReverseRxAudio ? 1 : 0]; ++ (progdefaults.ReverseRxAudio ? 1 : 0)]; + + #if USE_SNDFILE + if (capture) +@@ -724,7 +724,7 @@ size_t SoundOSS::Read(float *buffer, siz + + for (int i = 0; i < numread; i++) + buffer[i] = snd_buffer[2*i + +- progdefaults.sig_on_right_channel ? 1 : 0]; ++ (progdefaults.sig_on_right_channel ? 1 : 0)]; + + return numread; + Modified: head/comms/fldigi/files/patch-src_spot_pskrep.cxx ============================================================================== --- head/comms/fldigi/files/patch-src_spot_pskrep.cxx Mon May 11 09:19:24 2015 (r386057) +++ head/comms/fldigi/files/patch-src_spot_pskrep.cxx Mon May 11 09:31:38 2015 (r386058) @@ -1,5 +1,5 @@ ---- src/spot/pskrep.cxx.orig 2014-07-04 15:11:14.000000000 -0700 -+++ src/spot/pskrep.cxx 2014-07-04 15:13:32.000000000 -0700 +--- src/spot/pskrep.cxx.orig 2015-03-21 00:29:04 UTC ++++ src/spot/pskrep.cxx @@ -50,7 +50,7 @@ #include #include Modified: head/comms/fldigi/files/patch-src_thor_thor.cxx ============================================================================== --- head/comms/fldigi/files/patch-src_thor_thor.cxx Mon May 11 09:19:24 2015 (r386057) +++ head/comms/fldigi/files/patch-src_thor_thor.cxx Mon May 11 09:31:38 2015 (r386058) @@ -1,6 +1,6 @@ ---- src/thor/thor.cxx.orig 2013-11-16 11:12:26.140977946 -0500 -+++ src/thor/thor.cxx 2013-11-16 11:13:27.127067530 -0500 -@@ -63,7 +63,7 @@ +--- src/thor/thor.cxx.orig 2015-04-22 15:17:06 UTC ++++ src/thor/thor.cxx +@@ -63,7 +63,7 @@ void thor::tx_init(SoundBase *sc) videoText(); strSecXmtText = progdefaults.THORsecText; if (strSecXmtText.length() == 0) Modified: head/comms/fldigi/files/patch-src_wefax_wefax.cxx ============================================================================== --- head/comms/fldigi/files/patch-src_wefax_wefax.cxx Mon May 11 09:19:24 2015 (r386057) +++ head/comms/fldigi/files/patch-src_wefax_wefax.cxx Mon May 11 09:31:38 2015 (r386058) @@ -1,6 +1,6 @@ ---- src/wefax/wefax.cxx.orig 2013-11-18 09:29:13.581496108 -0500 -+++ src/wefax/wefax.cxx 2013-11-18 09:38:30.354457373 -0500 -@@ -556,7 +556,7 @@ +--- src/wefax/wefax.cxx.orig 2015-04-22 15:17:06 UTC ++++ src/wefax/wefax.cxx +@@ -556,7 +556,7 @@ private: = wf->powerDensity(m_carrier - 2 * m_apt_start_freq, bandwidth_apt_start) + wf->powerDensity(m_carrier - m_apt_start_freq, bandwidth_apt_start) + wf->powerDensity(m_carrier , bandwidth_apt_start) Added: head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcBase64.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcBase64.h Mon May 11 09:31:38 2015 (r386058) @@ -0,0 +1,10 @@ +--- src/xmlrpcpp/XmlRpcBase64.h.orig 2015-04-23 11:39:24 UTC ++++ src/xmlrpcpp/XmlRpcBase64.h +@@ -18,6 +18,7 @@ + #if !defined(__BASE64_H_INCLUDED__) + #define __BASE64_H_INCLUDED__ 1 + ++#include + #include + + static