From e3ddded066b6ae51c988f9a2cd5f3c3cc07c2014 Mon Sep 17 00:00:00 2001 From: db Date: Thu, 15 Aug 2013 01:52:50 +0000 Subject: - restore qsstv and update to latest - reassign maintainership - This update moves qsstv to QT4 PR: ports/181233 Submitted by: Stephen Hurd --- comms/Makefile | 1 + comms/qsstv/Makefile | 42 +++++++++++++ comms/qsstv/distinfo | 2 + comms/qsstv/files/patch-no_designer | 15 +++++ comms/qsstv/files/patch-src_camcontrol.ui | 10 ++++ comms/qsstv/files/patch-src_configdialog.cpp | 19 ++++++ comms/qsstv/files/patch-src_configform.ui | 10 ++++ ...atch-src_documentation_html_gettingstarted.html | 11 ++++ comms/qsstv/files/patch-src_freqform.ui | 10 ++++ comms/qsstv/files/patch-src_soundcontrol.ui | 10 ++++ comms/qsstv/files/patch-src_src.pro | 22 +++++++ comms/qsstv/files/patch-src_sweepform.ui | 10 ++++ comms/qsstv/pkg-descr | 3 + comms/qsstv/pkg-plist | 68 ++++++++++++++++++++++ 14 files changed, 233 insertions(+) create mode 100644 comms/qsstv/Makefile create mode 100644 comms/qsstv/distinfo create mode 100644 comms/qsstv/files/patch-no_designer create mode 100644 comms/qsstv/files/patch-src_camcontrol.ui create mode 100644 comms/qsstv/files/patch-src_configdialog.cpp create mode 100644 comms/qsstv/files/patch-src_configform.ui create mode 100644 comms/qsstv/files/patch-src_documentation_html_gettingstarted.html create mode 100644 comms/qsstv/files/patch-src_freqform.ui create mode 100644 comms/qsstv/files/patch-src_soundcontrol.ui create mode 100644 comms/qsstv/files/patch-src_src.pro create mode 100644 comms/qsstv/files/patch-src_sweepform.ui create mode 100644 comms/qsstv/pkg-descr create mode 100644 comms/qsstv/pkg-plist (limited to 'comms') diff --git a/comms/Makefile b/comms/Makefile index eabb396987e2..6dced03e891f 100644 --- a/comms/Makefile +++ b/comms/Makefile @@ -126,6 +126,7 @@ SUBDIR += qico SUBDIR += qpage SUBDIR += qrq + SUBDIR += qsstv SUBDIR += remserial SUBDIR += rtl-sdr SUBDIR += rubygem-callsign diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile new file mode 100644 index 000000000000..404fa3a39ecf --- /dev/null +++ b/comms/qsstv/Makefile @@ -0,0 +1,42 @@ +# $FreeBSD$ + +PORTNAME= qsstv +PORTVERSION= 7.1.7 +CATEGORIES= comms hamradio +MASTER_SITES= http://users.telenet.be/on4qz/qsstv/downloads/ \ + ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= db +DISTNAME= ${PORTNAME}_${PORTVERSION} +EXTRACT_SUFX= .tgz + +MAINTAINER= shurd@sasktel.net +COMMENT= Amateur Radio SSTV/FAX reception program for unix + +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 \ + hamlib:${PORTSDIR}/comms/hamlib \ + asound:${PORTSDIR}/audio/alsa-lib +BUILD_DEPENDS= v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat + +USE_QT4= gui network moc_build qmake_build rcc_build uic_build + +OPTIONS_DEFINE= DOCS + +.include + +.if ! ${PORT_OPTIONS:MDOCS} +INSTALL_WRKSRC= ${WRKSRC}/src +INSTALL_TARGET= install_target +.endif + +post-patch: + @${RM} -f ${WRKSRC}/src/documentation/html/gettingstarted.html.orig + @${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' \ + ${WRKSRC}/src/configdialog.cpp ${WRKSRC}/src/src.pro + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ + ${WRKSRC}/src/src.pro + +do-configure: + @cd ${WRKSRC}; \ + ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${DISTNAME}.pro + +.include diff --git a/comms/qsstv/distinfo b/comms/qsstv/distinfo new file mode 100644 index 000000000000..34029e106b55 --- /dev/null +++ b/comms/qsstv/distinfo @@ -0,0 +1,2 @@ +SHA256 (qsstv_7.1.7.tgz) = ae713985af1072ab267c280dcb81c830a9a026545cf402444e1f72a3e7f25f00 +SIZE (qsstv_7.1.7.tgz) = 2116410 diff --git a/comms/qsstv/files/patch-no_designer b/comms/qsstv/files/patch-no_designer new file mode 100644 index 000000000000..8d4f2e5774c5 --- /dev/null +++ b/comms/qsstv/files/patch-no_designer @@ -0,0 +1,15 @@ +--- src/widgets/qvumeter.h.orig 2008-02-21 09:01:00.000000000 -0800 ++++ src/widgets/qvumeter.h 2013-08-11 17:41:46.000000000 -0700 +@@ -22,11 +22,10 @@ + #define QVUMETER_H + + #include +-#include + #include + + +-class QDESIGNER_WIDGET_EXPORT QVUMeter : public QWidget ++class Q_DECL_IMPORT QVUMeter : public QWidget + { + Q_OBJECT + Q_PROPERTY(QColor colorBg READ colorBg WRITE setColorBg); diff --git a/comms/qsstv/files/patch-src_camcontrol.ui b/comms/qsstv/files/patch-src_camcontrol.ui new file mode 100644 index 000000000000..b3d681884224 --- /dev/null +++ b/comms/qsstv/files/patch-src_camcontrol.ui @@ -0,0 +1,10 @@ +--- src/camcontrol.ui.orig 2008-06-20 09:47:28.000000000 -0700 ++++ src/camcontrol.ui 2013-08-11 18:22:01.000000000 -0700 +@@ -475,7 +475,6 @@ + + + +- qPixmapFromMimeSource + + + Q3Frame diff --git a/comms/qsstv/files/patch-src_configdialog.cpp b/comms/qsstv/files/patch-src_configdialog.cpp new file mode 100644 index 000000000000..ba98cdef7e0b --- /dev/null +++ b/comms/qsstv/files/patch-src_configdialog.cpp @@ -0,0 +1,19 @@ +--- src/configdialog.cpp.orig 2013-06-30 19:37:03.000000000 -0700 ++++ src/configdialog.cpp 2013-06-30 19:38:19.000000000 -0700 +@@ -100,14 +100,14 @@ + txImagesPath=qSettings.value("txImagesPath",QString(getenv("HOME"))+"/").toString(); + templatesPath=qSettings.value("templatesPath",QString(getenv("HOME"))+"/").toString(); + audioPath=qSettings.value("audioPath",QString(getenv("HOME"))+"/").toString(); +- docPath =qSettings.value("docPath",QString("/usr/share/doc/qsstv/")).toString(); ++ docPath =qSettings.value("docPath",QString("%%DOCSDIR%%")).toString(); + defaultImageFormat=qSettings.value("defaultImageFormat","png").toString(); + samplingrate=qSettings.value("samplingrate",11025).toInt(); + rxClock=qSettings.value("rxclock",11025.).toDouble(); + txClock=qSettings.value("txclock",11025.).toDouble(); + inputAudioDevice=qSettings.value("inputAudioDevice","default").toString(); + outputAudioDevice=qSettings.value("outputAudioDevice","default").toString(); +- serialPort=qSettings.value("serialPort","/dev/ttyS0").toString(); ++ serialPort=qSettings.value("serialPort","/dev/ttyu0").toString(); + radioModel=qSettings.value("radioModel","dummy").toString(); + civAddress=qSettings.value("civAddress",0x70).toInt(); + baudrate=qSettings.value("baudrate",9600).toInt(); diff --git a/comms/qsstv/files/patch-src_configform.ui b/comms/qsstv/files/patch-src_configform.ui new file mode 100644 index 000000000000..78cbdedd1374 --- /dev/null +++ b/comms/qsstv/files/patch-src_configform.ui @@ -0,0 +1,10 @@ +--- src/configform.ui.orig 2013-08-11 18:17:50.000000000 -0700 ++++ src/configform.ui 2013-08-11 18:18:00.000000000 -0700 +@@ -2963,7 +2963,6 @@ + + + +- qPixmapFromMimeSource + + + diff --git a/comms/qsstv/files/patch-src_documentation_html_gettingstarted.html b/comms/qsstv/files/patch-src_documentation_html_gettingstarted.html new file mode 100644 index 000000000000..e6882f6fef30 --- /dev/null +++ b/comms/qsstv/files/patch-src_documentation_html_gettingstarted.html @@ -0,0 +1,11 @@ +--- src/documentation/html/gettingstarted.html.orig 2013-06-30 20:08:44.000000000 -0700 ++++ src/documentation/html/gettingstarted.html 2013-06-30 20:08:51.000000000 -0700 +@@ -112,7 +112,7 @@ +
  • CIV Address: only used for ICOM, default is 112 (hex: 0x70)
  • +
  • Serial Port/host: either the serial port (e.g. /dev/ttyUSB0) or the host address (e.g. localhost:4532)
  • +
  • Handshake, Parity, Data bits, Stop bits, Baudrate: serial port settings
  • +-
  • PTT Serial Port: serial port (e.g. /dev/ttyS0) only used if "Enable PTT serial Interface" is selected
  • ++
  • PTT Serial Port: serial port (e.g. /dev/ttyu0) only used if "Enable PTT serial Interface" is selected
  • + + + diff --git a/comms/qsstv/files/patch-src_freqform.ui b/comms/qsstv/files/patch-src_freqform.ui new file mode 100644 index 000000000000..030736d8e7df --- /dev/null +++ b/comms/qsstv/files/patch-src_freqform.ui @@ -0,0 +1,10 @@ +--- src/freqform.ui.orig 2013-08-11 18:18:41.000000000 -0700 ++++ src/freqform.ui 2013-08-11 18:18:46.000000000 -0700 +@@ -281,7 +281,6 @@ + + + +- qPixmapFromMimeSource + + + diff --git a/comms/qsstv/files/patch-src_soundcontrol.ui b/comms/qsstv/files/patch-src_soundcontrol.ui new file mode 100644 index 000000000000..b140b7517955 --- /dev/null +++ b/comms/qsstv/files/patch-src_soundcontrol.ui @@ -0,0 +1,10 @@ +--- src/soundcontrol.ui.orig 2013-08-11 18:20:01.000000000 -0700 ++++ src/soundcontrol.ui 2013-08-11 18:20:09.000000000 -0700 +@@ -209,7 +209,6 @@ + + + +- qPixmapFromMimeSource + + + diff --git a/comms/qsstv/files/patch-src_src.pro b/comms/qsstv/files/patch-src_src.pro new file mode 100644 index 000000000000..a3597ef867e2 --- /dev/null +++ b/comms/qsstv/files/patch-src_src.pro @@ -0,0 +1,22 @@ +--- src/src.pro.orig 2012-01-04 13:11:46.000000000 -0800 ++++ src/src.pro 2013-06-30 20:05:22.000000000 -0700 +@@ -180,15 +180,15 @@ + QMAKE_EXTRA_TARGETS += dox + message(dox will be generated) + } +-dox.path=/usr/share/doc/$$TARGET ++dox.path=%%DOCSDIR%% + dox.files= $$PWD/documentation/html/* + +- LIBS += -L/usr/lib64 \ ++ LIBS += \ + -lfftw3 \ + -lasound \ + -lhamlib + +-target.path=/usr/local/bin +-target.extra = strip $(TARGET); cp -f $(TARGET) $${PREFIX}/bin/$(TARGET) ++target.path=%%PREFIX%%/bin ++target.extra = strip $(TARGET); cp -f $(TARGET) %%PREFIX%%/bin/$(TARGET) + INSTALLS +=target + INSTALLS +=dox diff --git a/comms/qsstv/files/patch-src_sweepform.ui b/comms/qsstv/files/patch-src_sweepform.ui new file mode 100644 index 000000000000..ef4a0b73757a --- /dev/null +++ b/comms/qsstv/files/patch-src_sweepform.ui @@ -0,0 +1,10 @@ +--- src/sweepform.ui.orig 2013-08-11 18:20:48.000000000 -0700 ++++ src/sweepform.ui 2013-08-11 18:20:55.000000000 -0700 +@@ -248,7 +248,6 @@ + + + +- qPixmapFromMimeSource + + + diff --git a/comms/qsstv/pkg-descr b/comms/qsstv/pkg-descr new file mode 100644 index 000000000000..5b0e237f7169 --- /dev/null +++ b/comms/qsstv/pkg-descr @@ -0,0 +1,3 @@ +Amateur Radio SSTV/FAX transmit and reception program for unix + +WWW: http://users.telenet.be/on4qz/ diff --git a/comms/qsstv/pkg-plist b/comms/qsstv/pkg-plist new file mode 100644 index 000000000000..f357fb540ecf --- /dev/null +++ b/comms/qsstv/pkg-plist @@ -0,0 +1,68 @@ +bin/qsstv +%%PORTDOCS%%%%DOCSDIR%%/_r_x.html +%%PORTDOCS%%%%DOCSDIR%%/_t_x.html +%%PORTDOCS%%%%DOCSDIR%%/arrow.png +%%PORTDOCS%%%%DOCSDIR%%/bc_s.png +%%PORTDOCS%%%%DOCSDIR%%/calibration.png +%%PORTDOCS%%%%DOCSDIR%%/camera.png +%%PORTDOCS%%%%DOCSDIR%%/changelog.html +%%PORTDOCS%%%%DOCSDIR%%/closed.png +%%PORTDOCS%%%%DOCSDIR%%/config.png +%%PORTDOCS%%%%DOCSDIR%%/doubletone.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen.css +%%PORTDOCS%%%%DOCSDIR%%/doxygen.png +%%PORTDOCS%%%%DOCSDIR%%/edit.png +%%PORTDOCS%%%%DOCSDIR%%/editor.html +%%PORTDOCS%%%%DOCSDIR%%/editor_1.png +%%PORTDOCS%%%%DOCSDIR%%/editor_2.png +%%PORTDOCS%%%%DOCSDIR%%/editor_3.png +%%PORTDOCS%%%%DOCSDIR%%/fcircle.png +%%PORTDOCS%%%%DOCSDIR%%/fileopen.png +%%PORTDOCS%%%%DOCSDIR%%/filesave.png +%%PORTDOCS%%%%DOCSDIR%%/frect.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2blank.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2doc.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2folderclosed.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2folderopen.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2lastnode.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2link.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2mlastnode.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2mnode.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2node.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2plastnode.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2pnode.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2splitbar.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2vertline.png +%%PORTDOCS%%%%DOCSDIR%%/gallery.html +%%PORTDOCS%%%%DOCSDIR%%/Gallery_rx.png +%%PORTDOCS%%%%DOCSDIR%%/Gallery_template.png +%%PORTDOCS%%%%DOCSDIR%%/Gallery_tx.png +%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/installation.html +%%PORTDOCS%%%%DOCSDIR%%/jquery.js +%%PORTDOCS%%%%DOCSDIR%%/line.png +%%PORTDOCS%%%%DOCSDIR%%/nav_f.png +%%PORTDOCS%%%%DOCSDIR%%/nav_h.png +%%PORTDOCS%%%%DOCSDIR%%/navtree.css +%%PORTDOCS%%%%DOCSDIR%%/navtree.js +%%PORTDOCS%%%%DOCSDIR%%/open.png +%%PORTDOCS%%%%DOCSDIR%%/pages.html +%%PORTDOCS%%%%DOCSDIR%%/qsstv.css +%%PORTDOCS%%%%DOCSDIR%%/replay.png +%%PORTDOCS%%%%DOCSDIR%%/resize.js +%%PORTDOCS%%%%DOCSDIR%%/rxwidget.png +%%PORTDOCS%%%%DOCSDIR%%/start.png +%%PORTDOCS%%%%DOCSDIR%%/stop.png +%%PORTDOCS%%%%DOCSDIR%%/sweep.png +%%PORTDOCS%%%%DOCSDIR%%/tab_a.png +%%PORTDOCS%%%%DOCSDIR%%/tab_b.png +%%PORTDOCS%%%%DOCSDIR%%/tab_h.png +%%PORTDOCS%%%%DOCSDIR%%/tab_s.png +%%PORTDOCS%%%%DOCSDIR%%/tabs.css +%%PORTDOCS%%%%DOCSDIR%%/text.png +%%PORTDOCS%%%%DOCSDIR%%/todo.html +%%PORTDOCS%%%%DOCSDIR%%/tone.png +%%PORTDOCS%%%%DOCSDIR%%/txwidget.png +%%PORTDOCS%%%%DOCSDIR%%/whatsnew.html +%%PORTDOCS%%@dirrm %%DOCSDIR%% -- cgit