19 files changed, 165 insertions, 50 deletions

diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
index daf5a5d3e826..18060dc4e402 100644
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	qsstv
-PORTVERSION=	8.2.7
+PORTVERSION=	8.2.8
 PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://users.telenet.be/on4qz/qsstv/downloads/ \
 		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+MASTER_SITE_SUBDIR=	shurd
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	shurd@FreeBSD.org
+MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio SSTV/FAX reception program for unix
 
 LICENSE=	GPLv3
@@ -19,18 +19,9 @@ LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libhamlib.so:${PORTSDIR}/comms/hamlib \
 		libasound.so:${PORTSDIR}/audio/alsa-lib \
 		libjasper.so:${PORTSDIR}/graphics/jasper
-.if defined(WITH_DEBUG)
-LIB_DEPENDS+=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5
-.endif
 BUILD_DEPENDS=	v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat
 
 USES=		qmake
 USE_QT4=	gui network xml moc_build rcc_build uic_build
 
-.if defined(WITH_DEBUG)
-IGNORE=		sources need more patching for debug build
-.endif
-
-PLIST_FILES=	bin/qsstv
-
 .include <bsd.port.mk>
diff --git a/comms/qsstv/distinfo b/comms/qsstv/distinfo
index 84461a795361..e501503fe924 100644
--- a/comms/qsstv/distinfo
+++ b/comms/qsstv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qsstv_8.2.7.tar.gz) = 85dff982ac64586e49c5472109a2dfbb17cd4598f2bb390169367da76eba6c82
-SIZE (qsstv_8.2.7.tar.gz) = 655360
+SHA256 (qsstv_8.2.8.tar.gz) = c0b54253d89e7489c2653d03960ec67df09133541c4b1a2fdd161afd44b2a177
+SIZE (qsstv_8.2.8.tar.gz) = 10868861
diff --git a/comms/qsstv/files/patch-src_configform.ui b/comms/qsstv/files/patch-qsstv_configform.ui
index 045498a67b16..f92c80446b12 100644
--- a/comms/qsstv/files/patch-src_configform.ui
+++ b/comms/qsstv/files/patch-qsstv_configform.ui
@@ -1,5 +1,5 @@
---- src/configform.ui.orig	2014-04-10 15:00:46.000000000 -0700
-+++ src/configform.ui	2014-04-10 15:00:52.000000000 -0700
+--- qsstv/configform.ui.orig	2014-04-10 15:00:46.000000000 -0700
++++ qsstv/configform.ui	2014-04-10 15:00:52.000000000 -0700
 @@ -2293,7 +2293,6 @@
    </layout>
   </widget>
diff --git a/comms/qsstv/files/patch-src_drmrx_channeldecode.cpp b/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp
index e2da325cac6a..a24f8a88ee7d 100644
--- a/comms/qsstv/files/patch-src_drmrx_channeldecode.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp
@@ -1,5 +1,5 @@
---- src/drmrx/channeldecode.cpp.orig	2014-04-08 02:02:06.000000000 -0700
-+++ src/drmrx/channeldecode.cpp	2014-04-08 02:03:28.000000000 -0700
+--- qsstv/drmrx/channeldecode.cpp.orig	2014-04-08 02:02:06.000000000 -0700
++++ qsstv/drmrx/channeldecode.cpp	2014-04-08 02:03:28.000000000 -0700
 @@ -29,7 +29,6 @@
  #include <stdlib.h>
  #include <sys/types.h>
diff --git a/comms/qsstv/files/patch-src_drmrx_deinterleaver.cpp b/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp
index b8380d758abe..9531cf89dae6 100644
--- a/comms/qsstv/files/patch-src_drmrx_deinterleaver.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp
@@ -1,5 +1,5 @@
---- src/drmrx/deinterleaver.cpp.orig	2014-04-08 02:02:11.000000000 -0700
-+++ src/drmrx/deinterleaver.cpp	2014-04-08 02:03:30.000000000 -0700
+--- qsstv/drmrx/deinterleaver.cpp.orig	2014-04-08 02:02:11.000000000 -0700
++++ qsstv/drmrx/deinterleaver.cpp	2014-04-08 02:03:30.000000000 -0700
 @@ -30,7 +30,6 @@
  
  #include <stdio.h>
diff --git a/comms/qsstv/files/patch-src_drmrx_demodulator.cpp b/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp
index faa2a11dbbbf..74da8d116282 100644
--- a/comms/qsstv/files/patch-src_drmrx_demodulator.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp
@@ -1,5 +1,5 @@
---- src/drmrx/demodulator.cpp.orig	2014-04-10 14:48:35.000000000 -0700
-+++ src/drmrx/demodulator.cpp	2014-04-10 14:49:48.000000000 -0700
+--- qsstv/drmrx/demodulator.cpp.orig	2014-04-10 14:48:35.000000000 -0700
++++ qsstv/drmrx/demodulator.cpp	2014-04-10 14:49:48.000000000 -0700
 @@ -941,7 +941,7 @@
            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-src_drmrx_getmode.cpp b/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp
index 3eae46a39c58..bcb03af46faa 100644
--- a/comms/qsstv/files/patch-src_drmrx_getmode.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp
@@ -1,5 +1,5 @@
---- src/drmrx/getmode.cpp.orig	2014-04-08 02:02:16.000000000 -0700
-+++ src/drmrx/getmode.cpp	2014-04-08 02:03:32.000000000 -0700
+--- qsstv/drmrx/getmode.cpp.orig	2014-04-08 02:02:16.000000000 -0700
++++ qsstv/drmrx/getmode.cpp	2014-04-08 02:03:32.000000000 -0700
 @@ -34,7 +34,6 @@
  #include <stdlib.h>
  #include <math.h>
diff --git a/comms/qsstv/files/patch-src_drmrx_mkfacmap.cpp b/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp
index 5c99a3778825..3be531632fa2 100644
--- a/comms/qsstv/files/patch-src_drmrx_mkfacmap.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp
@@ -1,5 +1,5 @@
---- src/drmrx/mkfacmap.cpp.orig	2014-04-08 02:02:22.000000000 -0700
-+++ src/drmrx/mkfacmap.cpp	2014-04-08 02:03:34.000000000 -0700
+--- qsstv/drmrx/mkfacmap.cpp.orig	2014-04-08 02:02:22.000000000 -0700
++++ qsstv/drmrx/mkfacmap.cpp	2014-04-08 02:03:34.000000000 -0700
 @@ -27,7 +27,6 @@
  
  #include <stdio.h>
diff --git a/comms/qsstv/files/patch-src_drmrx_mkmscmap.cpp b/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp
index 064f4cbb8829..3c425a9511ac 100644
--- a/comms/qsstv/files/patch-src_drmrx_mkmscmap.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp
@@ -1,5 +1,5 @@
---- src/drmrx/mkmscmap.cpp.orig	2014-04-08 02:02:32.000000000 -0700
-+++ src/drmrx/mkmscmap.cpp	2014-04-08 02:03:36.000000000 -0700
+--- qsstv/drmrx/mkmscmap.cpp.orig	2014-04-08 02:02:32.000000000 -0700
++++ qsstv/drmrx/mkmscmap.cpp	2014-04-08 02:03:36.000000000 -0700
 @@ -32,7 +32,6 @@
  #include <stdlib.h>
  #include <sys/types.h>
diff --git a/comms/qsstv/files/patch-src_drmrx_psdcmean.cpp b/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp
index b4e830a5e653..6dce444fecc3 100644
--- a/comms/qsstv/files/patch-src_drmrx_psdcmean.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp
@@ -1,5 +1,5 @@
---- src/drmrx/psdcmean.cpp.orig	2014-04-08 02:02:38.000000000 -0700
-+++ src/drmrx/psdcmean.cpp	2014-04-08 02:03:38.000000000 -0700
+--- qsstv/drmrx/psdcmean.cpp.orig	2014-04-08 02:02:38.000000000 -0700
++++ qsstv/drmrx/psdcmean.cpp	2014-04-08 02:03:38.000000000 -0700
 @@ -36,7 +36,6 @@
  #include <stdlib.h>
  #include <math.h>
diff --git a/comms/qsstv/files/patch-src_drmrx_psdmean.cpp b/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp
index 0de7aa97c900..5c83ebb4ed6f 100644
--- a/comms/qsstv/files/patch-src_drmrx_psdmean.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp
@@ -1,5 +1,5 @@
---- src/drmrx/psdmean.cpp.orig	2014-04-08 02:02:47.000000000 -0700
-+++ src/drmrx/psdmean.cpp	2014-04-08 02:03:40.000000000 -0700
+--- qsstv/drmrx/psdmean.cpp.orig	2014-04-08 02:02:47.000000000 -0700
++++ qsstv/drmrx/psdmean.cpp	2014-04-08 02:03:40.000000000 -0700
 @@ -36,7 +36,6 @@
  #include <stdlib.h>
  #include <math.h>
diff --git a/comms/qsstv/files/patch-qsstv_8.pro b/comms/qsstv/files/patch-qsstv_qsstv.pro
index 7fb73d47e875..b9df9f9379dc 100644
--- a/comms/qsstv/files/patch-qsstv_8.pro
+++ b/comms/qsstv/files/patch-qsstv_qsstv.pro
@@ -1,15 +1,14 @@
---- qsstv_8.pro.orig	2014-02-28 08:51:21.000000000 -0800
-+++ qsstv_8.pro	2014-04-08 02:48:09.000000000 -0700
-@@ -420,7 +420,7 @@
- FORMS   += src/scope/scopeoffset.ui \
- 				src/scope/plotform.ui
+--- qsstv/qsstv.pro.orig	2014-10-11 09:38:33.000000000 -0700
++++ qsstv/qsstv.pro	2014-11-22 19:05:11.000000000 -0800
+@@ -420,7 +420,6 @@
+ FORMS   += scope/scopeoffset.ui \
+ 				scope/plotform.ui
  
 - INCLUDEPATH += /usr/include/qwt
-+ INCLUDEPATH += $$PREFIX/include/qwt6
-  LIBS += -lqwt
+  LIBS += ../qwt/libqwt.a
  }
  
-@@ -430,10 +430,10 @@
+@@ -430,10 +429,10 @@
  PRE_TARGETDEPS       +=    dox
  message(dox will be generated)
  }
diff --git a/comms/qsstv/files/patch-src_sound_soundcontrol.cpp b/comms/qsstv/files/patch-qsstv_sound_soundcontrol.cpp
index b05af362e1a4..6bf794e58a94 100644
--- a/comms/qsstv/files/patch-src_sound_soundcontrol.cpp
+++ b/comms/qsstv/files/patch-qsstv_sound_soundcontrol.cpp
@@ -1,5 +1,5 @@
---- src/sound/soundcontrol.cpp.orig	2014-04-09 10:27:08.000000000 -0700
-+++ src/sound/soundcontrol.cpp	2014-04-09 10:27:28.000000000 -0700
+--- qsstv/sound/soundcontrol.cpp.orig	2014-04-09 10:27:08.000000000 -0700
++++ qsstv/sound/soundcontrol.cpp	2014-04-09 10:27:28.000000000 -0700
 @@ -53,8 +53,8 @@
    txClock=qSettings.value("txclock",BASESAMPLERATE).toDouble();
    if(fabs(1-rxClock/BASESAMPLERATE)>0.002) rxClock=BASESAMPLERATE;
diff --git a/comms/qsstv/files/patch-src_sound_soundcontrol.h b/comms/qsstv/files/patch-qsstv_sound_soundcontrol.h
index 20a40c97e674..024f2f7d9635 100644
--- a/comms/qsstv/files/patch-src_sound_soundcontrol.h
+++ b/comms/qsstv/files/patch-qsstv_sound_soundcontrol.h
@@ -1,5 +1,5 @@
---- src/sound/soundcontrol.h.orig	2014-04-09 10:27:16.000000000 -0700
-+++ src/sound/soundcontrol.h	2014-04-09 10:27:28.000000000 -0700
+--- qsstv/sound/soundcontrol.h.orig	2014-04-09 10:27:16.000000000 -0700
++++ qsstv/sound/soundcontrol.h	2014-04-09 10:27:28.000000000 -0700
 @@ -22,8 +22,8 @@
  
  private:
diff --git a/comms/qsstv/files/patch-src_sound_soundio.cpp b/comms/qsstv/files/patch-qsstv_sound_soundio.cpp
index 4e00f56f99be..7f2823ffb94c 100644
--- a/comms/qsstv/files/patch-src_sound_soundio.cpp
+++ b/comms/qsstv/files/patch-qsstv_sound_soundio.cpp
@@ -1,5 +1,5 @@
---- src/sound/soundio.cpp.orig	2014-04-03 11:15:08.000000000 -0700
-+++ src/sound/soundio.cpp	2014-04-09 21:47:59.000000000 -0700
+--- qsstv/sound/soundio.cpp.orig	2014-04-03 11:15:08.000000000 -0700
++++ qsstv/sound/soundio.cpp	2014-04-09 21:47:59.000000000 -0700
 @@ -328,7 +328,9 @@
                if ( count == -EPIPE )
                  {
diff --git a/comms/qsstv/files/patch-src_widgets_freqform.ui b/comms/qsstv/files/patch-qsstv_widgets_freqform.ui
index 4fe3e9badc26..f16e91f75b37 100644
--- a/comms/qsstv/files/patch-src_widgets_freqform.ui
+++ b/comms/qsstv/files/patch-qsstv_widgets_freqform.ui
@@ -1,5 +1,5 @@
---- src/widgets/freqform.ui.orig	2014-04-10 14:59:37.000000000 -0700
-+++ src/widgets/freqform.ui	2014-04-10 14:59:45.000000000 -0700
+--- qsstv/widgets/freqform.ui.orig	2014-04-10 14:59:37.000000000 -0700
++++ qsstv/widgets/freqform.ui	2014-04-10 14:59:45.000000000 -0700
 @@ -242,7 +242,6 @@
    </layout>
   </widget>
diff --git a/comms/qsstv/files/patch-src_widgets_sweepform.ui b/comms/qsstv/files/patch-qsstv_widgets_sweepform.ui
index ea95ad61d9bc..fb9dae7225c2 100644
--- a/comms/qsstv/files/patch-src_widgets_sweepform.ui
+++ b/comms/qsstv/files/patch-qsstv_widgets_sweepform.ui
@@ -1,5 +1,5 @@
---- src/widgets/sweepform.ui.orig	2014-04-10 15:00:13.000000000 -0700
-+++ src/widgets/sweepform.ui	2014-04-10 15:00:18.000000000 -0700
+--- qsstv/widgets/sweepform.ui.orig	2014-04-10 15:00:13.000000000 -0700
++++ qsstv/widgets/sweepform.ui	2014-04-10 15:00:18.000000000 -0700
 @@ -248,7 +248,6 @@
    </layout>
   </widget>
diff --git a/comms/qsstv/files/patch-qwt_qwt.pro b/comms/qsstv/files/patch-qwt_qwt.pro
new file mode 100644
index 000000000000..a0740b77ae28
--- /dev/null
+++ b/comms/qsstv/files/patch-qwt_qwt.pro
@@ -0,0 +1,8 @@
+--- qwt/qwt.pro.orig	2014-11-22 18:51:18.000000000 -0800
++++ qwt/qwt.pro	2014-11-22 18:51:34.000000000 -0800
+@@ -209,5 +209,4 @@
+     } else {
+         target.path = /usr/lib
+     }
+-    INSTALLS += target
+ }
diff --git a/comms/qsstv/pkg-plist b/comms/qsstv/pkg-plist
new file mode 100644
index 000000000000..d7e75038a79c
--- /dev/null
+++ b/comms/qsstv/pkg-plist
@@ -0,0 +1,117 @@
+bin/qsstv
+%%DOCSDIR%%/Gallery_rx.png
+%%DOCSDIR%%/Gallery_template.png
+%%DOCSDIR%%/Gallery_tx.png
+%%DOCSDIR%%/_copying.html
+%%DOCSDIR%%/_r_x_d_r_m.html
+%%DOCSDIR%%/_r_x_s_s_t_v.html
+%%DOCSDIR%%/_t_x_d_r_m.html
+%%DOCSDIR%%/_t_x_s_s_t_v.html
+%%DOCSDIR%%/arrow.png
+%%DOCSDIR%%/bc_s.png
+%%DOCSDIR%%/bdwn.png
+%%DOCSDIR%%/bsr_nfy.png
+%%DOCSDIR%%/bsr_select.png
+%%DOCSDIR%%/calibration.png
+%%DOCSDIR%%/camera.png
+%%DOCSDIR%%/changelog.html
+%%DOCSDIR%%/closed.png
+%%DOCSDIR%%/config.png
+%%DOCSDIR%%/config1.png
+%%DOCSDIR%%/config10.png
+%%DOCSDIR%%/config11.png
+%%DOCSDIR%%/config2.png
+%%DOCSDIR%%/config3.png
+%%DOCSDIR%%/config4.png
+%%DOCSDIR%%/config5.png
+%%DOCSDIR%%/config6.png
+%%DOCSDIR%%/config7.png
+%%DOCSDIR%%/config8.png
+%%DOCSDIR%%/config9.png
+%%DOCSDIR%%/cqrlog1.png
+%%DOCSDIR%%/cqrlog2.png
+%%DOCSDIR%%/credits.html
+%%DOCSDIR%%/doubletone.png
+%%DOCSDIR%%/doxygen.png
+%%DOCSDIR%%/dynsections.js
+%%DOCSDIR%%/edit.png
+%%DOCSDIR%%/editor.html
+%%DOCSDIR%%/editor_1.png
+%%DOCSDIR%%/editor_2.png
+%%DOCSDIR%%/externalprog.html
+%%DOCSDIR%%/fcircle.png
+%%DOCSDIR%%/fileopen.png
+%%DOCSDIR%%/filesave.png
+%%DOCSDIR%%/fix.png
+%%DOCSDIR%%/fixdrm.html
+%%DOCSDIR%%/flrig1.png
+%%DOCSDIR%%/frect.png
+%%DOCSDIR%%/ftv2blank.png
+%%DOCSDIR%%/ftv2cl.png
+%%DOCSDIR%%/ftv2doc.png
+%%DOCSDIR%%/ftv2folderclosed.png
+%%DOCSDIR%%/ftv2folderopen.png
+%%DOCSDIR%%/ftv2lastnode.png
+%%DOCSDIR%%/ftv2link.png
+%%DOCSDIR%%/ftv2mlastnode.png
+%%DOCSDIR%%/ftv2mnode.png
+%%DOCSDIR%%/ftv2mo.png
+%%DOCSDIR%%/ftv2node.png
+%%DOCSDIR%%/ftv2ns.png
+%%DOCSDIR%%/ftv2plastnode.png
+%%DOCSDIR%%/ftv2pnode.png
+%%DOCSDIR%%/ftv2splitbar.png
+%%DOCSDIR%%/ftv2vertline.png
+%%DOCSDIR%%/gallery.html
+%%DOCSDIR%%/gettingstarted.html
+%%DOCSDIR%%/hybrid_checkbox.png
+%%DOCSDIR%%/hybrid_dis_checkbox.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.js
+%%DOCSDIR%%/installation.html
+%%DOCSDIR%%/jquery.js
+%%DOCSDIR%%/line.png
+%%DOCSDIR%%/nav_f.png
+%%DOCSDIR%%/nav_g.png
+%%DOCSDIR%%/nav_h.png
+%%DOCSDIR%%/navtree.css
+%%DOCSDIR%%/navtree.js
+%%DOCSDIR%%/navtreeindex0.js
+%%DOCSDIR%%/open.png
+%%DOCSDIR%%/pages.html
+%%DOCSDIR%%/qsstv.css
+%%DOCSDIR%%/receivedrm.png
+%%DOCSDIR%%/receivesstv.png
+%%DOCSDIR%%/replay.png
+%%DOCSDIR%%/resize.js
+%%DOCSDIR%%/rxdrm_constellation.png
+%%DOCSDIR%%/rxdrm_segments.png
+%%DOCSDIR%%/rxdrm_status.png
+%%DOCSDIR%%/sstvdrmselect.png
+%%DOCSDIR%%/start.png
+%%DOCSDIR%%/statusbar.html
+%%DOCSDIR%%/statusbar.png
+%%DOCSDIR%%/statusleds.png
+%%DOCSDIR%%/stop.png
+%%DOCSDIR%%/sweep.png
+%%DOCSDIR%%/sync_off.png
+%%DOCSDIR%%/sync_on.png
+%%DOCSDIR%%/tab_a.png
+%%DOCSDIR%%/tab_b.png
+%%DOCSDIR%%/tab_h.png
+%%DOCSDIR%%/tab_s.png
+%%DOCSDIR%%/tabs.css
+%%DOCSDIR%%/text.png
+%%DOCSDIR%%/todo1.html
+%%DOCSDIR%%/tone.png
+%%DOCSDIR%%/toolbar.html
+%%DOCSDIR%%/transmitdrm.png
+%%DOCSDIR%%/transmitsstv.png
+%%DOCSDIR%%/tx-with-template.png
+%%DOCSDIR%%/txdrm_compression.png
+%%DOCSDIR%%/txdrm_options.png
+%%DOCSDIR%%/txdrm_status.png
+%%DOCSDIR%%/waterfall.png
+%%DOCSDIR%%/wf_bsr_id.png
+%%DOCSDIR%%/wftextpopup.png
+%%DOCSDIR%%/whatsnew.html