Index: head/comms/qtel/Makefile =================================================================== --- head/comms/qtel/Makefile (revision 495461) +++ head/comms/qtel/Makefile (revision 495462) @@ -1,27 +1,23 @@ # Created by: shurd # $FreeBSD$ PORTNAME= qtel -PORTREVISION= 1 MAINTAINER= hamradio@FreeBSD.org COMMENT= Qtel Echolink client LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYRIGHT -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 - LIB_DEPENDS= libecholib.so:comms/svxlink \ libgsm.so:audio/gsm MASTERDIR= ${.CURDIR}/../svxlink -USES= qt:4 -USE_QT= corelib gui network qmake_build linguist_build moc_build rcc_build uic_build +USES= qt:5 gnome +USE_QT= buildtools core gui linguisttools network qmake widgets +USE_GNOME= libsigc++20 PKGDIR= ${.CURDIR} CMAKE_ARGS+= -DUSE_QT:BOOL=YES \ -DQT_ONLY:BOOL=YES -USE_GNOME= libsigc++20 .include "${MASTERDIR}/Makefile" Index: head/comms/qtel/pkg-plist =================================================================== --- head/comms/qtel/pkg-plist (revision 495461) +++ head/comms/qtel/pkg-plist (revision 495462) @@ -1,21 +1,21 @@ bin/qtel include/svxlink/AsyncQtApplication.h %%STATIC%%lib/libasyncqt.a -lib/libasyncqt.so.1.4.0 -lib/libasyncqt.so.1.4 +lib/libasyncqt.so.1.5.0 +lib/libasyncqt.so.1.5 lib/libasyncqt.so share/applications/qtel.desktop share/qtel/translations/qtel_sv.qm share/qtel/translations/qtel_de.qm share/qtel/translations/qtel_tr.qm share/qtel/translations/qtel_nl.qm share/qtel/translations/qtel_it.qm share/qtel/translations/qtel_uk.qm share/qtel/translations/qtel_ru.qm share/qtel/translations/qtel_hu.qm share/qtel/translations/qtel_es.qm share/qtel/translations/qtel_ja.qm share/qtel/translations/qtel_fr.qm share/qtel/sounds/connect.raw share/icons/link.xpm man/man1/qtel.1.gz Property changes on: head/comms/qtel/pkg-plist ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/svxlink/Makefile =================================================================== --- head/comms/svxlink/Makefile (revision 495461) +++ head/comms/svxlink/Makefile (revision 495462) @@ -1,106 +1,116 @@ # Created by: shurd # $FreeBSD$ PORTNAME?= svxlink -PORTVERSION= 15.11 -PORTREVISION= 6 +PORTVERSION= 17.12.2 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org COMMENT?= General purpose ham radio voice services LICENSE= GPLv2 LIB_DEPENDS?= libgsm.so:audio/gsm \ libspeex.so:audio/speex \ libgpg-error.so:security/libgpg-error \ libgcrypt.so:security/libgcrypt \ libsigc-2.0.so:devel/libsigc++20 \ libpopt.so:devel/popt \ libopus.so:audio/opus \ librtlsdr.so:comms/rtl-sdr BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto USES+= cmake:noninja compiler:c++11-lang groff pkgconfig tcl USE_GITHUB= yes GH_ACCOUNT= sm0svx GH_PROJECT= svxlink CMAKE_SOURCE_PATH= ${WRKSRC}/src CMAKE_ARGS+= -DMAN_INSTALL_DIR:FILEPATH=${MANDIRS} \ -DLOCAL_STATE_DIR=/var .if ${PORTNAME}==svxlink CMAKE_ARGS+= -DUSE_QT:BOOL=NO .endif USE_LDCONFIG= yes ALL_TARGET?= all man OPTIONS_DEFINE= DOXYGEN STATIC DOCS STATIC_DESC= Build and install static libraries STATIC_CMAKE_ON= -DBUILD_STATIC_LIBS=YES .if ${PORTNAME}==svxlink OPTIONS_DEFAULT=OSS ALSA OPTIONS_MULTI= SOUND OPTIONS_MULTI_SOUND= ALSA OSS ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_OFF= -DUSE_ALSA:BOOL=OFF ALSA_CMAKE_ON= -DUSE_ALSA:BOOL=ON OSS_CMAKE_OFF= -DUSE_OSS:BOOL=OFF OSS_CMAKE_ON= -DUSE_OSS:BOOL=ON .endif DOXYGEN_IMPLIES= DOCS DOXYGEN_ALL_TARGET=doc DOXYGEN_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:BOOL=TRUE DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ dot:graphics/graphviz OPTIONS_SUB= yes PORTDOCS= * post-patch: @${GREP} -lr /dev/ttyS0 ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \ ${REINPLACE_CMD} -e 's|/dev/ttyS0|/dev/ttyu0|' @${REINPLACE_CMD} -e 's|/usr/share/icons|${PREFIX}/share/icons|' \ ${WRKSRC}/src/qtel/qtel.desktop @${REINPLACE_CMD} -e 's|/usr/share/svxlink|${DOCSDIR}|' \ ${WRKSRC}/src/doc/man/svxlink.conf.5 @${REINPLACE_CMD} -e 's|/usr/bin/|${PREFIX}/bin/|' ${WRKSRC}/src/qtel/qtel.desktop \ ${WRKSRC}/src/doc/man/svxlink.conf.5 \ ${WRKSRC}/src/svxlink/svxlink/svxlink.conf.in @${REINPLACE_CMD} -e 's|/usr/lib|${PREFIX}/lib|' \ ${WRKSRC}/src/doc/man/svxlink.conf.5 \ ${WRKSRC}/src/svxlink/svxlink/svxlink.conf.in post-patch-OSS-on: @${GREP} -lr alsa:default ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \ ${REINPLACE_CMD} -e 's|alsa:default|oss:/dev/dsp|' @${GREP} -lr alsa:plughw:0 ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \ ${REINPLACE_CMD} -e 's|alsa:plughw:0|oss:/dev/dsp|' .if ${PORTNAME}==svxlink post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/.procmailrc \ ${STAGEDIR}${PREFIX}/etc/svxlink/.procmailrc.sample + ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/gpio.conf \ + ${STAGEDIR}${PREFIX}/etc/svxlink/gpio.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/TclVoiceMail.conf \ ${STAGEDIR}${PREFIX}/etc/svxlink/TclVoiceMail.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/remotetrx.conf \ ${STAGEDIR}${PREFIX}/etc/svxlink/remotetrx.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.conf \ ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.conf.sample + ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/svxreflector.conf \ + ${STAGEDIR}${PREFIX}/etc/svxlink/svxreflector.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleDtmfRepeater.conf \ ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleDtmfRepeater.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleEchoLink.conf \ ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleEchoLink.conf.sample + ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleFrn.conf \ + ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleFrn.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleHelp.conf \ ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleHelp.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleMetarInfo.conf \ ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleMetarInfo.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleParrot.conf \ ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleParrot.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModulePropagationMonitor.conf \ ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModulePropagationMonitor.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleSelCallEnc.conf \ ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleSelCallEnc.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleTclVoiceMail.conf \ ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleTclVoiceMail.conf.sample .endif - +.if ${PORTNAME}==qtel +post-install: + ${RM} ${STAGEDIR}${PREFIX}/include/svxlink/CppStdCompat.h + ${RM} ${STAGEDIR}${PREFIX}/include/svxlink/common.h + ${RM} ${STAGEDIR}${PREFIX}/lib/libsvxmisc.a +.endif .include Index: head/comms/svxlink/distinfo =================================================================== --- head/comms/svxlink/distinfo (revision 495461) +++ head/comms/svxlink/distinfo (revision 495462) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509574513 -SHA256 (sm0svx-svxlink-15.11_GH0.tar.gz) = 17bd8a1174c70e990b676210e6edb373732d284aed55c5a82bc378a1d69cecf2 -SIZE (sm0svx-svxlink-15.11_GH0.tar.gz) = 1528034 +TIMESTAMP = 1552153691 +SHA256 (sm0svx-svxlink-17.12.2_GH0.tar.gz) = 0e21b172858d54d642cd9c8a7e33e87bb50b1548f0291074271e08ab5f1e060c +SIZE (sm0svx-svxlink-17.12.2_GH0.tar.gz) = 1622039 Index: head/comms/svxlink/files/patch-src_async_core_AsyncUdpSocket.cpp =================================================================== --- head/comms/svxlink/files/patch-src_async_core_AsyncUdpSocket.cpp (revision 495461) +++ head/comms/svxlink/files/patch-src_async_core_AsyncUdpSocket.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/async/core/AsyncUdpSocket.cpp.orig 2015-11-22 16:03:59 UTC -+++ src/async/core/AsyncUdpSocket.cpp -@@ -189,7 +189,7 @@ UdpSocket::UdpSocket(uint16_t local_port, const IpAddr - { - addr.sin_addr = bind_ip.ip4Addr(); - } -- if(bind(sock, reinterpret_cast(&addr), sizeof(addr)) -+ if(::bind(sock, reinterpret_cast(&addr), sizeof(addr)) - == -1) - { - perror("bind"); Property changes on: head/comms/svxlink/files/patch-src_async_core_AsyncUdpSocket.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/svxlink/files/patch-src_async_core_AsyncTcpServer.cpp =================================================================== --- head/comms/svxlink/files/patch-src_async_core_AsyncTcpServer.cpp (revision 495461) +++ head/comms/svxlink/files/patch-src_async_core_AsyncTcpServer.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/async/core/AsyncTcpServer.cpp.orig 2015-11-22 16:03:59 UTC -+++ src/async/core/AsyncTcpServer.cpp -@@ -198,7 +198,7 @@ TcpServer::TcpServer(const string& port_str, const Asy - { - addr.sin_addr = bind_ip.ip4Addr(); - } -- if (bind(sock, (struct sockaddr *)&addr, sizeof(struct sockaddr_in)) != 0) -+ if (::bind(sock, (struct sockaddr *)&addr, sizeof(struct sockaddr_in)) != 0) - { - perror("bind"); - cleanup(); Property changes on: head/comms/svxlink/files/patch-src_async_core_AsyncTcpServer.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/svxlink/files/patch-src_async_audio_AsyncAudioDeviceAlsa.cpp =================================================================== --- head/comms/svxlink/files/patch-src_async_audio_AsyncAudioDeviceAlsa.cpp (revision 495461) +++ head/comms/svxlink/files/patch-src_async_audio_AsyncAudioDeviceAlsa.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/async/audio/AsyncAudioDeviceAlsa.cpp.orig 2015-11-22 16:03:59 UTC -+++ src/async/audio/AsyncAudioDeviceAlsa.cpp -@@ -548,7 +548,7 @@ bool AudioDeviceAlsa::initParams(snd_pcm - return false; - } - -- if (::abs(real_rate - sample_rate) > 100) -+ if (::abs((int)real_rate - sample_rate) > 100) - { - cerr << "*** ERROR: The sample rate could not be set to " - << sample_rate << "Hz for ALSA device \"" << dev_name << "\". " Property changes on: head/comms/svxlink/files/patch-src_async_audio_AsyncAudioDeviceAlsa.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/svxlink/files/patch-src_svxlink_svxlink_CMakeLists.txt =================================================================== --- head/comms/svxlink/files/patch-src_svxlink_svxlink_CMakeLists.txt (revision 495461) +++ head/comms/svxlink/files/patch-src_svxlink_svxlink_CMakeLists.txt (nonexistent) @@ -1,15 +0,0 @@ ---- src/svxlink/svxlink/CMakeLists.txt.orig 2015-11-22 16:03:59 UTC -+++ src/svxlink/svxlink/CMakeLists.txt -@@ -31,9 +31,9 @@ include_directories(${GCRYPT_INCLUDE_DIR - add_definitions(${GCRYPT_DEFINITIONS}) - - # Find the dl library --find_package(DL REQUIRED) --set(LIBS ${LIBS} ${DL_LIBRARIES}) --include_directories(${DL_INCLUDES}) -+#find_package(DL REQUIRED) -+#set(LIBS ${LIBS} ${DL_LIBRARIES}) -+#include_directories(${DL_INCLUDES}) - - # Add project libraries - set(LIBS ${LIBS} trx locationinfo asynccpp asyncaudio asynccore) Property changes on: head/comms/svxlink/files/patch-src_svxlink_svxlink_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/svxlink/files/patch-src_CMakeLists.txt =================================================================== --- head/comms/svxlink/files/patch-src_CMakeLists.txt (revision 495461) +++ head/comms/svxlink/files/patch-src_CMakeLists.txt (revision 495462) @@ -1,52 +1,80 @@ ---- src/CMakeLists.txt.orig 2015-11-22 16:03:59 UTC +--- src/CMakeLists.txt.orig 2018-03-04 18:59:29 UTC +++ src/CMakeLists.txt -@@ -37,6 +37,7 @@ set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_B +@@ -37,6 +37,7 @@ set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules/") # Optional parts +option(QT_ONLY "Only Build Qt applications and libs" OFF) option(USE_QT "Build Qt applications and libs" ON) option(BUILD_STATIC_LIBS "Build static libraries in addition to dynamic" OFF) @@ -46,12 +47,6 @@ if(NOT DEFINED INTERNAL_SAMPLE_RATE) endif(NOT DEFINED INTERNAL_SAMPLE_RATE) add_definitions(-DINTERNAL_SAMPLE_RATE=${INTERNAL_SAMPLE_RATE}) -# Set up include directories -include_directories( - ${PROJECT_INCLUDE_DIR} - ${CMAKE_BINARY_DIR} -) - # Warnings should be enabled for GCC. Also turning off the NDEBUG flag # since that remove asserts. if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) -@@ -87,6 +82,15 @@ if(NOT DEFINED INCLUDE_INSTALL_DIR) +@@ -73,7 +68,6 @@ if(NOT CMAKE_BUILD_TYPE) + FORCE) + endif(NOT CMAKE_BUILD_TYPE) + +- + ############################################################################## + # Install targets properties setup + ############################################################################## +@@ -87,6 +81,18 @@ if(NOT DEFINED INCLUDE_INSTALL_DIR) set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}) endif(NOT DEFINED INCLUDE_INSTALL_DIR) +# Set up include directories +include_directories( + ${PROJECT_INCLUDE_DIR} + ${CMAKE_BINARY_DIR} +if(QT_ONLY) -+ ${INCLUDE_INSTALL_DIR}/svxlink ++ ${CMAKE_SOURCE_DIR}/echolib ++ ${CMAKE_SOURCE_DIR}/async/audio ++ ${CMAKE_SOURCE_DIR}/async/core ++ ${INCLUDE_INSTALL_DIR}/svxlink/svxlink +endif(QT_ONLY) +) + # Where to install libraries if(NOT DEFINED LIB_INSTALL_DIR) #set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) -@@ -324,10 +328,12 @@ include(FindCHOWN) +@@ -327,21 +333,24 @@ set(LIBS ${LIBS} ${SIGC2_LIBRARIES}) + # Find the chown utility + include(FindCHOWN) +-set(SVXLINK_USER "svxlink" CACHE STRING "Set SvxLink system user") +-set(SVXLINK_GROUP "daemon" CACHE STRING "Set SvxLink system group") +-message(STATUS "SvxLink user = ${SVXLINK_USER}") +-message(STATUS "SvxLink group = ${SVXLINK_GROUP}") +- # Add directories to build add_subdirectory(async) -+if(NOT QT_ONLY) add_subdirectory(misc) ++if(NOT QT_ONLY) add_subdirectory(echolib) add_subdirectory(locationinfo) add_subdirectory(svxlink) +endif(NOT QT_ONLY) if(USE_QT) add_subdirectory(qtel) endif(USE_QT) + add_subdirectory(doc) ++ ++set(SVXLINK_USER "svxlink" CACHE STRING "Set SvxLink system user") ++set(SVXLINK_GROUP "daemon" CACHE STRING "Set SvxLink system group") ++message(STATUS "SvxLink user = ${SVXLINK_USER}") ++message(STATUS "SvxLink group = ${SVXLINK_GROUP}") ++ + + # Experimental CPack package building + set(CPACK_SET_DESTDIR "ON") Property changes on: head/comms/svxlink/files/patch-src_CMakeLists.txt ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/svxlink/files/patch-src_async_CMakeLists.txt =================================================================== --- head/comms/svxlink/files/patch-src_async_CMakeLists.txt (revision 495461) +++ head/comms/svxlink/files/patch-src_async_CMakeLists.txt (revision 495462) @@ -1,13 +1,14 @@ ---- src/async/CMakeLists.txt.orig 2015-11-22 16:03:59 UTC +--- src/async/CMakeLists.txt.orig 2018-03-04 18:59:29 UTC +++ src/async/CMakeLists.txt @@ -1,7 +1,9 @@ +if(NOT QT_ONLY) add_subdirectory(core) - add_subdirectory(cpp) +-add_subdirectory(cpp) add_subdirectory(audio) ++add_subdirectory(cpp) +add_subdirectory(demo) +endif(NOT QT_ONLY) if(USE_QT) add_subdirectory(qt) endif(USE_QT) -add_subdirectory(demo) Property changes on: head/comms/svxlink/files/patch-src_async_CMakeLists.txt ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/svxlink/files/patch-src_async_core_AsyncMsg.h =================================================================== --- head/comms/svxlink/files/patch-src_async_core_AsyncMsg.h (nonexistent) +++ head/comms/svxlink/files/patch-src_async_core_AsyncMsg.h (revision 495462) @@ -0,0 +1,11 @@ +--- src/async/core/AsyncMsg.h.orig 2019-03-10 00:47:36 UTC ++++ src/async/core/AsyncMsg.h +@@ -129,7 +129,7 @@ An example of how to use the AsyncMsg class + #include + #include + #include +-#include ++#include + #include + + Property changes on: head/comms/svxlink/files/patch-src_async_core_AsyncMsg.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/svxlink/files/patch-src_async_qt_CMakeLists.txt =================================================================== --- head/comms/svxlink/files/patch-src_async_qt_CMakeLists.txt (revision 495461) +++ head/comms/svxlink/files/patch-src_async_qt_CMakeLists.txt (revision 495462) @@ -1,15 +1,16 @@ ---- src/async/qt/CMakeLists.txt.orig 2015-11-22 16:03:59 UTC +--- src/async/qt/CMakeLists.txt.orig 2019-03-12 00:30:56 UTC +++ src/async/qt/CMakeLists.txt -@@ -6,7 +6,12 @@ set(LIBSRC AsyncQtApplication.cpp AsyncQ +@@ -6,7 +6,12 @@ set(LIBSRC AsyncQtApplication.cpp AsyncQtDnsLookupWork set(QTHEADERS AsyncQtApplication.h AsyncQtTimer.h AsyncQtDnsLookupWorker.h) +-set(LIBS ${LIBS} asynccore) +if(QT_ONLY) +find_library(ASYNCCORE_LIB asynccore ${LIB_INSTALL_DIR}) +set(LIBS ${LIBS} ${ASYNCCORE_LIB}) +else(QT_ONLY) - set(LIBS ${LIBS} asynccore) ++ set(LIBS ${LIBS} asynccore) +endif(QT_ONLY) # Copy exported include files to the global include directory foreach(incfile ${EXPINC}) Property changes on: head/comms/svxlink/files/patch-src_async_qt_CMakeLists.txt ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt =================================================================== --- head/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt (revision 495461) +++ head/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt (revision 495462) @@ -1,37 +1,40 @@ ---- src/doc/man/CMakeLists.txt.orig 2015-11-22 16:03:59 UTC +--- src/doc/man/CMakeLists.txt.orig 2018-03-04 18:59:29 UTC +++ src/doc/man/CMakeLists.txt -@@ -1,9 +1,16 @@ +@@ -1,11 +1,18 @@ # Set up which man pages to build and install +if(QT_ONLY) + set(MAN_PAGES qtel.1) +else(QT_ONLY) - set(MAN_PAGES svxlink.1 remotetrx.1 siglevdetcal.1 svxlink.conf.5 - ModuleHelp.conf.5 remotetrx.conf.5 ModuleParrot.conf.5 ModuleEchoLink.conf.5 + set(MAN_PAGES svxlink.1 svxlink.conf.5 remotetrx.1 remotetrx.conf.5 +- siglevdetcal.1 devcal.1 svxreflector.1 svxreflector.conf.5 qtel.1 ++ siglevdetcal.1 devcal.1 svxreflector.1 svxreflector.conf.5 + ModuleHelp.conf.5 ModuleParrot.conf.5 ModuleEchoLink.conf.5 ModuleTclVoiceMail.conf.5 ModuleDtmfRepeater.conf.5 -- ModulePropagationMonitor.conf.5 ModuleSelCallEnc.conf.5 qtel.1 devcal.1 -+ ModulePropagationMonitor.conf.5 ModuleSelCallEnc.conf.5 devcal.1 - ) + ModulePropagationMonitor.conf.5 ModuleSelCallEnc.conf.5 + ModuleFrn.conf.5 +-) ++ ) +if(USE_QT) + set(MAN_PAGES ${MAN_PAGES} qtel.1) +endif(USE_QT) +endif(QT_ONLY) # Search for the gzip and groff programs. Error out if not found. include(FindGZIP) -@@ -29,11 +36,11 @@ if(GROFF_TOOL AND GZIP_TOOL) +@@ -31,11 +38,11 @@ if(GROFF_TOOL AND GZIP_TOOL) DESTINATION ${MAN_INSTALL_DIR}/man${sec} OPTIONAL ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${man}.html - DESTINATION ${DOC_INSTALL_DIR}/man/man${sec} - OPTIONAL - ) - set(TARGETS ${TARGETS} ${man}.gz ${man}.html) + #install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${man}.html + # DESTINATION ${DOC_INSTALL_DIR}/man/man${sec} + # OPTIONAL + #) + set(TARGETS ${TARGETS} ${man}.gz) endforeach(man) # Add a custom target to trigger the build of the man pages Property changes on: head/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/svxlink/files/patch-src_qtel_CMakeLists.txt =================================================================== --- head/comms/svxlink/files/patch-src_qtel_CMakeLists.txt (revision 495461) +++ head/comms/svxlink/files/patch-src_qtel_CMakeLists.txt (revision 495462) @@ -1,17 +1,17 @@ ---- src/qtel/CMakeLists.txt.orig 2015-11-22 16:03:59 UTC +--- src/qtel/CMakeLists.txt.orig 2018-03-04 18:59:29 UTC +++ src/qtel/CMakeLists.txt -@@ -16,7 +16,14 @@ set(FORMS MainWindowBase.ui ComDialogBas +@@ -16,7 +16,14 @@ set(FORMS MainWindowBase.ui ComDialogBase.ui SettingsD set(RESOURCES qtel.qrc) # Libraries +if(QT_ONLY) +find_library(ASYNCCORE_LIB asynccore ${LIB_INSTALL_DIR}) +find_library(ASYNCAUDIO_LIB asyncaudio ${LIB_INSTALL_DIR}) +find_library(ECHOLIB_LIB echolib ${LIB_INSTALL_DIR}) -+set(LIBS ${LIBS} ${ECHOLIB_LIB} asyncqt ${ASYNCAUDIO_LIB} ${ASYNCCORE_LIB}) ++set(LIBS ${LIBS} ${ECHOLIB_LIB} asyncqt ${ASYNCAUDIO_LIB} ${ASYNCCORE_LIB} svxmisc) +else(QT_ONLY) - set(LIBS ${LIBS} echolib asyncqt asyncaudio asynccore) + set(LIBS ${LIBS} echolib asyncqt asyncaudio asynccore svxmisc) +endif(QT_ONLY) # Find the GSM codec library and include directory find_package(GSM REQUIRED) Property changes on: head/comms/svxlink/files/patch-src_qtel_CMakeLists.txt ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/svxlink/files/patch-src_svxlink_devcal_CMakeLists.txt =================================================================== --- head/comms/svxlink/files/patch-src_svxlink_devcal_CMakeLists.txt (revision 495461) +++ head/comms/svxlink/files/patch-src_svxlink_devcal_CMakeLists.txt (revision 495462) @@ -1,9 +1,9 @@ ---- src/svxlink/devcal/CMakeLists.txt.orig 2015-11-22 16:03:59 UTC +--- src/svxlink/devcal/CMakeLists.txt.orig 2018-03-04 18:59:29 UTC +++ src/svxlink/devcal/CMakeLists.txt -@@ -18,3 +18,6 @@ set_target_properties(devcal PROPERTIES - #set_target_properties(noisegen PROPERTIES - # RUNTIME_OUTPUT_DIRECTORY ${RUNTIME_OUTPUT_DIRECTORY} - #) +@@ -21,3 +21,6 @@ set_target_properties(devcal PROPERTIES + + # Install targets + install(TARGETS devcal DESTINATION ${BIN_INSTALL_DIR}) + +# Install targets +install(TARGETS devcal DESTINATION ${BIN_INSTALL_DIR}) Property changes on: head/comms/svxlink/files/patch-src_svxlink_devcal_CMakeLists.txt ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/svxlink/pkg-plist =================================================================== --- head/comms/svxlink/pkg-plist (revision 495461) +++ head/comms/svxlink/pkg-plist (revision 495462) @@ -1,132 +1,148 @@ bin/devcal -bin/svxlink bin/remotetrx bin/siglevdetcal -@sample etc/svxlink/svxlink.d/ModuleHelp.conf.sample -@sample etc/svxlink/svxlink.d/ModuleParrot.conf.sample -@sample etc/svxlink/svxlink.d/ModuleEchoLink.conf.sample -@sample etc/svxlink/svxlink.d/ModuleTclVoiceMail.conf.sample -@sample etc/svxlink/svxlink.d/ModuleDtmfRepeater.conf.sample -@sample etc/svxlink/svxlink.d/ModuleMetarInfo.conf.sample -@sample etc/svxlink/svxlink.d/ModulePropagationMonitor.conf.sample -@sample etc/svxlink/svxlink.d/ModuleSelCallEnc.conf.sample -@sample etc/svxlink/svxlink.conf.sample -@sample etc/svxlink/TclVoiceMail.conf.sample -@sample etc/svxlink/.procmailrc.sample -@sample etc/svxlink/remotetrx.conf.sample +bin/svxlink +bin/svxreflector +@sample %%ETCDIR%%/.procmailrc.sample +@sample %%ETCDIR%%/TclVoiceMail.conf.sample +@sample %%ETCDIR%%/gpio.conf.sample +@sample %%ETCDIR%%/remotetrx.conf.sample +@sample %%ETCDIR%%/svxlink.conf.sample +@sample %%ETCDIR%%/svxlink.d/ModuleDtmfRepeater.conf.sample +@sample %%ETCDIR%%/svxlink.d/ModuleEchoLink.conf.sample +@sample %%ETCDIR%%/svxlink.d/ModuleFrn.conf.sample +@sample %%ETCDIR%%/svxlink.d/ModuleHelp.conf.sample +@sample %%ETCDIR%%/svxlink.d/ModuleMetarInfo.conf.sample +@sample %%ETCDIR%%/svxlink.d/ModuleParrot.conf.sample +@sample %%ETCDIR%%/svxlink.d/ModulePropagationMonitor.conf.sample +@sample %%ETCDIR%%/svxlink.d/ModuleSelCallEnc.conf.sample +@sample %%ETCDIR%%/svxlink.d/ModuleTclVoiceMail.conf.sample +@sample %%ETCDIR%%/svxreflector.conf.sample include/svxlink/AsyncApplication.h -include/svxlink/AsyncFdWatch.h -include/svxlink/AsyncTimer.h -include/svxlink/AsyncIpAddress.h -include/svxlink/AsyncTcpClient.h -include/svxlink/AsyncDnsLookup.h -include/svxlink/AsyncUdpSocket.h -include/svxlink/AsyncTcpServer.h -include/svxlink/AsyncTcpConnection.h -include/svxlink/AsyncConfig.h -include/svxlink/AsyncSerial.h -include/svxlink/AsyncFileReader.h include/svxlink/AsyncAtTimer.h -include/svxlink/AsyncExec.h -include/svxlink/AsyncCppApplication.h -include/svxlink/AsyncAudioSource.h -include/svxlink/AsyncAudioSink.h -include/svxlink/AsyncAudioProcessor.h +include/svxlink/AsyncAudioAmp.h include/svxlink/AsyncAudioClipper.h include/svxlink/AsyncAudioCompressor.h +include/svxlink/AsyncAudioDebugger.h +include/svxlink/AsyncAudioDecimator.h +include/svxlink/AsyncAudioDecoder.h +include/svxlink/AsyncAudioDelayLine.h +include/svxlink/AsyncAudioDevice.h +include/svxlink/AsyncAudioDeviceFactory.h +include/svxlink/AsyncAudioEncoder.h +include/svxlink/AsyncAudioFifo.h include/svxlink/AsyncAudioFilter.h -include/svxlink/AsyncSigCAudioSink.h -include/svxlink/AsyncSigCAudioSource.h +include/svxlink/AsyncAudioGenerator.h include/svxlink/AsyncAudioIO.h -include/svxlink/AsyncAudioSplitter.h -include/svxlink/AsyncAudioDelayLine.h -include/svxlink/AsyncAudioValve.h -include/svxlink/AsyncAudioAmp.h -include/svxlink/AsyncAudioSelector.h -include/svxlink/AsyncAudioPassthrough.h +include/svxlink/AsyncAudioInterpolator.h +include/svxlink/AsyncAudioJitterFifo.h include/svxlink/AsyncAudioMixer.h -include/svxlink/AsyncAudioFifo.h -include/svxlink/AsyncAudioDebugger.h +include/svxlink/AsyncAudioNoiseAdder.h include/svxlink/AsyncAudioPacer.h +include/svxlink/AsyncAudioPassthrough.h +include/svxlink/AsyncAudioProcessor.h include/svxlink/AsyncAudioReader.h -include/svxlink/AsyncAudioDecimator.h -include/svxlink/AsyncAudioInterpolator.h -include/svxlink/AsyncAudioStreamStateDetector.h -include/svxlink/AsyncAudioEncoder.h -include/svxlink/AsyncAudioDecoder.h include/svxlink/AsyncAudioRecorder.h -include/svxlink/AsyncAudioJitterFifo.h -include/svxlink/AsyncAudioDeviceFactory.h -include/svxlink/AsyncAudioDevice.h +include/svxlink/AsyncAudioSelector.h +include/svxlink/AsyncAudioSink.h +include/svxlink/AsyncAudioSource.h +include/svxlink/AsyncAudioSplitter.h +include/svxlink/AsyncAudioStreamStateDetector.h +include/svxlink/AsyncAudioValve.h +include/svxlink/AsyncConfig.h +include/svxlink/AsyncCppApplication.h +include/svxlink/AsyncDnsLookup.h +include/svxlink/AsyncExec.h +include/svxlink/AsyncFdWatch.h +include/svxlink/AsyncFileReader.h +include/svxlink/AsyncFramedTcpConnection.h +include/svxlink/AsyncIpAddress.h +include/svxlink/AsyncMsg.h +include/svxlink/AsyncPty.h +include/svxlink/AsyncPtyStreamBuf.h +include/svxlink/AsyncSerial.h +include/svxlink/AsyncSigCAudioSink.h +include/svxlink/AsyncSigCAudioSource.h +include/svxlink/AsyncTcpClient.h +include/svxlink/AsyncTcpClientBase.h +include/svxlink/AsyncTcpConnection.h +include/svxlink/AsyncTcpServer.h +include/svxlink/AsyncTcpServerBase.h +include/svxlink/AsyncTimer.h +include/svxlink/AsyncUdpSocket.h include/svxlink/CppStdCompat.h -include/svxlink/common.h include/svxlink/EchoLinkDirectory.h include/svxlink/EchoLinkDispatcher.h +include/svxlink/EchoLinkProxy.h include/svxlink/EchoLinkQso.h include/svxlink/EchoLinkStationData.h -include/svxlink/EchoLinkProxy.h -include/svxlink/AsyncAudioGenerator.h -include/svxlink/AsyncAudioNoiseAdder.h -include/svxlink/AsyncPty.h -include/svxlink/AsyncPtyStreamBuf.h -lib/libasynccore.so.1.4.0 -lib/libasynccore.so.1.4 +include/svxlink/common.h +lib/libasyncaudio.so +lib/libasyncaudio.so.1.5 +lib/libasyncaudio.so.1.5.0 lib/libasynccore.so -lib/libasynccpp.so.1.4.0 -lib/libasynccpp.so.1.4 +lib/libasynccore.so.1.5 +lib/libasynccore.so.1.5.0 lib/libasynccpp.so -lib/libasyncaudio.so.1.4.0 -lib/libasyncaudio.so.1.4 -lib/libasyncaudio.so +lib/libasynccpp.so.1.5 +lib/libasynccpp.so.1.5.0 +lib/libecholib.so +lib/libecholib.so.1.3 +lib/libecholib.so.1.3.3 +lib/libsvxmisc.a +lib/svxlink/ModuleDtmfRepeater.so +lib/svxlink/ModuleEchoLink.so +lib/svxlink/ModuleFrn.so lib/svxlink/ModuleHelp.so +lib/svxlink/ModuleMetarInfo.so lib/svxlink/ModuleParrot.so -lib/svxlink/ModuleEchoLink.so lib/svxlink/ModuleTcl.so -lib/svxlink/ModuleDtmfRepeater.so -lib/svxlink/ModuleMetarInfo.so -lib/libecholib.so.1.3.2 -lib/libecholib.so.1.3 -lib/libecholib.so %%STATIC%%lib/libasyncaudio.a %%STATIC%%lib/libasynccore.a %%STATIC%%lib/libasynccpp.a %%STATIC%%lib/libecholib.a %%DATADIR%%/events.tcl %%DATADIR%%/events.d/RepeaterLogic.tcl %%DATADIR%%/events.d/SimplexLogic.tcl %%DATADIR%%/events.d/Module.tcl %%DATADIR%%/events.d/Logic.tcl %%DATADIR%%/events.d/CW.tcl %%DATADIR%%/events.d/SelCall.tcl %%DATADIR%%/events.d/locale.tcl %%DATADIR%%/events.d/Help.tcl %%DATADIR%%/events.d/Parrot.tcl %%DATADIR%%/events.d/EchoLink.tcl +%%DATADIR%%/events.d/Frn.tcl %%DATADIR%%/events.d/Tcl.tcl.example %%DATADIR%%/events.d/TclVoiceMail.tcl %%DATADIR%%/events.d/DtmfRepeater.tcl %%DATADIR%%/events.d/MetarInfo.tcl %%DATADIR%%/events.d/PropagationMonitor.tcl %%DATADIR%%/events.d/SelCallEnc.tcl %%DATADIR%%/modules.d/ModuleTcl.tcl.example %%DATADIR%%/modules.d/ModuleTclVoiceMail.tcl %%DATADIR%%/modules.d/ModulePropagationMonitor.tcl %%DATADIR%%/modules.d/ModuleSelCallEnc.tcl man/man1/devcal.1.gz -man/man1/svxlink.1.gz man/man1/remotetrx.1.gz man/man1/siglevdetcal.1.gz -man/man5/svxlink.conf.5.gz +man/man1/svxlink.1.gz +man/man1/svxreflector.1.gz +man/man5/ModuleDtmfRepeater.conf.5.gz +man/man5/ModuleEchoLink.conf.5.gz +man/man5/ModuleFrn.conf.5.gz man/man5/ModuleHelp.conf.5.gz man/man5/ModuleParrot.conf.5.gz -man/man5/ModuleEchoLink.conf.5.gz -man/man5/ModuleTclVoiceMail.conf.5.gz -man/man5/ModuleDtmfRepeater.conf.5.gz man/man5/ModulePropagationMonitor.conf.5.gz man/man5/ModuleSelCallEnc.conf.5.gz +man/man5/ModuleTclVoiceMail.conf.5.gz man/man5/remotetrx.conf.5.gz +man/man5/svxlink.conf.5.gz +man/man5/svxreflector.conf.5.gz +sbin/svxlink_gpio_down +sbin/svxlink_gpio_up @dir %%DATADIR%%/sounds -@dir /var/spool/svxlink/voice_mail -@dir /var/spool/svxlink/qso_recorder @dir /var/spool/svxlink/propagation_monitor +@dir /var/spool/svxlink/qso_recorder +@dir /var/spool/svxlink/voice_mail @dir /var/spool/svxlink Property changes on: head/comms/svxlink/pkg-plist ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property