Attachment #194343 for bug #229094

View | Details | Raw Unified | Return to bug 229094
Collapse All | Expand All

Lines 2-18 Link Here

(-)comms/cutecom/Makefile (-5 / +15 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cutecom	4	PORTNAME= cutecom
5	PORTVERSION= 0.20.0	5	DISTVERSIONPREFIX= v
6	PORTREVISION= 2	6	DISTVERSION= 0.45.0
7	CATEGORIES= comms	7	CATEGORIES= comms
8	MASTER_SITES= http://cutecom.sourceforge.net/
9		8
10	MAINTAINER= jwb@FreeBSD.org	9	MAINTAINER= jwb@FreeBSD.org
11	COMMENT= Graphical serial terminal	10	COMMENT= Graphical serial terminal
12		11
		12	LICENSE= GPLv3
		13	LICENSE_FILE= ${WRKSRC}/LICENSE
		14
13	RUN_DEPENDS= lsz:comms/lrzsz	15	RUN_DEPENDS= lsz:comms/lrzsz
14		16
15	USE_QT4= qt3support qmake_build moc_build rcc_build uic_build	17	USES= cmake:outsource desktop-file-utils
16	USES= cmake	18	USE_GITHUB= yes
		19	GH_ACCOUNT= neundorf
		20	GH_PROJECT= CuteCom
		21	GNU_CONFIGURE= yes
		22	USE_QT5= core gui serialport widgets qmake_build buildtools_build
17		23
		24	PLIST_FILES= bin/cutecom \
		25	man/man1/cutecom.1.gz \
		26	share/applications/cutecom.desktop
		27
18	.include <bsd.port.mk>	28	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)comms/cutecom/distinfo (-2 / +3 lines)
1	SHA256 (cutecom-0.20.0.tar.gz) = 44bf6c3a827b5d3b3a2b201010215faebde6af42dc16f5e0f877c858c6e19fe0	1	TIMESTAMP = 1529278052
2	SIZE (cutecom-0.20.0.tar.gz) = 22217	2	SHA256 (neundorf-CuteCom-v0.45.0_GH0.tar.gz) = 30cc6a800231684446ef5ebea78092462b2662d06238c146d0b9e24b86685cea
		3	SIZE (neundorf-CuteCom-v0.45.0_GH0.tar.gz) = 1152960

Lines 1-14 Link Here

(-)comms/cutecom/files/patch-CMakeLists.txt (-12 / +9 lines)
1	--- ./CMakeLists.txt.orig 2008-03-13 00:09:49.000000000 +0300	1	--- CMakeLists.txt.orig 2018-06-17 19:56:07 UTC
2	+++ ./CMakeLists.txt 2009-04-25 21:48:15.000000000 +0400	2	+++ CMakeLists.txt
3	@@ -19,10 +19,4 @@	3	@@ -76,5 +76,8 @@ set (CPACK_SOURCE_IGNORE_FILES
		4	"${CMAKE_CURRENT_BINARY_DIR};/.git/;~$;${CPACK_SOURCE_IGNORE_FILES}")
		5	include (CPack)
4		6
5	install(FILES cutecom.1 DESTINATION man/man1 )	7	+install(FILES cutecom.desktop DESTINATION share/applications)
		8	+install(FILES cutecom.1 DESTINATION man/man1 )
		9	+
		10	add_custom_target(dist COMMAND git archive --format tar --prefix=cutecom-${CuteCom_VERSION}/ HEAD \| gzip > ${CMAKE_CURRENT_BINARY_DIR}/${CPACK_SOURCE_PACKAGE_FILE_NAME}.tgz WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
6		11
7	-find_program(KDECONFIG_EXECUTABLE NAMES kde-config )
8	-
9	-if (KDECONFIG_EXECUTABLE)
10	- # then ask kde-config for the kde data dirs
11	- exec_program(${KDECONFIG_EXECUTABLE} ARGS --install apps --expandvars OUTPUT_VARIABLE _apps_DIR )
12	- install(FILES cutecom.desktop DESTINATION ${_apps_DIR}/Utilities)
13	-endif (KDECONFIG_EXECUTABLE)
14	+install(FILES cutecom.desktop DESTINATION share/applications)

Lines 1-14 Link Here

(-)comms/cutecom/files/patch-cutecommdlg.ui (-14 lines)
1	--- cutecommdlg.ui.orig 2008-03-12 16:09:50.000000000 -0500
2	+++ cutecommdlg.ui 2009-03-28 12:46:04.000000000 -0500
3	@@ -220,11 +220,6 @@
4	</item>
5	<item>
6	<property name="text" >
7	- <string>576000</string>
8	- </property>
9	- </item>
10	- <item>
11	- <property name="text" >
12	<string>921600</string>
13	</property>
14	</item>




--- 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)
-      devices<<"/dev/ttyS0"<<"/dev/ttyS1"<<"/dev/ttyS2"<<"/dev/ttyS3";
+      devices<<DEVLIST;
 
    m_deviceCb->insertStringList(devices);
-
-   m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", "/dev/ttyS0"));
+   m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", DEFAULT_DEV));
 
    QStringList history=settings.readListEntry("/cutecom/History");
 
@@ -932,9 +931,9 @@
    case 460800:
       _baud=B460800;
       break;
-   case 576000:
-      _baud=B576000;
-      break;
+//   case 576000:
+//      _baud=B576000;
+//      break;
    case 921600:
       _baud=B921600;
       break;




--- 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

Line 0 Link Here

(-)comms/cutecom/files/patch-settings.cpp (+11 lines)
	1	--- settings.cpp.orig 2018-06-17 23:39:46 UTC
	2	+++ settings.cpp
	3	@@ -173,7 +173,7 @@ void Settings::readSessionSettings(QSett
	4	? static_cast<QIODevice::OpenModeFlag>(value)
	5	: QIODevice::ReadWrite;
	6	// the recovering default for the device its Linux specific but I can live with that
	7	- session.device = settings.value("Device", QStringLiteral("/dev/ttyUSB0")).toString();
	8	+ session.device = settings.value("Device", QStringLiteral("/dev/cuaU0")).toString();
	9	session.showCtrlCharacters = settings.value("showCtrlCharacters", false).toBool();
	10	session.showTimestamp = settings.value("showTimestamp", false).toBool();
	11	session.command_history = settings.value("History").toStringList();

Lines 1-4 Link Here

(-)comms/cutecom/pkg-descr (-1 / +1 lines)
1	CuteCom is a QT-based graphical serial terminal ideally suited to embedded	1	CuteCom is a QT-based graphical serial terminal ideally suited to embedded
2	programming and robotics.	2	programming and robotics.
3		3
4	WWW: http://cutecom.sourceforge.net/	4	WWW: https://github.com/neundorf/CuteCom

Lines 1-3 Link Here

(-)comms/cutecom/pkg-plist (-3 lines)
1	bin/cutecom
2	man/man1/cutecom.1.gz
3	share/applications/cutecom.desktop

Return to bug 229094

Lines 1-29 Link Here

(-)comms/cutecom/files/patch-qcppdialogimpl.cpp (-29 lines)
1	--- qcppdialogimpl.cpp.orig 2009-03-28 12:42:56.000000000 -0500
2	+++ qcppdialogimpl.cpp 2009-03-28 12:44:32.000000000 -0500
3	@@ -243,11 +243,10 @@
4	bool entryFound=false;
5	QStringList devices=settings.readListEntry("/cutecom/AllDevices", &entryFound);
6	if (!entryFound)
7	- devices<<"/dev/ttyS0"<<"/dev/ttyS1"<<"/dev/ttyS2"<<"/dev/ttyS3";
8	+ devices<<DEVLIST;
9
10	m_deviceCb->insertStringList(devices);
11	-
12	- m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", "/dev/ttyS0"));
13	+ m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", DEFAULT_DEV));
14
15	QStringList history=settings.readListEntry("/cutecom/History");
16
17	@@ -932,9 +931,9 @@
18	case 460800:
19	_baud=B460800;
20	break;
21	- case 576000:
22	- _baud=B576000;
23	- break;
24	+// case 576000:
25	+// _baud=B576000;
26	+// break;
27	case 921600:
28	_baud=B921600;
29	break;

Lines 1-24 Link Here

(-)comms/cutecom/files/patch-qcppdialogimpl.h (-24 lines)
1	--- qcppdialogimpl.h.orig 2008-03-12 16:09:50.000000000 -0500
2	+++ qcppdialogimpl.h 2009-03-28 09:05:42.000000000 -0500
3	@@ -103,4 +103,21 @@
4
5	};
6
7	+#if defined(__FreeBSD__)
8	+
9	+#define DEVLIST "/dev/cuaU0"<<"/dev/cuaU1"<<"/dev/cuad0"<<"/dev/cuad1";
10	+#define DEFAULT_DEV "/dev/cuaU0"
11	+
12	+#elif defined(__APPLE__)
13	+
14	+#define DEVLIST "/dev/cu.usbserial"<<"/dev/cu.KeySerial1";
15	+#define DEFAULT_DEV "/dev/cu.usbserial"
16	+
17	+#else // Default to Linux devices.
18	+
19	+#define DEVLIST "/dev/ttyS0"<<"/dev/ttyS1"<<"/dev/ttyS2"<<"/dev/ttyS3";
20	+#define DEFAULT_DEV "/dev/ttyS0"
21	+
22	+#endif
23	+
24	#endif