Date: Mon, 8 Dec 2014 00:30:40 +0000 (UTC) From: Stephen Hurd <shurd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374231 - in head/comms/qsstv: . files Message-ID: <201412080030.sB80UeAc027618@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: shurd Date: Mon Dec 8 00:30:39 2014 New Revision: 374231 URL: https://svnweb.freebsd.org/changeset/ports/374231 QAT: https://qat.redports.org/buildarchive/r374231/ Log: Update to 8.2.9 As it happens, the docs being included in the archive was unintentional. Add support for the DOCS option. This fixes a bug in the reedsolomon encoder/decoder when using the RS4 mode (the program did not decode the transmissions with extensions .rs4 and could possibly crash). Added: head/comms/qsstv/files/patch-qsstv_Documentation_manual_manual.doxy (contents, props changed) Modified: head/comms/qsstv/Makefile head/comms/qsstv/distinfo head/comms/qsstv/files/patch-qsstv_qsstv.pro head/comms/qsstv/pkg-plist Modified: head/comms/qsstv/Makefile ============================================================================== --- head/comms/qsstv/Makefile Mon Dec 8 00:21:35 2014 (r374230) +++ head/comms/qsstv/Makefile Mon Dec 8 00:30:39 2014 (r374231) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= qsstv -PORTVERSION= 8.2.8 -PORTREVISION= 2 +PORTVERSION= 8.2.9 CATEGORIES= comms hamradio MASTER_SITES= http://users.telenet.be/on4qz/qsstv/downloads/ \ ${MASTER_SITE_LOCAL} @@ -24,4 +23,17 @@ BUILD_DEPENDS= v4l_compat>=0:${PORTSDIR} USES= qmake USE_QT4= gui network xml moc_build rcc_build uic_build +OPTIONS_DEFINE= DOCS +DOCS_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} +QMAKE_ARGS= CONFIG+=with_docs +.endif + +post-patch: + ${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${STAGEDIR}${DOCSDIR}|g' \ + ${WRKSRC}/qsstv/Documentation/manual/manual.doxy + .include <bsd.port.mk> Modified: head/comms/qsstv/distinfo ============================================================================== --- head/comms/qsstv/distinfo Mon Dec 8 00:21:35 2014 (r374230) +++ head/comms/qsstv/distinfo Mon Dec 8 00:30:39 2014 (r374231) @@ -1,2 +1,2 @@ -SHA256 (qsstv_8.2.8.tar.gz) = c0b54253d89e7489c2653d03960ec67df09133541c4b1a2fdd161afd44b2a177 -SIZE (qsstv_8.2.8.tar.gz) = 10868861 +SHA256 (qsstv_8.2.9.tar.gz) = cdaa5ea8edbf56e66e1a639038ae83664166d93523fe809f7e4b996772448d9d +SIZE (qsstv_8.2.9.tar.gz) = 6085475 Added: head/comms/qsstv/files/patch-qsstv_Documentation_manual_manual.doxy ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/qsstv/files/patch-qsstv_Documentation_manual_manual.doxy Mon Dec 8 00:30:39 2014 (r374231) @@ -0,0 +1,20 @@ +--- qsstv/Documentation/manual/manual.doxy.orig 2014-12-06 07:35:02.000000000 -0800 ++++ qsstv/Documentation/manual/manual.doxy 2014-12-07 16:19:50.000000000 -0800 +@@ -52,7 +52,7 @@ + # If a relative path is entered, it will be relative to the location + # where doxygen was started. If left blank the current directory will be used. + +-OUTPUT_DIRECTORY = $(HOME)/qsstv ++OUTPUT_DIRECTORY = /home/admin/fbsd/ports/head/comms/qsstv/work/stage/usr/local/share/doc/qsstv + + # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create + # 4096 sub-directories (in 2 levels) under the output directory of each output +@@ -860,7 +860,7 @@ + # If a relative path is entered the value of OUTPUT_DIRECTORY will be + # put in front of it. If left blank `html' will be used as the default path. + +-HTML_OUTPUT = manual ++HTML_OUTPUT = . + + # The HTML_FILE_EXTENSION tag can be used to specify the file extension for + # each generated HTML page (for example: .htm,.php,.asp). If it is left blank Modified: head/comms/qsstv/files/patch-qsstv_qsstv.pro ============================================================================== --- head/comms/qsstv/files/patch-qsstv_qsstv.pro Mon Dec 8 00:21:35 2014 (r374230) +++ head/comms/qsstv/files/patch-qsstv_qsstv.pro Mon Dec 8 00:30:39 2014 (r374231) @@ -1,6 +1,6 @@ ---- 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 @@ +--- qsstv/qsstv.pro.orig 2014-12-06 06:41:00.000000000 -0800 ++++ qsstv/qsstv.pro 2014-12-07 16:17:46.000000000 -0800 +@@ -420,20 +420,17 @@ FORMS += scope/scopeoffset.ui \ scope/plotform.ui @@ -8,14 +8,19 @@ LIBS += ../qwt/libqwt.a } -@@ -430,10 +429,10 @@ - PRE_TARGETDEPS += dox +-CONFIG(debug ,debug|release){ +-dox.commands = cd $$PWD/Documentation/manual ;doxygen manual.doxy; ++with_docs { ++dox.commands = cd Documentation/manual ;doxygen manual.doxy; + dox.depends= FORCE +-PRE_TARGETDEPS += dox message(dox will be generated) } -dox.path=/usr/share/doc/$$TARGET +-dox.files= $$PWD/manual/* +-QMAKE_EXTRA_TARGETS += dox +dox.path=$$PREFIX/share/doc/$$TARGET - dox.files= $$PWD/manual/* - QMAKE_EXTRA_TARGETS += dox ++dox.files= manual/* -target.path = /usr/bin +target.path = $$PREFIX/bin Modified: head/comms/qsstv/pkg-plist ============================================================================== --- head/comms/qsstv/pkg-plist Mon Dec 8 00:21:35 2014 (r374230) +++ head/comms/qsstv/pkg-plist Mon Dec 8 00:30:39 2014 (r374231) @@ -1,117 +1,111 @@ 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 +%%PORTDOCS%%%%DOCSDIR%%/Gallery_rx.png +%%PORTDOCS%%%%DOCSDIR%%/Gallery_template.png +%%PORTDOCS%%%%DOCSDIR%%/Gallery_tx.png +%%PORTDOCS%%%%DOCSDIR%%/_copying.html +%%PORTDOCS%%%%DOCSDIR%%/_r_x_d_r_m.html +%%PORTDOCS%%%%DOCSDIR%%/_r_x_s_s_t_v.html +%%PORTDOCS%%%%DOCSDIR%%/_t_x_d_r_m.html +%%PORTDOCS%%%%DOCSDIR%%/_t_x_s_s_t_v.html +%%PORTDOCS%%%%DOCSDIR%%/arrow.png +%%PORTDOCS%%%%DOCSDIR%%/bc_s.png +%%PORTDOCS%%%%DOCSDIR%%/bdwn.png +%%PORTDOCS%%%%DOCSDIR%%/bsr_nfy.png +%%PORTDOCS%%%%DOCSDIR%%/bsr_select.png +%%PORTDOCS%%%%DOCSDIR%%/calibration.png +%%PORTDOCS%%%%DOCSDIR%%/camera.png +%%PORTDOCS%%%%DOCSDIR%%/changelog.html +%%PORTDOCS%%%%DOCSDIR%%/closed.png +%%PORTDOCS%%%%DOCSDIR%%/config.png +%%PORTDOCS%%%%DOCSDIR%%/config1.png +%%PORTDOCS%%%%DOCSDIR%%/config10.png +%%PORTDOCS%%%%DOCSDIR%%/config11.png +%%PORTDOCS%%%%DOCSDIR%%/config2.png +%%PORTDOCS%%%%DOCSDIR%%/config3.png +%%PORTDOCS%%%%DOCSDIR%%/config4.png +%%PORTDOCS%%%%DOCSDIR%%/config5.png +%%PORTDOCS%%%%DOCSDIR%%/config6.png +%%PORTDOCS%%%%DOCSDIR%%/config7.png +%%PORTDOCS%%%%DOCSDIR%%/config8.png +%%PORTDOCS%%%%DOCSDIR%%/config9.png +%%PORTDOCS%%%%DOCSDIR%%/cqrlog1.png +%%PORTDOCS%%%%DOCSDIR%%/cqrlog2.png +%%PORTDOCS%%%%DOCSDIR%%/credits.html +%%PORTDOCS%%%%DOCSDIR%%/doubletone.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen.png +%%PORTDOCS%%%%DOCSDIR%%/dynsections.js +%%PORTDOCS%%%%DOCSDIR%%/edit.png +%%PORTDOCS%%%%DOCSDIR%%/editor.html +%%PORTDOCS%%%%DOCSDIR%%/editor_1.png +%%PORTDOCS%%%%DOCSDIR%%/editor_2.png +%%PORTDOCS%%%%DOCSDIR%%/externalprog.html +%%PORTDOCS%%%%DOCSDIR%%/fcircle.png +%%PORTDOCS%%%%DOCSDIR%%/fileopen.png +%%PORTDOCS%%%%DOCSDIR%%/filesave.png +%%PORTDOCS%%%%DOCSDIR%%/fix.png +%%PORTDOCS%%%%DOCSDIR%%/fixdrm.html +%%PORTDOCS%%%%DOCSDIR%%/flrig1.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%%/gettingstarted.html +%%PORTDOCS%%%%DOCSDIR%%/hybrid_checkbox.png +%%PORTDOCS%%%%DOCSDIR%%/hybrid_dis_checkbox.png +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/index.js +%%PORTDOCS%%%%DOCSDIR%%/installation.html +%%PORTDOCS%%%%DOCSDIR%%/jquery.js +%%PORTDOCS%%%%DOCSDIR%%/line.png +%%PORTDOCS%%%%DOCSDIR%%/nav_f.png +%%PORTDOCS%%%%DOCSDIR%%/nav_g.png +%%PORTDOCS%%%%DOCSDIR%%/nav_h.png +%%PORTDOCS%%%%DOCSDIR%%/navtree.css +%%PORTDOCS%%%%DOCSDIR%%/navtree.js +%%PORTDOCS%%%%DOCSDIR%%/navtreeindex0.js +%%PORTDOCS%%%%DOCSDIR%%/open.png +%%PORTDOCS%%%%DOCSDIR%%/pages.html +%%PORTDOCS%%%%DOCSDIR%%/qsstv.css +%%PORTDOCS%%%%DOCSDIR%%/receivedrm.png +%%PORTDOCS%%%%DOCSDIR%%/receivesstv.png +%%PORTDOCS%%%%DOCSDIR%%/replay.png +%%PORTDOCS%%%%DOCSDIR%%/resize.js +%%PORTDOCS%%%%DOCSDIR%%/rxdrm_constellation.png +%%PORTDOCS%%%%DOCSDIR%%/rxdrm_segments.png +%%PORTDOCS%%%%DOCSDIR%%/rxdrm_status.png +%%PORTDOCS%%%%DOCSDIR%%/start.png +%%PORTDOCS%%%%DOCSDIR%%/statusbar.html +%%PORTDOCS%%%%DOCSDIR%%/statusbar.png +%%PORTDOCS%%%%DOCSDIR%%/statusleds.png +%%PORTDOCS%%%%DOCSDIR%%/stop.png +%%PORTDOCS%%%%DOCSDIR%%/sweep.png +%%PORTDOCS%%%%DOCSDIR%%/sync_off.png +%%PORTDOCS%%%%DOCSDIR%%/sync_on.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%%/todo1.html +%%PORTDOCS%%%%DOCSDIR%%/tone.png +%%PORTDOCS%%%%DOCSDIR%%/transmitdrm.png +%%PORTDOCS%%%%DOCSDIR%%/transmitsstv.png +%%PORTDOCS%%%%DOCSDIR%%/tx-with-template.png +%%PORTDOCS%%%%DOCSDIR%%/txdrm_compression.png +%%PORTDOCS%%%%DOCSDIR%%/txdrm_options.png +%%PORTDOCS%%%%DOCSDIR%%/txdrm_status.png +%%PORTDOCS%%%%DOCSDIR%%/waterfall.png +%%PORTDOCS%%%%DOCSDIR%%/wftextpopup.png +%%PORTDOCS%%%%DOCSDIR%%/whatsnew.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412080030.sB80UeAc027618>