cad/ktechlab: 0.40.1-66 -> 0.40.1-74

5 files changed, 7 insertions, 106 deletions

diff --git a/cad/ktechlab/Makefile b/cad/ktechlab/Makefile
index 20b824b2be03..ff4f973d6f47 100644
--- a/cad/ktechlab/Makefile
+++ b/cad/ktechlab/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	ktechlab
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.40.1-66
-DISTVERSIONSUFFIX=	-gd5096083
+DISTVERSION=	0.40.1-74
+DISTVERSIONSUFFIX=	-gd45f0cd0
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/cad/ktechlab/distinfo b/cad/ktechlab/distinfo
index 8c7e21cbc428..abcd86983218 100644
--- a/cad/ktechlab/distinfo
+++ b/cad/ktechlab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574867886
-SHA256 (ktechlab-ktechlab-v0.40.1-66-gd5096083_GH0.tar.gz) = 20dd31a78296fa699de870ebbd8f21271bad635af7d9070173b4eab58655a26d
-SIZE (ktechlab-ktechlab-v0.40.1-66-gd5096083_GH0.tar.gz) = 2259850
+TIMESTAMP = 1579377647
+SHA256 (ktechlab-ktechlab-v0.40.1-74-gd45f0cd0_GH0.tar.gz) = 0f0f27f616b993fa219bcb1a3d4bf8d7c7020ef23eb9168993bc3886f8604fa3
+SIZE (ktechlab-ktechlab-v0.40.1-74-gd45f0cd0_GH0.tar.gz) = 2263299
diff --git a/cad/ktechlab/files/patch-doc_en_CMakeLists.txt b/cad/ktechlab/files/patch-doc_en_CMakeLists.txt
index d222a7689556..36d16497bbfb 100644
--- a/cad/ktechlab/files/patch-doc_en_CMakeLists.txt
+++ b/cad/ktechlab/files/patch-doc_en_CMakeLists.txt
@@ -1,5 +1,5 @@
---- doc/en/CMakeLists.txt.orig	2019-11-27 18:08:55 UTC
+--- doc/en/CMakeLists.txt.orig	2020-01-18 18:24:00 UTC
 +++ doc/en/CMakeLists.txt
 @@ -1 +1 @@
--kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR ktechlab)
+-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR ktechlab)
 +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION share/doc SUBDIR ktechlab)
diff --git a/cad/ktechlab/files/patch-src_electronics_gpsimprocessor.cpp b/cad/ktechlab/files/patch-src_electronics_gpsimprocessor.cpp
deleted file mode 100644
index b334383ef70f..000000000000
--- a/cad/ktechlab/files/patch-src_electronics_gpsimprocessor.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/ktechlab/ktechlab/issues/57
-
---- src/electronics/gpsimprocessor.cpp.orig	2019-11-27 15:23:04 UTC
-+++ src/electronics/gpsimprocessor.cpp
-@@ -755,7 +755,7 @@ RegisterSet::RegisterSet( pic_processor * picProcessor
- 		m_nameToRegisterMap[ info->name() ] = info;
-         qDebug() << Q_FUNC_INFO << " add register info " << info->name() << " at pos " << i << " addr " << info;
- 	}
--#if defined(HAVE_GPSIM_0_26)
-+#if 1 || defined(HAVE_GPSIM_0_26)
- 	RegisterInfo * info = new RegisterInfo( picProcessor->Wreg ); // is tihs correct for "W" member? TODO
- #else
- 	RegisterInfo * info = new RegisterInfo( picProcessor->W );
diff --git a/cad/ktechlab/files/patch-src_electronics_port.cpp b/cad/ktechlab/files/patch-src_electronics_port.cpp
deleted file mode 100644
index 69d9ca36d3a6..000000000000
--- a/cad/ktechlab/files/patch-src_electronics_port.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
---- src/electronics/port.cpp.orig	2019-11-27 15:37:02 UTC
-+++ src/electronics/port.cpp
-@@ -22,7 +22,7 @@
- #include <sys/ioctl.h>
- #include <unistd.h>
- 
--#ifndef DARWIN
-+#if !defined(DARWIN) && !defined(__FreeBSD__)
- #include <linux/ppdev.h>
- #endif
- 
-@@ -39,7 +39,7 @@ Port::~Port()
- 
- QStringList Port::ports( unsigned probeResult )
- {
--#ifndef DARWIN
-+#if !defined(DARWIN) && !defined(__FreeBSD__)
- 	return SerialPort::ports(probeResult) + ParallelPort::ports(probeResult);
- #else
- 	return SerialPort::ports(probeResult);
-@@ -264,7 +264,7 @@ const int INPUT_MODE_BIT = 1 << 21; // Controls if the
- 
- // No code using these values will be reached on Darwin, this is just to
- // keep the preprocessor happy.
--#ifdef DARWIN
-+#if defined(DARWIN) || defined(__FreeBSD__)
- 	#define PPRDATA		0xFACADE
- 	#define PPRCONTROL	0xC001D00D
- 	#define PPWDATA		0xC0EDBABE
-@@ -379,7 +379,7 @@ void ParallelPort::setControlState( uchar pins, bool s
- //BEGIN Register-oriented operations
- uchar ParallelPort::readFromRegister( Register reg )
- {
--#ifdef DARWIN
-+#if defined(DARWIN) || defined(__FreeBSD__)
- 	return 0;
- #endif
- 	
-@@ -398,7 +398,7 @@ uchar ParallelPort::readFromRegister( Register reg )
- 
- void ParallelPort::writeToRegister( Register reg, uchar value )
- {
--#ifdef DARWIN
-+#if defined(DARWIN) || defined(__FreeBSD__)
- 	return;
- #endif
- 	
-@@ -469,7 +469,7 @@ void ParallelPort::setControlDirection( int pins, Dire
- 
- Port::ProbeResult ParallelPort::probe( const QString & port )
- {
--#ifdef DARWIN
-+#if defined(DARWIN) || defined(__FreeBSD__)
- 	return Port::DoesntExist;
- #endif
- 	
-@@ -493,7 +493,7 @@ QStringList ParallelPort::ports( unsigned probeResult 
- {
- 	QStringList list;
- 	
--#ifdef DARWIN
-+#if defined(DARWIN) || defined(__FreeBSD__)
- 	return list;
- #endif
- 	
-@@ -517,7 +517,10 @@ QStringList ParallelPort::ports( unsigned probeResult 
- 
- bool ParallelPort::openPort( const QString & port )
- {
--#ifdef DARWIN
-+#if defined(__FreeBSD__)
-+	qWarning() << Q_FUNC_INFO << "Parallel ports disabled on FreeBSD" << endl;
-+	return false;
-+#elif defined(DARWIN)
- 	qWarning() << Q_FUNC_INFO << "Parallel ports disabled on Darwin" << endl;
- 	return false;
- #endif
-@@ -550,7 +553,7 @@ bool ParallelPort::openPort( const QString & port )
- 
- void ParallelPort::closePort()
- {
--#ifdef DARWIN
-+#if defined(DARWIN) || defined(__FreeBSD__)
- 	return;
- #endif
-