Date: Fri, 29 Mar 2013 21:28:16 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315575 - in head/comms/fldigi: . files Message-ID: <201303292128.r2TLSGjb044485@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Fri Mar 29 21:28:15 2013 New Revision: 315575 URL: http://svnweb.freebsd.org/changeset/ports/315575 Log: - trim header - change to new options framework for docs - change default tty to ttyu from ttyd - fix warning with retval while here - fix build on FreeBSD-10 - clean up tiny warning in xml code Added: head/comms/fldigi/files/patch-src_misc_configuration.cxx (contents, props changed) head/comms/fldigi/files/patch-src_throb_throb.cxx (contents, props changed) head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcDispatch.cpp (contents, props changed) Modified: head/comms/fldigi/Makefile Modified: head/comms/fldigi/Makefile ============================================================================== --- head/comms/fldigi/Makefile Fri Mar 29 21:20:37 2013 (r315574) +++ head/comms/fldigi/Makefile Fri Mar 29 21:28:15 2013 (r315575) @@ -1,12 +1,8 @@ -# New ports collection makefile for: fldigi -# Date created: December 20 2006 -# Whom: Diane Bruce <db@db.net> -# # $FreeBSD$ -# PORTNAME= fldigi PORTVERSION= 3.21.59 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= http://www.w1hkj.com/downloads/fldigi/\ ${MASTER_SITE_LOCAL} @@ -124,7 +120,7 @@ post-configure: ${RM} ${WRKSRC}/doc/*.1 post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${ECHO} "" ${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} Added: head/comms/fldigi/files/patch-src_misc_configuration.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_misc_configuration.cxx Fri Mar 29 21:28:15 2013 (r315575) @@ -0,0 +1,30 @@ +--- src/misc/configuration.cxx.orig 2013-03-28 08:57:53.000000000 -0500 ++++ src/misc/configuration.cxx 2013-03-28 08:59:54.000000000 -0500 +@@ -901,8 +901,6 @@ + + void configuration::testCommPorts() + { +- int retval; +- + inpTTYdev->clear(); + inpRIGdev->clear(); + inpXmlRigDevice->clear(); +@@ -919,6 +917,7 @@ + #endif + + #ifdef __linux__ ++ int retval; + bool ret = false; + DIR* sys = NULL; + char cwd[PATH_MAX] = { '.', '\0' }; +@@ -965,9 +964,7 @@ + "/dev/ttyS%u", + "/dev/ttyUSB%u", + "/dev/usb/ttyUSB%u" +-#elif defined(__FreeBSD__) +- "/dev/ttyd%u" +-#elif defined(__OpenBSD__) || defined(__NetBSD__) ++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) + "/dev/tty%2.2u" + #elif defined(__CYGWIN__) + "/dev/ttyS%u" Added: head/comms/fldigi/files/patch-src_throb_throb.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_throb_throb.cxx Fri Mar 29 21:28:15 2013 (r315575) @@ -0,0 +1,20 @@ +--- src/throb/throb.cxx.orig 2013-03-28 13:27:03.683043974 -0400 ++++ src/throb/throb.cxx 2013-03-28 13:27:55.988221471 -0400 +@@ -37,6 +37,8 @@ + #include "fl_digi.h" + #include "status.h" + ++#define MAX_TONES 15 // Highest used I noticed was 11 ++ + #undef CLAMP + #define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x))) + +@@ -410,7 +412,7 @@ + + void throb::rx(complex in) + { +- complex rxword[num_tones]; ++ complex rxword[MAX_TONES]; + int i, tone1, tone2, maxtone; + + symbol[symptr] = in; Added: head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcDispatch.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcDispatch.cpp Fri Mar 29 21:28:15 2013 (r315575) @@ -0,0 +1,12 @@ +--- src/xmlrpcpp/XmlRpcDispatch.cpp.orig 2013-03-28 09:09:49.000000000 -0500 ++++ src/xmlrpcpp/XmlRpcDispatch.cpp 2013-03-28 09:10:13.000000000 -0500 +@@ -10,7 +10,9 @@ + + #include <errno.h> + #include <math.h> ++#ifdef USE_FTIME + #include <sys/timeb.h> ++#endif + + #if defined(_WINDOWS) + # include <winsock2.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303292128.r2TLSGjb044485>