6 files changed, 46 insertions, 24 deletions

diff --git a/comms/svxlink/Makefile b/comms/svxlink/Makefile
index f9a5280cb7dd..bf66c99831b0 100644
--- a/comms/svxlink/Makefile
+++ b/comms/svxlink/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	svxlink
-PORTVERSION=	17.12.2
-PORTREVISION=	1
+PORTVERSION=	19.09.1
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
@@ -18,7 +17,8 @@ LIB_DEPENDS?=	libgsm.so:audio/gsm \
 		libsigc-2.0.so:devel/libsigc++20 \
 		libpopt.so:devel/popt \
 		libopus.so:audio/opus \
-		librtlsdr.so:comms/rtl-sdr
+		librtlsdr.so:comms/rtl-sdr \
+		libcurl.so:ftp/curl
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 
 USES+=		cmake:noninja compiler:c++11-lang groff pkgconfig tcl
@@ -28,7 +28,9 @@ GH_PROJECT=	svxlink
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/src
 CMAKE_ARGS+=	-DMAN_INSTALL_DIR:FILEPATH=${MANDIRS} \
-		-DLOCAL_STATE_DIR=/var
+		-DLOCAL_STATE_DIR=/var \
+		-DLOCALBASE:STRING="${LOCALBASE}"
+
 .if ${PORTNAME}==svxlink
 CMAKE_ARGS+=	-DUSE_QT:BOOL=NO
 .endif
@@ -107,6 +109,12 @@ post-install:
 		${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
+	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleTrx.conf \
+		${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleTrx.conf.sample
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/doc/README-19.09.adoc ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORTNAME}==qtel
 post-install:
diff --git a/comms/svxlink/distinfo b/comms/svxlink/distinfo
index bd0b6363634e..4f58aff99b46 100644
--- a/comms/svxlink/distinfo
+++ b/comms/svxlink/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552153691
-SHA256 (sm0svx-svxlink-17.12.2_GH0.tar.gz) = 0e21b172858d54d642cd9c8a7e33e87bb50b1548f0291074271e08ab5f1e060c
-SIZE (sm0svx-svxlink-17.12.2_GH0.tar.gz) = 1622039
+TIMESTAMP = 1567427570
+SHA256 (sm0svx-svxlink-19.09.1_GH0.tar.gz) = 5e5cbc3501fa6c6ec68334f8217ef93f5dc879d4d0e41e6f71378fd67d69f6a2
+SIZE (sm0svx-svxlink-19.09.1_GH0.tar.gz) = 1730688
diff --git a/comms/svxlink/files/patch-src_CMakeLists.txt b/comms/svxlink/files/patch-src_CMakeLists.txt
index bb0c3cce51fc..26d2cec8f11a 100644
--- a/comms/svxlink/files/patch-src_CMakeLists.txt
+++ b/comms/svxlink/files/patch-src_CMakeLists.txt
@@ -1,4 +1,4 @@
---- src/CMakeLists.txt.orig	2018-03-04 18:59:29 UTC
+--- src/CMakeLists.txt.orig	2019-09-01 20:12:38 UTC
 +++ src/CMakeLists.txt
 @@ -37,6 +37,7 @@ set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin
  list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules/")
@@ -21,7 +21,7 @@
  # 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)
-@@ -73,7 +68,6 @@ if(NOT CMAKE_BUILD_TYPE)
+@@ -79,7 +74,6 @@ if(NOT CMAKE_BUILD_TYPE)
        FORCE)
  endif(NOT CMAKE_BUILD_TYPE)
  
@@ -29,7 +29,7 @@
  ##############################################################################
  # Install targets properties setup
  ##############################################################################
-@@ -87,6 +81,18 @@ if(NOT DEFINED INCLUDE_INSTALL_DIR)
+@@ -93,6 +87,18 @@ if(NOT DEFINED INCLUDE_INSTALL_DIR)
    set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR})
  endif(NOT DEFINED INCLUDE_INSTALL_DIR)
  
@@ -48,12 +48,12 @@
  # Where to install libraries
  if(NOT DEFINED LIB_INSTALL_DIR)
    #set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
-@@ -327,21 +333,24 @@ set(LIBS ${LIBS} ${SIGC2_LIBRARIES})
+@@ -333,21 +339,23 @@ 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")
+-set(SVXLINK_GROUP "svxlink" CACHE STRING "Set SvxLink system group")
 -message(STATUS "SvxLink user = ${SVXLINK_USER}")
 -message(STATUS "SvxLink group = ${SVXLINK_GROUP}")
 -
@@ -74,7 +74,6 @@
 +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")
diff --git a/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt b/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt
index e4451cf1ebeb..440327863be2 100644
--- a/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt
+++ b/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt
@@ -1,4 +1,4 @@
---- src/doc/man/CMakeLists.txt.orig	2018-03-04 18:59:29 UTC
+--- src/doc/man/CMakeLists.txt.orig	2019-09-01 20:12:38 UTC
 +++ src/doc/man/CMakeLists.txt
 @@ -1,11 +1,18 @@
  # Set up which man pages to build and install
@@ -7,15 +7,15 @@
 +else(QT_ONLY)
  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 
++  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
-   ModuleFrn.conf.5
+   ModuleFrn.conf.5 ModuleTrx.conf.5
 -)
-+ )
++  )
 +if(USE_QT)
-+  set(MAN_PAGES ${MAN_PAGES} qtel.1)
++   set(MAN_PAGES ${MAN_PAGES} qtel.1)
 +endif(USE_QT)
 +endif(QT_ONLY)
  
diff --git a/comms/svxlink/files/patch-src_svxlink_modules_metarinfo_CMakeLists.txt b/comms/svxlink/files/patch-src_svxlink_modules_metarinfo_CMakeLists.txt
new file mode 100644
index 000000000000..3a86c9138a07
--- /dev/null
+++ b/comms/svxlink/files/patch-src_svxlink_modules_metarinfo_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- src/svxlink/modules/metarinfo/CMakeLists.txt.orig	2019-09-01 20:12:38 UTC
++++ src/svxlink/modules/metarinfo/CMakeLists.txt
+@@ -6,6 +6,7 @@ set(MODNAME MetarInfo)
+ 
+ # Project libraries to link to
+ set(LIBS ${LIBS} ${CURL_LIBRARY})
++include_directories(AFTER "${LOCALBASE}/include")
+ 
+ # The version tag name without the VER_ prefix
+ set(VERNAME ${MODNAME})
diff --git a/comms/svxlink/pkg-plist b/comms/svxlink/pkg-plist
index c2dfe284673b..1c1bee53204a 100644
--- a/comms/svxlink/pkg-plist
+++ b/comms/svxlink/pkg-plist
@@ -17,6 +17,7 @@ bin/svxreflector
 @sample %%ETCDIR%%/svxlink.d/ModulePropagationMonitor.conf.sample
 @sample %%ETCDIR%%/svxlink.d/ModuleSelCallEnc.conf.sample
 @sample %%ETCDIR%%/svxlink.d/ModuleTclVoiceMail.conf.sample
+@sample %%ETCDIR%%/svxlink.d/ModuleTrx.conf.sample
 @sample %%ETCDIR%%/svxreflector.conf.sample
 include/svxlink/AsyncApplication.h
 include/svxlink/AsyncAtTimer.h
@@ -32,6 +33,7 @@ include/svxlink/AsyncAudioDeviceFactory.h
 include/svxlink/AsyncAudioEncoder.h
 include/svxlink/AsyncAudioFifo.h
 include/svxlink/AsyncAudioFilter.h
+include/svxlink/AsyncAudioFsf.h
 include/svxlink/AsyncAudioGenerator.h
 include/svxlink/AsyncAudioIO.h
 include/svxlink/AsyncAudioInterpolator.h
@@ -78,14 +80,14 @@ include/svxlink/EchoLinkQso.h
 include/svxlink/EchoLinkStationData.h
 include/svxlink/common.h
 lib/libasyncaudio.so
-lib/libasyncaudio.so.1.5
-lib/libasyncaudio.so.1.5.0
+lib/libasyncaudio.so.1.6
+lib/libasyncaudio.so.1.6.0
 lib/libasynccore.so
-lib/libasynccore.so.1.5
-lib/libasynccore.so.1.5.0
+lib/libasynccore.so.1.6
+lib/libasynccore.so.1.6.0
 lib/libasynccpp.so
-lib/libasynccpp.so.1.5
-lib/libasynccpp.so.1.5.0
+lib/libasynccpp.so.1.6
+lib/libasynccpp.so.1.6.0
 lib/libecholib.so
 lib/libecholib.so.1.3
 lib/libecholib.so.1.3.3
@@ -97,6 +99,7 @@ lib/svxlink/ModuleHelp.so
 lib/svxlink/ModuleMetarInfo.so
 lib/svxlink/ModuleParrot.so
 lib/svxlink/ModuleTcl.so
+lib/svxlink/ModuleTrx.so
 %%STATIC%%lib/libasyncaudio.a
 %%STATIC%%lib/libasynccore.a
 %%STATIC%%lib/libasynccpp.a
@@ -119,6 +122,7 @@ lib/svxlink/ModuleTcl.so
 %%DATADIR%%/events.d/MetarInfo.tcl
 %%DATADIR%%/events.d/PropagationMonitor.tcl
 %%DATADIR%%/events.d/SelCallEnc.tcl
+%%DATADIR%%/events.d/Trx.tcl
 %%DATADIR%%/modules.d/ModuleTcl.tcl.example
 %%DATADIR%%/modules.d/ModuleTclVoiceMail.tcl
 %%DATADIR%%/modules.d/ModulePropagationMonitor.tcl
@@ -136,6 +140,7 @@ man/man5/ModuleParrot.conf.5.gz
 man/man5/ModulePropagationMonitor.conf.5.gz
 man/man5/ModuleSelCallEnc.conf.5.gz
 man/man5/ModuleTclVoiceMail.conf.5.gz
+man/man5/ModuleTrx.conf.5.gz
 man/man5/remotetrx.conf.5.gz
 man/man5/svxlink.conf.5.gz
 man/man5/svxreflector.conf.5.gz