git: b040d3ad8fb1 - main - comms/qsstv: update to 9.5.8

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Charlie Li <vishwin_at_FreeBSD.org>
Date: Tue, 07 Dec 2021 15:46:57 UTC
The branch main has been updated by vishwin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b040d3ad8fb1a60ee5a6e8b2c0dabf98970405cf

commit b040d3ad8fb1a60ee5a6e8b2c0dabf98970405cf
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2021-12-06 23:02:48 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2021-12-07 15:42:30 +0000

    comms/qsstv: update to 9.5.8
    
    Now builds and runs with current hamlib.
    
    Changelog: http://users.telenet.be/on4qz/qsstv/manual/changelog.html
    
    DOCS option removed since building it continues to be problematic,
    and the upstream author encourages using the online documentation
    anyway.
    
    Approved by: arrowd (mentor)
    Differential Revision: https://reviews.freebsd.org/D33313
---
 comms/qsstv/Makefile                               |  29 ++--
 comms/qsstv/distinfo                               |   6 +-
 ...nfig.cpp => patch-config_directoriesconfig.cpp} |   4 +-
 ...l.txt => patch-documentation_manual_manual.txt} |   6 +-
 ...demodulator.cpp => patch-drmrx_demodulator.cpp} |   4 +-
 comms/qsstv/files/patch-qsstv.pro                  |  11 ++
 .../files/patch-qsstv_documentation_api_api.doxy   |  11 --
 .../patch-qsstv_documentation_manual_manual.doxy   |  11 --
 .../files/patch-qsstv_drmrx_channeldecode.cpp      |  10 --
 .../files/patch-qsstv_drmrx_deinterleaver.cpp      |  10 --
 comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp    |  10 --
 comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp   |  10 --
 comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp   |  10 --
 comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp   |  10 --
 comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp    |  10 --
 comms/qsstv/files/patch-qsstv_qsstv.pro            |  30 ----
 comms/qsstv/files/patch-qwt_qwt.pro                |  11 --
 ...rig_rigcontrol.cpp => patch-rig_rigcontrol.cpp} |   4 +-
 ...und_soundalsa.cpp => patch-sound_soundalsa.cpp} |   4 +-
 ...qsstv_utils_color.cpp => patch-utils_color.cpp} |   4 +-
 ...tch-qsstv_utils_jp2io.h => patch-utils_jp2io.h} |   4 +-
 ...dialog.cpp => patch-videocapt_cameradialog.cpp} |   4 +-
 ...esettings.h => patch-videocapt_imagesettings.h} |   4 +-
 ...control.cpp => patch-videocapt_v4l2control.cpp} |   4 +-
 comms/qsstv/pkg-plist                              | 172 +--------------------
 25 files changed, 49 insertions(+), 344 deletions(-)

diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
index d113f63af596..5ede32283ad4 100644
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -1,9 +1,7 @@
 PORTNAME=	qsstv
-PORTVERSION=	9.3.3
-PORTREVISION=	4
+PORTVERSION=	9.5.8
 CATEGORIES=	comms hamradio
-MASTER_SITES=	http://users.telenet.be/on4qz/qsstv/downloads/ \
-		LOCAL/shurd
+MASTER_SITES=	http://users.telenet.be/on4qz/qsstv/downloads/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	hamradio@FreeBSD.org
@@ -20,29 +18,28 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libv4l2.so:multimedia/libv4l
 BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat
 
-USES=		compiler:c++11-lang gl pkgconfig qmake qt:5
+USES=		compiler:c++11-lang gl pkgconfig qmake:outsource qt:5
 USE_QT=		buildtools core gui network widgets xml
 USE_GL=		gl
 
-OPTIONS_DEFINE=	DOCS
-DOCS_CXXFLAGS=	-DWITH_DOCS
-DOCS_QMAKE_ON=	CONFIG+=dox
-DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 			-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 			-e 's|%%DOCSDIR%%|${DOCSDIR}|g' \
 			-e 's|%%PERL%%|${PERL}|g' \
-		${WRKSRC}/qsstv/qsstv.pro ${WRKSRC}/qwt/qwt.pro \
-		${WRKSRC}/qsstv/config/directoriesconfig.cpp \
-		${WRKSRC}/qsstv/documentation/manual/manual.doxy \
-		${WRKSRC}/qsstv/documentation/manual/manual.txt \
-		${WRKSRC}/qsstv/documentation/api/api.doxy
-	${RM} ${WRKSRC}/qsstv/documentation/manual/manual.txt.*
-	${RM} ${WRKSRC}/qsstv/documentation/manual/manual.*.orig
+		${WRKSRC}/qsstv.pro \
+		${WRKSRC}/config/directoriesconfig.cpp \
+		${WRKSRC}/documentation/manual/manual.doxy \
+		${WRKSRC}/documentation/manual/manual.txt \
+		${WRKSRC}/documentation/api/api.doxy
+	${RM} ${WRKSRC}/documentation/manual/manual.txt.*
+	${RM} ${WRKSRC}/documentation/manual/manual.*.orig
 
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/qsstv.desktop ${STAGEDIR}/${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/icons/qsstv.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	-${RM} ${STAGEDIR}/${DOCSDIR}/manual.doxy
 	-${RM} ${STAGEDIR}/${DOCSDIR}/doxygen_sqlite3.db
 	-${RM} ${STAGEDIR}/${DOCSDIR}/*.bak
diff --git a/comms/qsstv/distinfo b/comms/qsstv/distinfo
index c372794f4e08..e4ee64a83efa 100644
--- a/comms/qsstv/distinfo
+++ b/comms/qsstv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555616893
-SHA256 (qsstv_9.3.3.tar.gz) = d18cb2218cb0f817c48e2af7116f9a479d70b0a2a75dff8466eb82126cd48e3e
-SIZE (qsstv_9.3.3.tar.gz) = 6808672
+TIMESTAMP = 1638502611
+SHA256 (qsstv_9.5.8.tar.gz) = c03f7fa5c680ced8fd331c25ff3e47440c9aedb48ec7b66255c6aa0ed88e7a68
+SIZE (qsstv_9.5.8.tar.gz) = 7468561
diff --git a/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp b/comms/qsstv/files/patch-config_directoriesconfig.cpp
similarity index 86%
rename from comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp
rename to comms/qsstv/files/patch-config_directoriesconfig.cpp
index da561d063a53..5aa53a359a98 100644
--- a/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp
+++ b/comms/qsstv/files/patch-config_directoriesconfig.cpp
@@ -1,5 +1,5 @@
---- qsstv/config/directoriesconfig.cpp.orig	2019-04-11 14:58:19 UTC
-+++ qsstv/config/directoriesconfig.cpp
+--- config/directoriesconfig.cpp.orig   2020-06-11 15:15:15 UTC
++++ config/directoriesconfig.cpp
 @@ -64,7 +64,11 @@ void directoriesConfig::readSettings()
    txStockImagesPath=qSettings.value("txStockImagesPath",QString(getenv("HOME"))+"/qsstv/tx_stock/").toString();
    templatesPath=qSettings.value("templatesPath",QString(getenv("HOME"))+"/qsstv/templates/").toString();
diff --git a/comms/qsstv/files/patch-qsstv_documentation_manual_manual.txt b/comms/qsstv/files/patch-documentation_manual_manual.txt
similarity index 76%
rename from comms/qsstv/files/patch-qsstv_documentation_manual_manual.txt
rename to comms/qsstv/files/patch-documentation_manual_manual.txt
index 786f2ad4f413..d0c0930ad23b 100644
--- a/comms/qsstv/files/patch-qsstv_documentation_manual_manual.txt
+++ b/comms/qsstv/files/patch-documentation_manual_manual.txt
@@ -1,6 +1,6 @@
---- qsstv/documentation/manual/manual.txt.orig	2019-04-18 20:56:53 UTC
-+++ qsstv/documentation/manual/manual.txt
-@@ -317,7 +317,7 @@ The following tabs are available
+--- documentation/manual/manual.txt.orig	2021-08-03 16:19:15 UTC
++++ documentation/manual/manual.txt
+@@ -410,7 +410,7 @@ The following tabs are available
  - Templates: directory where the template files are stored
  - Audio Records: directory for audio files (where you save/read recorded audio files)
  - Save TX images in TX SSTV or TX DRM directory: if selected the TX image will be saved
diff --git a/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp b/comms/qsstv/files/patch-drmrx_demodulator.cpp
similarity index 81%
rename from comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp
rename to comms/qsstv/files/patch-drmrx_demodulator.cpp
index f2a98e45fca0..623d45d1298a 100644
--- a/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp
+++ b/comms/qsstv/files/patch-drmrx_demodulator.cpp
@@ -1,5 +1,5 @@
---- qsstv/drmrx/demodulator.cpp.orig	2019-02-26 18:17:40 UTC
-+++ qsstv/drmrx/demodulator.cpp
+--- drmrx/demodulator.cpp.orig	2019-02-26 18:17:40 UTC
++++ drmrx/demodulator.cpp
 @@ -947,7 +947,7 @@ bool demodulator::channelEstimation()
            temp2 += actual_pilots[2 * j] * next_pilots[2 * j + 1] -actual_pilots[2 * j + 1] * next_pilots[2 * j];
  
diff --git a/comms/qsstv/files/patch-qsstv.pro b/comms/qsstv/files/patch-qsstv.pro
new file mode 100644
index 000000000000..13c56086bec8
--- /dev/null
+++ b/comms/qsstv/files/patch-qsstv.pro
@@ -0,0 +1,11 @@
+--- qsstv.pro.orig	2021-07-31 20:57:03 UTC
++++ qsstv.pro
+@@ -523,7 +523,7 @@ QMAKE_EXTRA_TARGETS   +=   dox
+ 
+ 
+ isEmpty(PREFIX) {
+-        PREFIX = /usr/local
++        PREFIX = %%PREFIX%%
+     }
+ target.path = $$PREFIX/bin
+ 
diff --git a/comms/qsstv/files/patch-qsstv_documentation_api_api.doxy b/comms/qsstv/files/patch-qsstv_documentation_api_api.doxy
deleted file mode 100644
index cf4cf416251f..000000000000
--- a/comms/qsstv/files/patch-qsstv_documentation_api_api.doxy
+++ /dev/null
@@ -1,11 +0,0 @@
---- qsstv/documentation/api/api.doxy.orig	2019-04-18 21:02:45 UTC
-+++ qsstv/documentation/api/api.doxy
-@@ -2170,7 +2170,7 @@ EXTERNAL_PAGES         = YES
- # interpreter (i.e. the result of 'which perl').
- # The default file (with absolute path) is: /usr/bin/perl.
- 
--PERL_PATH              = /usr/bin/perl
-+PERL_PATH              = %%PERL%%
- 
- #---------------------------------------------------------------------------
- # Configuration options related to the dot tool
diff --git a/comms/qsstv/files/patch-qsstv_documentation_manual_manual.doxy b/comms/qsstv/files/patch-qsstv_documentation_manual_manual.doxy
deleted file mode 100644
index 7e16a05edde2..000000000000
--- a/comms/qsstv/files/patch-qsstv_documentation_manual_manual.doxy
+++ /dev/null
@@ -1,11 +0,0 @@
---- qsstv/documentation/manual/manual.doxy.orig	2019-04-18 21:02:35 UTC
-+++ qsstv/documentation/manual/manual.doxy
-@@ -1549,7 +1549,7 @@ EXTERNAL_GROUPS        = YES
- # The PERL_PATH should be the absolute path and name of the perl script
- # interpreter (i.e. the result of `which perl').
- 
--PERL_PATH              = /usr/bin/perl
-+PERL_PATH              = %%PERL%%
- 
- #---------------------------------------------------------------------------
- # Configuration options related to the dot tool
diff --git a/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp b/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp
deleted file mode 100644
index 5df4f015f840..000000000000
--- a/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- qsstv/drmrx/channeldecode.cpp.orig	2019-03-22 10:11:58 UTC
-+++ qsstv/drmrx/channeldecode.cpp
-@@ -28,7 +28,6 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <math.h>
--#include <malloc.h>
- #include <float.h>
- #include "drmproto.h"
- #include "drmdefs.h"
diff --git a/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp b/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp
deleted file mode 100644
index 031877f79932..000000000000
--- a/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- qsstv/drmrx/deinterleaver.cpp.orig	2019-03-22 10:11:58 UTC
-+++ qsstv/drmrx/deinterleaver.cpp
-@@ -29,7 +29,6 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
- #include <math.h>
- int *deinterleaver(int xinA, int tA, int xinB, int tB)
- {
diff --git a/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp b/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp
deleted file mode 100644
index 5b85c9013145..000000000000
--- a/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- qsstv/drmrx/getmode.cpp.orig	2019-04-18 21:11:25 UTC
-+++ qsstv/drmrx/getmode.cpp
-@@ -34,7 +34,6 @@
- #include <stdlib.h>
- #include <math.h>
- #include <sys/types.h>
--#include <malloc.h>
- #include "structtemplates.h"
- #include "drmproto.h"
- #include "drmdefs.h"
diff --git a/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp b/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp
deleted file mode 100644
index bedee0f9c0c2..000000000000
--- a/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- qsstv/drmrx/mkfacmap.cpp.orig	2019-04-18 21:11:46 UTC
-+++ qsstv/drmrx/mkfacmap.cpp
-@@ -27,7 +27,6 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
- int mkfacmap(int robustness_mode, int K_dc, int K_modulo, int /*@out@ */ *FACmap)
- {
-   int elem_cnt, i;
diff --git a/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp b/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp
deleted file mode 100644
index 15545545b48f..000000000000
--- a/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- qsstv/drmrx/mkmscmap.cpp.orig	2019-04-18 21:11:33 UTC
-+++ qsstv/drmrx/mkmscmap.cpp
-@@ -32,7 +32,6 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <math.h>
--#include <malloc.h>
- #include "drmdefs.h"
- #include "structtemplates.h"
- #include "drmproto.h"
diff --git a/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp b/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp
deleted file mode 100644
index 0fed855d4106..000000000000
--- a/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- qsstv/drmrx/psdcmean.cpp.orig	2019-04-18 21:11:55 UTC
-+++ qsstv/drmrx/psdcmean.cpp
-@@ -36,7 +36,6 @@
- #include <stdlib.h>
- #include <math.h>
- #include <sys/types.h>
--#include <malloc.h>
- void cfft(float *, int, int);
- void psdcmean(float *rsbuf, float *cpsd, int lblock, int nblocks)
- {
diff --git a/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp b/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp
deleted file mode 100644
index 2d794e96216a..000000000000
--- a/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- qsstv/drmrx/psdmean.cpp.orig	2019-04-18 21:12:04 UTC
-+++ qsstv/drmrx/psdmean.cpp
-@@ -36,7 +36,6 @@
- #include <stdlib.h>
- #include <math.h>
- #include <sys/types.h>
--#include <malloc.h>
- void rfft(float *, int, int);
- void psdmean(float *input, float *psd, int lblock, int nblocks)
- {
diff --git a/comms/qsstv/files/patch-qsstv_qsstv.pro b/comms/qsstv/files/patch-qsstv_qsstv.pro
deleted file mode 100644
index 59eebdad82ea..000000000000
--- a/comms/qsstv/files/patch-qsstv_qsstv.pro
+++ /dev/null
@@ -1,30 +0,0 @@
---- qsstv/qsstv.pro.orig	2019-04-18 09:34:09 UTC
-+++ qsstv/qsstv.pro
-@@ -523,7 +523,7 @@ contains(QMAKE_HOST.arch, arm.*):{
-     }
-   else {
-         message(not arm)
--       CONFIG(debug ,debug|release){
-+       CONFIG(dox){
-        dox.commands = cd $$PWD/documentation/manual ;doxygen  manual.doxy; cd $$PWD/documentation/api ;doxygen  api.doxy;
-        dox.depends= FORCE
-        PRE_TARGETDEPS       +=    dox
-@@ -535,15 +535,15 @@ contains(QMAKE_HOST.arch, arm.*):{
- 
- 
- 
--dox.path=/usr/share/doc/$$TARGET
--dox.files= $$PWD/manual/*
-+dox.path=%%DOCSDIR%%
-+dox.files= documentation/manual/*
- QMAKE_EXTRA_TARGETS   +=   dox
- 
- 
- isEmpty(PREFIX) {
-         PREFIX = /usr/local
-     }
--target.path = $$PREFIX/bin
-+target.path = %%PREFIX%%/bin
- 
- shortcutfiles.files =qsstv.desktop
- shortcutfiles.path = $$PREFIX/share/applications/
diff --git a/comms/qsstv/files/patch-qwt_qwt.pro b/comms/qsstv/files/patch-qwt_qwt.pro
deleted file mode 100644
index e39f63cc8ccf..000000000000
--- a/comms/qsstv/files/patch-qwt_qwt.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- qwt/qwt.pro.orig	2019-03-06 17:04:10 UTC
-+++ qwt/qwt.pro
-@@ -159,6 +159,8 @@ HEADERS += \
- unix:!symbian {
-     maemo5 {
-         target.path = /opt/usr/lib
-+    freebsd {
-+        target.path = /usr/local/lib
-     } else {
-         target.path = /usr/lib
-     }
diff --git a/comms/qsstv/files/patch-qsstv_rig_rigcontrol.cpp b/comms/qsstv/files/patch-rig_rigcontrol.cpp
similarity index 82%
rename from comms/qsstv/files/patch-qsstv_rig_rigcontrol.cpp
rename to comms/qsstv/files/patch-rig_rigcontrol.cpp
index 61c817c55869..e0af8c6b362b 100644
--- a/comms/qsstv/files/patch-qsstv_rig_rigcontrol.cpp
+++ b/comms/qsstv/files/patch-rig_rigcontrol.cpp
@@ -1,5 +1,5 @@
---- qsstv/rig/rigcontrol.cpp.orig	2019-04-19 04:54:51 UTC
-+++ qsstv/rig/rigcontrol.cpp
+--- rig/rigcontrol.cpp.orig	2019-04-19 04:54:51 UTC
++++ rig/rigcontrol.cpp
 @@ -377,7 +377,7 @@ void rigControl::activatePTT(bool b)
        if (catParams.pttSerialPort.isEmpty()) return;
        if(serialP==0)
diff --git a/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp b/comms/qsstv/files/patch-sound_soundalsa.cpp
similarity index 96%
rename from comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp
rename to comms/qsstv/files/patch-sound_soundalsa.cpp
index 496ad76fe6e2..10768b88f714 100644
--- a/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp
+++ b/comms/qsstv/files/patch-sound_soundalsa.cpp
@@ -1,5 +1,5 @@
---- qsstv/sound/soundalsa.cpp.orig	2019-04-18 09:34:09 UTC
-+++ qsstv/sound/soundalsa.cpp
+--- sound/soundalsa.cpp.orig	2019-04-18 09:34:09 UTC
++++ sound/soundalsa.cpp
 @@ -64,6 +64,8 @@ void soundAlsa::prepareCapture()
  {
    int err;
diff --git a/comms/qsstv/files/patch-qsstv_utils_color.cpp b/comms/qsstv/files/patch-utils_color.cpp
similarity index 63%
rename from comms/qsstv/files/patch-qsstv_utils_color.cpp
rename to comms/qsstv/files/patch-utils_color.cpp
index 2a073fa6b798..8174690cee0b 100644
--- a/comms/qsstv/files/patch-qsstv_utils_color.cpp
+++ b/comms/qsstv/files/patch-utils_color.cpp
@@ -1,5 +1,5 @@
---- qsstv/utils/color.cpp.orig	2017-11-16 17:14:48 UTC
-+++ qsstv/utils/color.cpp
+--- utils/color.cpp.orig	2017-11-16 17:14:48 UTC
++++ utils/color.cpp
 @@ -41,7 +41,7 @@
  #include <math.h>
  #include <assert.h>
diff --git a/comms/qsstv/files/patch-qsstv_utils_jp2io.h b/comms/qsstv/files/patch-utils_jp2io.h
similarity index 67%
rename from comms/qsstv/files/patch-qsstv_utils_jp2io.h
rename to comms/qsstv/files/patch-utils_jp2io.h
index 25823b7d4e9e..f0619483feab 100644
--- a/comms/qsstv/files/patch-qsstv_utils_jp2io.h
+++ b/comms/qsstv/files/patch-utils_jp2io.h
@@ -1,5 +1,5 @@
---- qsstv/utils/jp2io.h.orig	2016-08-23 19:39:12 UTC
-+++ qsstv/utils/jp2io.h
+--- utils/jp2io.h.orig	2016-08-23 19:39:12 UTC
++++ utils/jp2io.h
 @@ -1,6 +1,6 @@
  #ifndef JP2READER_H
  #define JP2READER_H
diff --git a/comms/qsstv/files/patch-qsstv_videocapt_cameradialog.cpp b/comms/qsstv/files/patch-videocapt_cameradialog.cpp
similarity index 82%
rename from comms/qsstv/files/patch-qsstv_videocapt_cameradialog.cpp
rename to comms/qsstv/files/patch-videocapt_cameradialog.cpp
index 17cd1e7072e3..8bd4682d6051 100644
--- a/comms/qsstv/files/patch-qsstv_videocapt_cameradialog.cpp
+++ b/comms/qsstv/files/patch-videocapt_cameradialog.cpp
@@ -1,5 +1,5 @@
---- qsstv/videocapt/cameradialog.cpp.orig	2019-04-19 07:07:41 UTC
-+++ qsstv/videocapt/cameradialog.cpp
+--- videocapt/cameradialog.cpp.orig	2019-04-19 07:07:41 UTC
++++ videocapt/cameradialog.cpp
 @@ -220,7 +220,8 @@ void cameraDialog::getCameraInfo(QString
        formats=getFormatList(fd);
        if(ok)
diff --git a/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h b/comms/qsstv/files/patch-videocapt_imagesettings.h
similarity index 63%
rename from comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h
rename to comms/qsstv/files/patch-videocapt_imagesettings.h
index e77dffd3109a..c8ddd9332e9f 100644
--- a/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h
+++ b/comms/qsstv/files/patch-videocapt_imagesettings.h
@@ -1,5 +1,5 @@
---- qsstv/videocapt/imagesettings.h.orig	2019-04-18 21:14:43 UTC
-+++ qsstv/videocapt/imagesettings.h
+--- videocapt/imagesettings.h.orig	2019-04-18 21:14:43 UTC
++++ videocapt/imagesettings.h
 @@ -41,7 +41,6 @@
  #ifndef IMAGESETTINGS_H
  #define IMAGESETTINGS_H
diff --git a/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp b/comms/qsstv/files/patch-videocapt_v4l2control.cpp
similarity index 65%
rename from comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp
rename to comms/qsstv/files/patch-videocapt_v4l2control.cpp
index 98fca437cc8a..7d38ac9f6851 100644
--- a/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp
+++ b/comms/qsstv/files/patch-videocapt_v4l2control.cpp
@@ -1,5 +1,5 @@
---- qsstv/videocapt/v4l2control.cpp.orig	2019-04-18 21:15:23 UTC
-+++ qsstv/videocapt/v4l2control.cpp
+--- videocapt/v4l2control.cpp.orig	2019-04-18 21:15:23 UTC
++++ videocapt/v4l2control.cpp
 @@ -32,7 +32,6 @@
  #include <cerrno>
  #include <cstring>
diff --git a/comms/qsstv/pkg-plist b/comms/qsstv/pkg-plist
index 4155b1f2e523..043d1cb4ad58 100644
--- a/comms/qsstv/pkg-plist
+++ b/comms/qsstv/pkg-plist
@@ -1,173 +1,3 @@
 bin/qsstv
 share/applications/qsstv.desktop
-%%PORTDOCS%%%%DOCSDIR%%/images/Gallery_image_options.png
-%%PORTDOCS%%%%DOCSDIR%%/images/Gallery_rx.png
-%%PORTDOCS%%%%DOCSDIR%%/images/Gallery_template.png
-%%PORTDOCS%%%%DOCSDIR%%/images/Gallery_templates.png
-%%PORTDOCS%%%%DOCSDIR%%/images/Gallery_tx.png
-%%PORTDOCS%%%%DOCSDIR%%/images/Gallery_txdrm.png
-%%PORTDOCS%%%%DOCSDIR%%/images/binary.png
-%%PORTDOCS%%%%DOCSDIR%%/images/bsr_nfy.png
-%%PORTDOCS%%%%DOCSDIR%%/images/bsr_select.png
-%%PORTDOCS%%%%DOCSDIR%%/images/calibration.png
-%%PORTDOCS%%%%DOCSDIR%%/images/config.png
-%%PORTDOCS%%%%DOCSDIR%%/images/config1.png
-%%PORTDOCS%%%%DOCSDIR%%/images/config10.png
-%%PORTDOCS%%%%DOCSDIR%%/images/config11.png
-%%PORTDOCS%%%%DOCSDIR%%/images/config12.png
-%%PORTDOCS%%%%DOCSDIR%%/images/config2.png
-%%PORTDOCS%%%%DOCSDIR%%/images/config3.png
-%%PORTDOCS%%%%DOCSDIR%%/images/config4.png
-%%PORTDOCS%%%%DOCSDIR%%/images/config5.png
-%%PORTDOCS%%%%DOCSDIR%%/images/config6.png
-%%PORTDOCS%%%%DOCSDIR%%/images/config7.png
-%%PORTDOCS%%%%DOCSDIR%%/images/config8.png
-%%PORTDOCS%%%%DOCSDIR%%/images/config9.png
-%%PORTDOCS%%%%DOCSDIR%%/images/cqrlog1.png
-%%PORTDOCS%%%%DOCSDIR%%/images/cqrlog2.png
-%%PORTDOCS%%%%DOCSDIR%%/images/editor_1.png
-%%PORTDOCS%%%%DOCSDIR%%/images/editor_2.png
-%%PORTDOCS%%%%DOCSDIR%%/images/editor_3.png
-%%PORTDOCS%%%%DOCSDIR%%/images/editor_image_size.png
-%%PORTDOCS%%%%DOCSDIR%%/images/entertext.png
-%%PORTDOCS%%%%DOCSDIR%%/images/eraser.png
-%%PORTDOCS%%%%DOCSDIR%%/images/fix.png
-%%PORTDOCS%%%%DOCSDIR%%/images/flrig1.png
-%%PORTDOCS%%%%DOCSDIR%%/images/hybrid_checkbox.png
-%%PORTDOCS%%%%DOCSDIR%%/images/hybrid_dis_checkbox.png
-%%PORTDOCS%%%%DOCSDIR%%/images/multiline.png
-%%PORTDOCS%%%%DOCSDIR%%/images/receivedrm.png
-%%PORTDOCS%%%%DOCSDIR%%/images/refreshbutton.png
-%%PORTDOCS%%%%DOCSDIR%%/images/rxdrm_constellation.png
-%%PORTDOCS%%%%DOCSDIR%%/images/rxdrm_segments.png
-%%PORTDOCS%%%%DOCSDIR%%/images/rxdrm_status.png
-%%PORTDOCS%%%%DOCSDIR%%/images/rxwidget1.png
-%%PORTDOCS%%%%DOCSDIR%%/images/statusbar.png
-%%PORTDOCS%%%%DOCSDIR%%/images/statusleds.png
-%%PORTDOCS%%%%DOCSDIR%%/images/transmitdrm.png
-%%PORTDOCS%%%%DOCSDIR%%/images/tx-with-template.png
-%%PORTDOCS%%%%DOCSDIR%%/images/txdrm_compression.png
-%%PORTDOCS%%%%DOCSDIR%%/images/txdrm_options.png
-%%PORTDOCS%%%%DOCSDIR%%/images/txdrm_status.png
-%%PORTDOCS%%%%DOCSDIR%%/images/txwidget1.png
-%%PORTDOCS%%%%DOCSDIR%%/images/vk4aes.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/waterfall.png
-%%PORTDOCS%%%%DOCSDIR%%/images/wf_bsr_id.png
-%%PORTDOCS%%%%DOCSDIR%%/images/wftextpopup.png
-%%PORTDOCS%%%%DOCSDIR%%/manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_image_options.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_rx.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_templates.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_txdrm.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/_copying.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/_r_x_d_r_m.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/_r_x_s_s_t_v.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/_t_x_d_r_m.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/_t_x_s_s_t_v.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/arrow.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/bc_s.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/bdwn.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/binary.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/bsr_nfy.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/bsr_select.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/calibration.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/camera.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/closed.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/config.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/config1.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/config10.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/config11.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/config12.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/config2.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/config3.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/config4.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/config5.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/config6.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/config7.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/config8.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/config9.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/cqrlog1.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/cqrlog2.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/credits.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/doc.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/doubletone.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/doxygen.svg
-%%PORTDOCS%%%%DOCSDIR%%/manual/dynsections.js
-%%PORTDOCS%%%%DOCSDIR%%/manual/edit.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/editor.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/editor_1.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/editor_2.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/editor_image_size.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/entertext.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/eraser.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/externalprog.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fcircle.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/fileopen.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/filesave.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/fix.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/fixdrm.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/flrig1.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/folderclosed.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/folderopen.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/frect.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/gallery.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/gettingstarted.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/hybrid_checkbox.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/hybrid_dis_checkbox.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/imagepopup.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/index.js
-%%PORTDOCS%%%%DOCSDIR%%/manual/installation.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/jquery.js
-%%PORTDOCS%%%%DOCSDIR%%/manual/line.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/menu.js
-%%PORTDOCS%%%%DOCSDIR%%/manual/menudata.js
-%%PORTDOCS%%%%DOCSDIR%%/manual/multiline.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/nav_f.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/nav_g.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/nav_h.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/navtree.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/navtree.js
-%%PORTDOCS%%%%DOCSDIR%%/manual/navtreedata.js
-%%PORTDOCS%%%%DOCSDIR%%/manual/navtreeindex0.js
-%%PORTDOCS%%%%DOCSDIR%%/manual/open.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/pages.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/qsstv.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/receivedrm.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/refreshbutton.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/repeater.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/replay.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/resize.js
-%%PORTDOCS%%%%DOCSDIR%%/manual/rxdrm_constellation.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/rxdrm_segments.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/rxdrm_status.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/rxwidget1.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/splitbar.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/start.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/statusbar.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/statusbar.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/statusleds.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/stop.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/sweep.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/sync_off.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/sync_on.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/tab_a.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/tab_b.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/tab_h.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/tab_s.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/tabs.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/text.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/todo1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/tone.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/transmitdrm.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/txdrm_compression.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/txdrm_options.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/txdrm_status.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/txwidget1.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/vk4aes.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/waterfall.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/wftextpopup.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/whatsnew.html
-%%PORTDOCS%%%%DOCSDIR%%/qsstv.css
-%%PORTDOCS%%@dir %%DOCSDIR%%/manual
+share/pixmaps/qsstv.png