diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2008-06-18 11:16:09 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2008-06-18 11:16:09 +0000 |
| commit | ad8f8951946bee6256b27b437f5cfc19fe6c960f (patch) | |
| tree | c4edbd9eff4ebbe3bfbe2d6e5e6efaa7c0ea1545 /comms/cutecom | |
| parent | d61b285330d1d406d0ba30a4a6c6d2f2f0d60319 (diff) | |
| download | ports-ad8f8951946bee6256b27b437f5cfc19fe6c960f.tar.gz ports-ad8f8951946bee6256b27b437f5cfc19fe6c960f.zip | |
Change request: comms/cutecom
Updates to comms/cutecomm:
1. Update source version from 0.14.1 to 0.14.2
2. Add #include <sys/params.h> 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)
PR: ports/122804
Submitted by: Jason Bacon <jwbacon@tds.net>
Approved by: maintainer timeout
Notes
Notes:
svn path=/head/; revision=215061
Diffstat (limited to 'comms/cutecom')
| -rw-r--r-- | comms/cutecom/Makefile | 3 | ||||
| -rw-r--r-- | comms/cutecom/distinfo | 6 | ||||
| -rw-r--r-- | comms/cutecom/files/patch-qcppdialogimpl.cpp | 28 |
3 files changed, 24 insertions, 13 deletions
diff --git a/comms/cutecom/Makefile b/comms/cutecom/Makefile index 003e35deff6f..086df4b318a7 100644 --- a/comms/cutecom/Makefile +++ b/comms/cutecom/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= cutecom -PORTVERSION= 0.14.1 -PORTREVISION= 2 +PORTVERSION= 0.14.2 CATEGORIES= comms MASTER_SITES= http://cutecom.sourceforge.net/ diff --git a/comms/cutecom/distinfo b/comms/cutecom/distinfo index f201927c6a8c..542eb4a350d4 100644 --- a/comms/cutecom/distinfo +++ b/comms/cutecom/distinfo @@ -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 --git a/comms/cutecom/files/patch-qcppdialogimpl.cpp b/comms/cutecom/files/patch-qcppdialogimpl.cpp index 404926922ba6..9e970a2c7e39 100644 --- a/comms/cutecom/files/patch-qcppdialogimpl.cpp +++ b/comms/cutecom/files/patch-qcppdialogimpl.cpp @@ -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 <sys/time.h> + #include <sys/types.h> + #include <sys/select.h> ++#include <sys/param.h> + #include <fcntl.h> + + 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; |