Attachment 95408 Details for Bug 133788 – cutecom.patch

[patch] cutecom.patch

cutecom.patch (text/x-patch; charset="UTF-8"), 9.17 KB, created by Max Brazhnikov on 2009-04-25 19:30:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Brazhnikov

Created: 2009-04-25 19:30:09 UTC

Size: 9.17 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/comms/cutecom/Makefile,v
>retrieving revision 1.12
>diff -u -r1.12 Makefile
>--- Makefile	18 Jun 2008 11:16:09 -0000	1.12
>+++ Makefile	25 Apr 2009 18:05:53 -0000
>@@ -5,28 +5,20 @@
> # $FreeBSD: ports/comms/cutecom/Makefile,v 1.12 2008/06/18 11:16:09 edwin Exp $
> 
> PORTNAME=	cutecom
>-PORTVERSION=	0.14.2
>+PORTVERSION=	0.20.0
> CATEGORIES=	comms
>-MASTER_SITES=	http://cutecom.sourceforge.net/
>+MASTER_SITES=	http://cutecom.sourceforge.net/ \
>+		http://personalpages.tds.net/~jwbacon/Ports/distfiles/
> 
> MAINTAINER=	markus@FreeBSD.org
> COMMENT=	Graphical serial terminal
> 
>-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
> RUN_DEPENDS=	lsz:${PORTSDIR}/comms/lrzsz
> 
>-USE_QT_VER=	3
>-USE_GMAKE=	yes
>+USE_QT_VER=	4
>+QT_COMPONENTS=	qt3support qmake_build moc_build rcc_build uic_build
>+USE_CMAKE=	yes
> 
>-MAKE_ENV+=	QTDIR="${QT_PREFIX}"
>-
>-do-configure:
>-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
>-		-spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ cutecom.pro
>-
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/cutecom ${PREFIX}/bin
>-	${MKDIR} ${PREFIX}/share/applnk/Utilities
>-	${INSTALL_DATA} ${WRKSRC}/cutecom.desktop ${PREFIX}/share/applnk/Utilities
>+MAN1=		cutecom.1
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/comms/cutecom/distinfo,v
>retrieving revision 1.9
>diff -u -r1.9 distinfo
>--- distinfo	18 Jun 2008 11:16:09 -0000	1.9
>+++ distinfo	25 Apr 2009 17:35:47 -0000
>@@ -1,3 +1,3 @@
>-MD5 (cutecom-0.14.2.tar.gz) = d7a1028e0a0f5ce800c3519f7461c157
>-SHA256 (cutecom-0.14.2.tar.gz) = e8b9ed594b219bccaf3d79ded78f379edb377a5cd2a168032ea98a6f227ba138
>-SIZE (cutecom-0.14.2.tar.gz) = 22682
>+MD5 (cutecom-0.20.0.tar.gz) = a42394c3a29a2dc30edab721469f5eee
>+SHA256 (cutecom-0.20.0.tar.gz) = 44bf6c3a827b5d3b3a2b201010215faebde6af42dc16f5e0f877c858c6e19fe0
>+SIZE (cutecom-0.20.0.tar.gz) = 22217
>Index: pkg-descr
>===================================================================
>RCS file: /home/pcvs/ports/comms/cutecom/pkg-descr,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-descr
>--- pkg-descr	15 Jul 2004 00:21:07 -0000	1.1
>+++ pkg-descr	25 Apr 2009 17:35:47 -0000
>@@ -1,3 +1,4 @@
>-CuteCom is a graphical serial terminal, like minicom.
>+CuteCom is a QT-based graphical serial terminal ideally suited to embedded
>+programming and robotics.
> 
> WWW: http://cutecom.sourceforge.net/
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/comms/cutecom/pkg-plist,v
>retrieving revision 1.3
>diff -u -r1.3 pkg-plist
>--- pkg-plist	22 Jan 2006 01:27:27 -0000	1.3
>+++ pkg-plist	25 Apr 2009 17:51:26 -0000
>@@ -1,4 +1,3 @@
> bin/cutecom
>-share/applnk/Utilities/cutecom.desktop
>-@dirrmtry share/applnk/Utilities
>-@dirrmtry share/applnk
>+share/applications/cutecom.desktop
>+@dirrmtry share/applications
>Index: files/patch-CMakeLists.txt
>===================================================================
>RCS file: files/patch-CMakeLists.txt
>diff -N files/patch-CMakeLists.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-CMakeLists.txt	25 Apr 2009 17:48:56 -0000
>@@ -0,0 +1,14 @@
>+--- ./CMakeLists.txt.orig	2008-03-13 00:09:49.000000000 +0300
>++++ ./CMakeLists.txt	2009-04-25 21:48:15.000000000 +0400
>+@@ -19,10 +19,4 @@
>+ 
>+ install(FILES cutecom.1 DESTINATION man/man1 )
>+ 
>+-find_program(KDECONFIG_EXECUTABLE NAMES kde-config )
>+-
>+-if (KDECONFIG_EXECUTABLE)
>+-   # then ask kde-config for the kde data dirs
>+-   exec_program(${KDECONFIG_EXECUTABLE} ARGS --install apps --expandvars OUTPUT_VARIABLE _apps_DIR )
>+-   install(FILES cutecom.desktop DESTINATION ${_apps_DIR}/Utilities)
>+-endif (KDECONFIG_EXECUTABLE)
>++install(FILES cutecom.desktop DESTINATION share/applications)
>Index: files/patch-cutecommdlg.ui
>===================================================================
>RCS file: /home/pcvs/ports/comms/cutecom/files/patch-cutecommdlg.ui,v
>retrieving revision 1.1
>diff -u -r1.1 patch-cutecommdlg.ui
>--- files/patch-cutecommdlg.ui	4 Feb 2007 03:09:28 -0000	1.1
>+++ files/patch-cutecommdlg.ui	25 Apr 2009 17:35:47 -0000
>@@ -1,14 +1,14 @@
>---- cutecommdlg.ui.orig	Thu Jul 15 01:11:45 2004
>-+++ cutecommdlg.ui	Thu Jul 15 01:12:07 2004
>-@@ -248,11 +248,6 @@
>-                     </item>
>-                     <item>
>-                         <property name="text">
>--                            <string>576000</string>
>--                        </property>
>--                    </item>
>--                    <item>
>--                        <property name="text">
>-                             <string>921600</string>
>-                         </property>
>-                     </item>
>+--- cutecommdlg.ui.orig	2008-03-12 16:09:50.000000000 -0500
>++++ cutecommdlg.ui	2009-03-28 12:46:04.000000000 -0500
>+@@ -220,11 +220,6 @@
>+        </item>
>+        <item>
>+         <property name="text" >
>+-         <string>576000</string>
>+-        </property>
>+-       </item>
>+-       <item>
>+-        <property name="text" >
>+          <string>921600</string>
>+         </property>
>+        </item>
>Index: files/patch-qcppdialogimpl.cpp
>===================================================================
>RCS file: /home/pcvs/ports/comms/cutecom/files/patch-qcppdialogimpl.cpp,v
>retrieving revision 1.5
>diff -u -r1.5 patch-qcppdialogimpl.cpp
>--- files/patch-qcppdialogimpl.cpp	18 Jun 2008 11:16:09 -0000	1.5
>+++ files/patch-qcppdialogimpl.cpp	25 Apr 2009 17:35:47 -0000
>@@ -1,78 +1,29 @@
>---- 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 @@
>+--- qcppdialogimpl.cpp.orig	2009-03-28 12:42:56.000000000 -0500
>++++ qcppdialogimpl.cpp	2009-03-28 12:44:32.000000000 -0500
>+@@ -243,11 +243,10 @@
>     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"<<"/dev/cuaU0"<<"/dev/cuaU1";
>-+#else
>-+      devices<<"/dev/cuad0"<<"/dev/cuad1"<<"/dev/cuad2"<<"/dev/cuad3"<<"/dev/cuaU0"<<"/dev/cuaU1";
>-+#endif
>-+#else
>-       devices<<"/dev/ttyS0"<<"/dev/ttyS1"<<"/dev/ttyS2"<<"/dev/ttyS3";
>-+#endif
>+-      devices<<"/dev/ttyS0"<<"/dev/ttyS1"<<"/dev/ttyS2"<<"/dev/ttyS3";
>++      devices<<DEVLIST;
>  
>     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
>+-
>+-   m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", "/dev/ttyS0"));
>++   m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", DEFAULT_DEV));
>  
>     QStringList history=settings.readListEntry("/cutecom/History");
>  
>-@@ -350,7 +367,7 @@
>-       m_sz->addArgument("sh");
>-       m_sz->addArgument("-c");
>- //      QString tmp=QString("sx -vv \"")+filename+"\" < "+m_deviceCb->currentText()+" > "+m_deviceCb->currentText();
>--      QString tmp=QString("sz ");
>-+      QString tmp=QString("lsz ");
>-       if (m_protoPb->currentText()=="XModem")
>-          tmp+="--xmodem ";
>-       else if (m_protoPb->currentText()=="YModem")
>-@@ -472,7 +489,7 @@
>- 
>- void QCPPDialogImpl::sendDone()
>- {
>--   cerr<<"sx exited"<<endl;
>-+   cerr<<"lsx exited"<<endl;
>- }
>- 
>- bool QCPPDialogImpl::eventFilter(QObject* watched, QEvent *e)
>-@@ -915,15 +932,21 @@
>-    case 230400:
>-       _baud=B230400;
>-       break;
>-+#if !defined(__FreeBSD__) || (_FreeBSD_version > 500000)
>+@@ -932,9 +931,9 @@
>     case 460800:
>        _baud=B460800;
>        break;
>-+#endif
>-+#ifndef __FreeBSD__
>-    case 576000:
>-       _baud=B576000;
>-       break;
>-+#endif
>-+#if !defined(__FreeBSD__) || (_FreeBSD_version >= 500000)
>+-   case 576000:
>+-      _baud=B576000;
>+-      break;
>++//   case 576000:
>++//      _baud=B576000;
>++//      break;
>     case 921600:
>        _baud=B921600;
>        break;
>-+#endif
>- //   case 128000:
>- //      _baud=B128000;
>- //      break;
>Index: files/patch-qcppdialogimpl.h
>===================================================================
>RCS file: files/patch-qcppdialogimpl.h
>diff -N files/patch-qcppdialogimpl.h
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-qcppdialogimpl.h	25 Apr 2009 17:35:47 -0000
>@@ -0,0 +1,24 @@
>+--- qcppdialogimpl.h.orig	2008-03-12 16:09:50.000000000 -0500
>++++ qcppdialogimpl.h	2009-03-28 09:05:42.000000000 -0500
>+@@ -103,4 +103,21 @@
>+ 
>+ };
>+ 
>++#if defined(__FreeBSD__)
>++
>++#define	DEVLIST	"/dev/cuaU0"<<"/dev/cuaU1"<<"/dev/cuad0"<<"/dev/cuad1";
>++#define DEFAULT_DEV "/dev/cuaU0"
>++
>++#elif defined(__APPLE__)
>++
>++#define	DEVLIST	"/dev/cu.usbserial"<<"/dev/cu.KeySerial1";
>++#define DEFAULT_DEV "/dev/cu.usbserial"
>++
>++#else	// Default to Linux devices.
>++
>++#define	DEVLIST	"/dev/ttyS0"<<"/dev/ttyS1"<<"/dev/ttyS2"<<"/dev/ttyS3";
>++#define DEFAULT_DEV "/dev/ttyS0"
>++
>++#endif
>++
>+ #endif

Actions: View | Diff

Attachments on bug 133788: 95407 | 95408