svn commit: r412692 - in head/comms: qtel svxlink svxlink/files
Stephen Hurd
shurd at FreeBSD.org
Thu Apr 7 20:17:56 UTC 2016
Author: shurd
Date: Thu Apr 7 20:17:54 2016
New Revision: 412692
URL: https://svnweb.freebsd.org/changeset/ports/412692
Log:
Update svxlink/qtel to latest release
Added:
head/comms/svxlink/files/patch-src_svxlink_devcal_CMakeLists.txt (contents, props changed)
head/comms/svxlink/files/patch-src_svxlink_svxlink_CMakeLists.txt (contents, props changed)
Deleted:
head/comms/svxlink/files/patch-async_audio_AsyncAudioDeviceOSS.cpp
head/comms/svxlink/files/patch-echolib_EchoLinkDirectoryCon.cpp
head/comms/svxlink/files/patch-echolib_EchoLinkDispatcher.h
head/comms/svxlink/files/patch-locationinfo_LocationInfo.cpp
head/comms/svxlink/files/patch-src_locationinfo_LocationInfo.h
head/comms/svxlink/files/patch-svxlink_svxlink_CMakeLists.txt
head/comms/svxlink/files/patch-svxlink_trx_NetTrxMsg.h
head/comms/svxlink/files/patch-svxlink_trx_NetTrxTcpClient.cpp
head/comms/svxlink/files/patch-svxlink_trx_SwDtmfDecoder.cpp
head/comms/svxlink/files/patch-svxlink_trx_ToneDecoder.cpp
Modified:
head/comms/qtel/pkg-plist (contents, props changed)
head/comms/svxlink/Makefile
head/comms/svxlink/distinfo
head/comms/svxlink/files/patch-src_CMakeLists.txt
head/comms/svxlink/files/patch-src_async_CMakeLists.txt
head/comms/svxlink/files/patch-src_async_qt_CMakeLists.txt
head/comms/svxlink/files/patch-src_doc_CMakeLists.txt
head/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt
head/comms/svxlink/files/patch-src_qtel_CMakeLists.txt
head/comms/svxlink/pkg-plist
Modified: head/comms/qtel/pkg-plist
==============================================================================
--- head/comms/qtel/pkg-plist Thu Apr 7 20:15:30 2016 (r412691)
+++ head/comms/qtel/pkg-plist Thu Apr 7 20:17:54 2016 (r412692)
@@ -1,8 +1,8 @@
bin/qtel
include/svxlink/AsyncQtApplication.h
%%STATIC%%lib/libasyncqt.a
-lib/libasyncqt.so.1.3.1
-lib/libasyncqt.so.1.3
+lib/libasyncqt.so.1.4.0
+lib/libasyncqt.so.1.4
lib/libasyncqt.so
share/applications/qtel.desktop
share/qtel/translations/qtel_sv.qm
Modified: head/comms/svxlink/Makefile
==============================================================================
--- head/comms/svxlink/Makefile Thu Apr 7 20:15:30 2016 (r412691)
+++ head/comms/svxlink/Makefile Thu Apr 7 20:17:54 2016 (r412692)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= svxlink
-PORTVERSION= 14.08.2
+PORTVERSION= 15.11
CATEGORIES= comms hamradio
MAINTAINER= hamradio at FreeBSD.org
@@ -24,7 +24,7 @@ USE_GITHUB= yes
GH_ACCOUNT= sm0svx
GH_PROJECT= svxlink
-USES= compiler:c++11-lib cmake tcl
+USES= cmake tcl
CMAKE_SOURCE_PATH= ${WRKSRC}/src
CMAKE_ARGS+= -DMAN_INSTALL_DIR:FILEPATH=${MANDIRS} \
-DLOCAL_STATE_DIR=/var
Modified: head/comms/svxlink/distinfo
==============================================================================
--- head/comms/svxlink/distinfo Thu Apr 7 20:15:30 2016 (r412691)
+++ head/comms/svxlink/distinfo Thu Apr 7 20:17:54 2016 (r412692)
@@ -1,2 +1,2 @@
-SHA256 (sm0svx-svxlink-14.08.2_GH0.tar.gz) = fe420a035cce6a293b1e46dcba98e79a089548bb5d9329a9f79f0e51054f8ce2
-SIZE (sm0svx-svxlink-14.08.2_GH0.tar.gz) = 1507462
+SHA256 (sm0svx-svxlink-15.11_GH0.tar.gz) = 17bd8a1174c70e990b676210e6edb373732d284aed55c5a82bc378a1d69cecf2
+SIZE (sm0svx-svxlink-15.11_GH0.tar.gz) = 1528034
Modified: head/comms/svxlink/files/patch-src_CMakeLists.txt
==============================================================================
--- head/comms/svxlink/files/patch-src_CMakeLists.txt Thu Apr 7 20:15:30 2016 (r412691)
+++ head/comms/svxlink/files/patch-src_CMakeLists.txt Thu Apr 7 20:17:54 2016 (r412692)
@@ -1,6 +1,6 @@
---- src/CMakeLists.txt.orig 2014-08-02 12:45:56.000000000 -0700
-+++ src/CMakeLists.txt 2015-01-05 21:58:48.000000000 -0800
-@@ -37,6 +37,7 @@
+--- src/CMakeLists.txt.orig 2015-11-22 16:03:59 UTC
++++ src/CMakeLists.txt
+@@ -37,6 +37,7 @@ set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_B
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules/")
# Optional parts
@@ -8,7 +8,7 @@
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 @@
+@@ -46,12 +47,6 @@ if(NOT DEFINED INTERNAL_SAMPLE_RATE)
endif(NOT DEFINED INTERNAL_SAMPLE_RATE)
add_definitions(-DINTERNAL_SAMPLE_RATE=${INTERNAL_SAMPLE_RATE})
@@ -21,8 +21,8 @@
# 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)
-@@ -83,6 +78,15 @@
- set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include)
+@@ -87,6 +82,15 @@ if(NOT DEFINED INCLUDE_INSTALL_DIR)
+ set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR})
endif(NOT DEFINED INCLUDE_INSTALL_DIR)
+# Set up include directories
@@ -36,8 +36,8 @@
+
# Where to install libraries
if(NOT DEFINED LIB_INSTALL_DIR)
- set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
-@@ -312,10 +316,12 @@
+ #set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+@@ -324,10 +328,12 @@ include(FindCHOWN)
# Add directories to build
add_subdirectory(async)
Modified: head/comms/svxlink/files/patch-src_async_CMakeLists.txt
==============================================================================
--- head/comms/svxlink/files/patch-src_async_CMakeLists.txt Thu Apr 7 20:15:30 2016 (r412691)
+++ head/comms/svxlink/files/patch-src_async_CMakeLists.txt Thu Apr 7 20:17:54 2016 (r412692)
@@ -1,5 +1,5 @@
---- src/async/CMakeLists.txt.orig 2015-01-05 20:59:17.000000000 -0800
-+++ src/async/CMakeLists.txt 2015-01-05 20:59:44.000000000 -0800
+--- src/async/CMakeLists.txt.orig 2015-11-22 16:03:59 UTC
++++ src/async/CMakeLists.txt
@@ -1,7 +1,9 @@
+if(NOT QT_ONLY)
add_subdirectory(core)
Modified: head/comms/svxlink/files/patch-src_async_qt_CMakeLists.txt
==============================================================================
--- head/comms/svxlink/files/patch-src_async_qt_CMakeLists.txt Thu Apr 7 20:15:30 2016 (r412691)
+++ head/comms/svxlink/files/patch-src_async_qt_CMakeLists.txt Thu Apr 7 20:17:54 2016 (r412692)
@@ -1,6 +1,6 @@
---- src/async/qt/CMakeLists.txt.orig 2014-08-02 12:45:56.000000000 -0700
-+++ src/async/qt/CMakeLists.txt 2015-01-05 21:42:06.000000000 -0800
-@@ -6,7 +6,12 @@
+--- src/async/qt/CMakeLists.txt.orig 2015-11-22 16:03:59 UTC
++++ src/async/qt/CMakeLists.txt
+@@ -6,7 +6,12 @@ set(LIBSRC AsyncQtApplication.cpp AsyncQ
set(QTHEADERS AsyncQtApplication.h AsyncQtTimer.h AsyncQtDnsLookupWorker.h)
Modified: head/comms/svxlink/files/patch-src_doc_CMakeLists.txt
==============================================================================
--- head/comms/svxlink/files/patch-src_doc_CMakeLists.txt Thu Apr 7 20:15:30 2016 (r412691)
+++ head/comms/svxlink/files/patch-src_doc_CMakeLists.txt Thu Apr 7 20:17:54 2016 (r412692)
@@ -1,5 +1,5 @@
---- src/doc/CMakeLists.txt.orig 2015-01-05 21:49:06.000000000 -0800
-+++ src/doc/CMakeLists.txt 2015-01-05 21:49:20.000000000 -0800
+--- src/doc/CMakeLists.txt.orig 2015-11-22 16:03:59 UTC
++++ src/doc/CMakeLists.txt
@@ -2,6 +2,7 @@
add_custom_target(doc)
@@ -8,9 +8,9 @@
find_package(Doxygen)
if(DOXYGEN_FOUND)
configure_file(doxygen.echolib.in doxygen.echolib @ONLY)
-@@ -32,5 +33,6 @@
- "echolib;async"
- )
+@@ -36,5 +37,6 @@ else(DOXYGEN_FOUND)
+ message("-- It is an optional dependency and SvxLink will build without")
+ message("-- it. Not needed for normal use.")
endif(DOXYGEN_FOUND)
+endif(NOT QT_ONLY)
Modified: head/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt
==============================================================================
--- head/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt Thu Apr 7 20:15:30 2016 (r412691)
+++ head/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt Thu Apr 7 20:17:54 2016 (r412692)
@@ -1,5 +1,5 @@
---- src/doc/man/CMakeLists.txt.orig 2014-08-02 12:45:56.000000000 -0700
-+++ src/doc/man/CMakeLists.txt 2015-01-05 21:07:04.000000000 -0800
+--- src/doc/man/CMakeLists.txt.orig 2015-11-22 16:03:59 UTC
++++ src/doc/man/CMakeLists.txt
@@ -1,9 +1,16 @@
# Set up which man pages to build and install
+if(QT_ONLY)
@@ -8,13 +8,30 @@
set(MAN_PAGES svxlink.1 remotetrx.1 siglevdetcal.1 svxlink.conf.5
ModuleHelp.conf.5 remotetrx.conf.5 ModuleParrot.conf.5 ModuleEchoLink.conf.5
ModuleTclVoiceMail.conf.5 ModuleDtmfRepeater.conf.5
-- ModulePropagationMonitor.conf.5 ModuleSelCallEnc.conf.5 qtel.1
-+ ModulePropagationMonitor.conf.5 ModuleSelCallEnc.conf.5
+- ModulePropagationMonitor.conf.5 ModuleSelCallEnc.conf.5 qtel.1 devcal.1
++ ModulePropagationMonitor.conf.5 ModuleSelCallEnc.conf.5 devcal.1
)
+if(USE_QT)
+ set(MAN_PAGES ${MAN_PAGES} qtel.1)
+endif(USE_QT)
+endif(QT_ONLY)
- # Search for gzip program. Error out if not found.
+ # Search for the gzip and groff programs. Error out if not found.
include(FindGZIP)
+@@ -29,11 +36,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
Modified: head/comms/svxlink/files/patch-src_qtel_CMakeLists.txt
==============================================================================
--- head/comms/svxlink/files/patch-src_qtel_CMakeLists.txt Thu Apr 7 20:15:30 2016 (r412691)
+++ head/comms/svxlink/files/patch-src_qtel_CMakeLists.txt Thu Apr 7 20:17:54 2016 (r412692)
@@ -1,6 +1,6 @@
---- src/qtel/CMakeLists.txt.orig 2014-08-02 12:45:56.000000000 -0700
-+++ src/qtel/CMakeLists.txt 2015-01-05 21:46:43.000000000 -0800
-@@ -16,7 +16,14 @@
+--- src/qtel/CMakeLists.txt.orig 2015-11-22 16:03:59 UTC
++++ src/qtel/CMakeLists.txt
+@@ -16,7 +16,14 @@ set(FORMS MainWindowBase.ui ComDialogBas
set(RESOURCES qtel.qrc)
# Libraries
Added: head/comms/svxlink/files/patch-src_svxlink_devcal_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/svxlink/files/patch-src_svxlink_devcal_CMakeLists.txt Thu Apr 7 20:17:54 2016 (r412692)
@@ -0,0 +1,9 @@
+--- src/svxlink/devcal/CMakeLists.txt.orig 2015-11-22 16:03:59 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}
+ #)
++
++# Install targets
++install(TARGETS devcal DESTINATION ${BIN_INSTALL_DIR})
Added: head/comms/svxlink/files/patch-src_svxlink_svxlink_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/svxlink/files/patch-src_svxlink_svxlink_CMakeLists.txt Thu Apr 7 20:17:54 2016 (r412692)
@@ -0,0 +1,15 @@
+--- 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)
Modified: head/comms/svxlink/pkg-plist
==============================================================================
--- head/comms/svxlink/pkg-plist Thu Apr 7 20:15:30 2016 (r412691)
+++ head/comms/svxlink/pkg-plist Thu Apr 7 20:17:54 2016 (r412692)
@@ -1,3 +1,4 @@
+bin/devcal
bin/svxlink
bin/remotetrx
bin/siglevdetcal
@@ -64,14 +65,18 @@ include/svxlink/EchoLinkDispatcher.h
include/svxlink/EchoLinkQso.h
include/svxlink/EchoLinkStationData.h
include/svxlink/EchoLinkProxy.h
-lib/libasynccore.so.1.3.1
-lib/libasynccore.so.1.3
+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
lib/libasynccore.so
-lib/libasynccpp.so.1.3.1
-lib/libasynccpp.so.1.3
+lib/libasynccpp.so.1.4.0
+lib/libasynccpp.so.1.4
lib/libasynccpp.so
-lib/libasyncaudio.so.1.3.1
-lib/libasyncaudio.so.1.3
+lib/libasyncaudio.so.1.4.0
+lib/libasyncaudio.so.1.4
lib/libasyncaudio.so
lib/svxlink/ModuleHelp.so
lib/svxlink/ModuleParrot.so
@@ -79,7 +84,7 @@ lib/svxlink/ModuleEchoLink.so
lib/svxlink/ModuleTcl.so
lib/svxlink/ModuleDtmfRepeater.so
lib/svxlink/ModuleMetarInfo.so
-lib/libecholib.so.1.3.1
+lib/libecholib.so.1.3.2
lib/libecholib.so.1.3
lib/libecholib.so
%%STATIC%%lib/libasyncaudio.a
@@ -107,6 +112,7 @@ lib/libecholib.so
%%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
More information about the svn-ports-all
mailing list