From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 15 23:10:04 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F3FE51065674 for ; Tue, 15 Apr 2008 23:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D02C38FC18 for ; Tue, 15 Apr 2008 23:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m3FNA3hI085700 for ; Tue, 15 Apr 2008 23:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m3FNA3lT085699; Tue, 15 Apr 2008 23:10:03 GMT (envelope-from gnats) Resent-Date: Tue, 15 Apr 2008 23:10:03 GMT Resent-Message-Id: <200804152310.m3FNA3lT085699@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jason Bacon Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A7C01065673 for ; Tue, 15 Apr 2008 23:08:59 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 68DB58FC13 for ; Tue, 15 Apr 2008 23:08:59 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m3FN8o3n007162 for ; Tue, 15 Apr 2008 23:08:50 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m3FN8o2a007161; Tue, 15 Apr 2008 23:08:50 GMT (envelope-from nobody) Message-Id: <200804152308.m3FN8o2a007161@www.freebsd.org> Date: Tue, 15 Apr 2008 23:08:50 GMT From: Jason Bacon To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/122804: Change request: comms/cutecom X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2008 23:10:04 -0000 >Number: 122804 >Category: ports >Synopsis: Change request: comms/cutecom >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Apr 15 23:10:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Jason Bacon >Release: 7.0-RELEASE >Organization: More Robotics >Environment: 10:35:36 UTC 2008 root@driscoll.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Updates to comms/cutecomm: 1. Update source version from 0.14.1 to 0.14.2 2. Add #include so that __FreeBSD_version is detected correctly. 3. Add USB-serial devices /dev/cuaU0 and /dev/cuaU1 to default device list. 4. Make default device sensitive to OS version. (cuad for 6 and later) >How-To-Repeat: NA. >Fix: See attached diff. Patch attached with submission follows: diff -ruN /usr/ports/comms/cutecom/Makefile cutecom/Makefile --- /usr/ports/comms/cutecom/Makefile 2007-05-19 15:00:51.000000000 -0500 +++ cutecom/Makefile 2008-04-15 17:37:52.000000000 -0500 @@ -5,8 +5,7 @@ # $FreeBSD: ports/comms/cutecom/Makefile,v 1.10 2007/05/19 20:00:51 flz Exp $ PORTNAME= cutecom -PORTVERSION= 0.14.1 -PORTREVISION= 1 +PORTVERSION= 0.14.2 CATEGORIES= comms MASTER_SITES= http://cutecom.sourceforge.net/ diff -ruN /usr/ports/comms/cutecom/distinfo cutecom/distinfo --- /usr/ports/comms/cutecom/distinfo 2006-12-19 18:51:31.000000000 -0600 +++ cutecom/distinfo 2008-04-15 17:38:05.000000000 -0500 @@ -1,3 +1,3 @@ -MD5 (cutecom-0.14.1.tar.gz) = 6e6057b82cbe086806c6d66a1b48c753 -SHA256 (cutecom-0.14.1.tar.gz) = f7ec7b8a1b8b7de9ac668b4bef2b6ef5e9ea03ca978859c7b4c6ff9275b95751 -SIZE (cutecom-0.14.1.tar.gz) = 21970 +MD5 (cutecom-0.14.2.tar.gz) = d7a1028e0a0f5ce800c3519f7461c157 +SHA256 (cutecom-0.14.2.tar.gz) = e8b9ed594b219bccaf3d79ded78f379edb377a5cd2a168032ea98a6f227ba138 +SIZE (cutecom-0.14.2.tar.gz) = 22682 diff -ruN /usr/ports/comms/cutecom/files/patch-qcppdialogimpl.cpp cutecom/files/patch-qcppdialogimpl.cpp --- /usr/ports/comms/cutecom/files/patch-qcppdialogimpl.cpp 2005-06-09 18:12:12.000000000 -0500 +++ cutecom/files/patch-qcppdialogimpl.cpp 2008-04-15 17:43:59.000000000 -0500 @@ -1,14 +1,22 @@ ---- qcppdialogimpl.cpp.orig Thu Jun 9 21:43:44 2005 -+++ qcppdialogimpl.cpp Thu Jun 9 23:26:47 2005 -@@ -217,11 +217,23 @@ +--- qcppdialogimpl.cpp.orig 2008-03-10 17:53:45.000000000 -0500 ++++ qcppdialogimpl.cpp 2008-04-15 17:43:27.000000000 -0500 +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + #include + + void millisleep(int ms) +@@ -234,11 +235,27 @@ bool entryFound=false; QStringList devices=settings.readListEntry("/cutecom/AllDevices", &entryFound); if (!entryFound) +#ifdef __FreeBSD__ +#if __FreeBSD_version < 600000 -+ devices<<"/dev/cuaa0"<<"/dev/cuaa1"<<"/dev/cuaa2"<<"/dev/cuaa3"; ++ devices<<"/dev/cuaa0"<<"/dev/cuaa1"<<"/dev/cuaa2"<<"/dev/cuaa3"<<"/dev/cuaU0"<<"/dev/cuaU1"; +#else -+ devices<<"/dev/cuad0"<<"/dev/cuad1"<<"/dev/cuad2"<<"/dev/cuad3"; ++ devices<<"/dev/cuad0"<<"/dev/cuad1"<<"/dev/cuad2"<<"/dev/cuad3"<<"/dev/cuaU0"<<"/dev/cuaU1"; +#endif +#else devices<<"/dev/ttyS0"<<"/dev/ttyS1"<<"/dev/ttyS2"<<"/dev/ttyS3"; @@ -17,14 +25,18 @@ m_deviceCb->insertStringList(devices); +#ifdef __FreeBSD__ ++#if __FreeBSD_version < 600000 + m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", "/dev/cuaa0")); +#else ++ m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", "/dev/cuad0")); ++#endif ++#else m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", "/dev/ttyS0")); +#endif QStringList history=settings.readListEntry("/cutecom/History"); -@@ -326,7 +338,7 @@ +@@ -350,7 +367,7 @@ m_sz->addArgument("sh"); m_sz->addArgument("-c"); // QString tmp=QString("sx -vv \"")+filename+"\" < "+m_deviceCb->currentText()+" > "+m_deviceCb->currentText(); @@ -33,7 +45,7 @@ if (m_protoPb->currentText()=="XModem") tmp+="--xmodem "; else if (m_protoPb->currentText()=="YModem") -@@ -445,7 +457,7 @@ +@@ -472,7 +489,7 @@ void QCPPDialogImpl::sendDone() { @@ -42,7 +54,7 @@ } bool QCPPDialogImpl::eventFilter(QObject* watched, QEvent *e) -@@ -885,15 +897,21 @@ +@@ -915,15 +932,21 @@ case 230400: _baud=B230400; break; >Release-Note: >Audit-Trail: >Unformatted: