svn commit: r376459 - in head/comms/svxlink: . files
Stephen Hurd
shurd at FreeBSD.org
Wed Jan 7 12:12:28 UTC 2015
Author: shurd
Date: Wed Jan 7 12:12:22 2015
New Revision: 376459
URL: https://svnweb.freebsd.org/changeset/ports/376459
QAT: https://qat.redports.org/buildarchive/r376459/
Log:
Update to 14.08
Switch to cmake
Switch to github
Add the STATIC, DOCS, ALSA, and OSS options
Make a master port so comms/qtel can be a slave port
Added:
head/comms/svxlink/files/patch-src_CMakeLists.txt (contents, props changed)
head/comms/svxlink/files/patch-src_async_CMakeLists.txt (contents, props changed)
head/comms/svxlink/files/patch-src_async_qt_CMakeLists.txt (contents, props changed)
head/comms/svxlink/files/patch-src_doc_CMakeLists.txt (contents, props changed)
head/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt (contents, props changed)
head/comms/svxlink/files/patch-src_qtel_CMakeLists.txt (contents, props changed)
head/comms/svxlink/files/patch-svxlink_svxlink_CMakeLists.txt (contents, props changed)
Deleted:
head/comms/svxlink/files/patch-Makefile
head/comms/svxlink/files/patch-async_core_AsyncConfig.h
head/comms/svxlink/files/patch-create_config.sh
head/comms/svxlink/files/patch-doc_man_Makefile.default
head/comms/svxlink/files/patch-makefile.cfg
head/comms/svxlink/files/patch-makefile.inc
head/comms/svxlink/files/patch-misc_common.h
head/comms/svxlink/files/patch-svxlink_Makefile.default
head/comms/svxlink/files/patch-svxlink_scripts_Makefile.default
Modified:
head/comms/svxlink/Makefile
head/comms/svxlink/distinfo (contents, props changed)
head/comms/svxlink/files/patch-async_audio_AsyncAudioDeviceOSS.cpp (contents, props changed)
head/comms/svxlink/files/patch-echolib_EchoLinkDirectoryCon.cpp (contents, props changed)
head/comms/svxlink/files/patch-echolib_EchoLinkDispatcher.h (contents, props changed)
head/comms/svxlink/files/patch-locationinfo_LocationInfo.cpp (contents, props changed)
head/comms/svxlink/files/patch-svxlink_trx_NetTrxMsg.h (contents, props changed)
head/comms/svxlink/files/patch-svxlink_trx_NetTrxTcpClient.cpp (contents, props changed)
head/comms/svxlink/files/patch-svxlink_trx_SwDtmfDecoder.cpp (contents, props changed)
head/comms/svxlink/files/patch-svxlink_trx_ToneDecoder.cpp (contents, props changed)
head/comms/svxlink/pkg-descr (contents, props changed)
head/comms/svxlink/pkg-plist (contents, props changed)
Modified: head/comms/svxlink/Makefile
==============================================================================
--- head/comms/svxlink/Makefile Wed Jan 7 11:28:01 2015 (r376458)
+++ head/comms/svxlink/Makefile Wed Jan 7 12:12:22 2015 (r376459)
@@ -1,85 +1,84 @@
# Created by: shurd
# $FreeBSD$
-PORTNAME= svxlink
-PORTVERSION= 13.12
-PORTREVISION= 2
+PORTNAME?= svxlink
+PORTVERSION= 14.08
CATEGORIES= comms hamradio
-MASTER_SITES= SF/svxlink/svxlink/${PORTVERSION}
+DISTNAME= svxlink-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
-MAINTAINER= shurd at FreeBSD.org
-COMMENT= General purpose ham radio voice services and Qtel Echolink client
+MAINTAINER= hamradio at FreeBSD.org
+COMMENT?= General purpose ham radio voice services
LICENSE= GPLv2
-LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm \
+LIB_DEPENDS?= libgsm.so:${PORTSDIR}/audio/gsm \
libspeex.so:${PORTSDIR}/audio/speex \
libgpg-error.so:${PORTSDIR}/security/libgpg-error \
libgcrypt.so:${PORTSDIR}/security/libgcrypt \
libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
- libasound.so:${PORTSDIR}/audio/alsa-lib \
- libpopt.so:${PORTSDIR}/devel/popt
+ libpopt.so:${PORTSDIR}/devel/popt \
+ libopus.so:${PORTSDIR}/audio/opus
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconf \
${LOCALBASE}/include/linux/input.h:${PORTSDIR}/multimedia/v4l_compat
-USES= gmake tcl
+USE_GITHUB= yes
+GH_ACCOUNT= sm0svx
+GH_PROJECT= svxlink
+GH_COMMIT= cf22c70
+
+USES= cmake tcl
+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
-MAKE_FLAGS= LIB_INSTALL_DIR=${LOCALBASE}/lib \
- INC_INSTALL_DIR=${LOCALBASE}/include/svxlink \
- BIN_INSTALL_DIR=${LOCALBASE}/bin \
- SBIN_INSTALL_DIR=${LOCALBASE}/sbin \
- PLUGIN_INSTALL_DIR=${LOCALBASE}/lib/svxlink \
- TCL_LIBDIR=${TCL_LIBDIR} \
- ADD_INCPATH=-I${LOCALBASE}/include
-
-OPTIONS_DEFINE= QTEL
-QTEL_DESC= Build Qtel EchoLink client
-OPTIONS_DEFAULT=QTEL
+ALL_TARGET?= all man
+OPTIONS_DEFINE= DOCS STATIC
+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:${PORTSDIR}/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
+DOCS_ALL_TARGET=doc
+DOCS_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:BOOL=TRUE
+DOCS_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \
+ dot:${PORTSDIR}/graphics/graphviz
OPTIONS_SUB= yes
+PORTDOCS= *
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MQTEL}
-USE_QT4= corelib gui network moc_build linguist_build rcc_build uic_build
-MAKE_ENV+= MOC=${MOC} \
- RCC=${RCC} \
- UIC=${UIC} \
- LRELEASE=${LRELEASE} \
- QT_LIBDIR=${QT_LIBDIR} \
- QT_INCDIR=${QT_INCDIR} \
- QT_PREFIX=${QT_PREFIX}
-.else
-MAKE_ENV+= WITHOUT_QT=yes
-.endif
-
post-patch:
- @${GREP} -lr /usr/share/ ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
- -e 's|/usr/share/man|${MANPREFIX}/man|' \
- -e 's|/usr/share/doc/svxlink|${DOCSDIR}|' \
- -e 's|/usr/share/svxlink|${DATADIR}|' \
- -e 's|/usr/share/qtel|${PREFIX}/share/qtel|' \
- -e 's|/usr/share/applications|${DESKTOPDIR}|' \
- -e 's|/usr/share/icons|${PREFIX}/share/icons|'
@${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/bin/|${PREFIX}/bin/|' ${WRKSRC}/qtel/qtel.desktop
+ @${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}/doc/man/svxlink.conf.5 \
- ${WRKSRC}/svxlink/svxlink/svxlink.conf
- @${GREP} -lr /etc/ ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \
- ${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|'
- @${GREP} -lr 'echo -e' ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \
- ${REINPLACE_CMD} \
- -e 's|echo -en|echo -n|' \
- -e 's|echo -e|echo |'
- @${FIND} ${WRKSRC} -name 'Makefile*' | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \
- ${REINPLACE_CMD} -e 's|,root,root|,root,wheel|'
+ ${WRKSRC}/src/doc/man/svxlink.conf.5 \
+ ${WRKSRC}/src/svxlink/svxlink/svxlink.conf.in
+.if ${PORT_OPTIONS:MOSS}
@${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|'
+.endif
+.if ${PORTNAME}==svxlink
post-stage:
${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/.procmailrc \
${STAGEDIR}${PREFIX}/etc/svxlink/.procmailrc.sample
@@ -105,5 +104,6 @@ post-stage:
${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
.include <bsd.port.mk>
Modified: head/comms/svxlink/distinfo
==============================================================================
--- head/comms/svxlink/distinfo Wed Jan 7 11:28:01 2015 (r376458)
+++ head/comms/svxlink/distinfo Wed Jan 7 12:12:22 2015 (r376459)
@@ -1,2 +1,2 @@
-SHA256 (svxlink-13.12.tar.gz) = c2a991a35f3386027e33f35c53c9d383231bc8e3184c8e2fef871e4f68622245
-SIZE (svxlink-13.12.tar.gz) = 1168697
+SHA256 (svxlink-14.08.tar.gz) = 42ab3b0a13758032bbb6a847be559fe28cafc012ef30f696662c4f903a03fa3d
+SIZE (svxlink-14.08.tar.gz) = 1506683
Modified: head/comms/svxlink/files/patch-async_audio_AsyncAudioDeviceOSS.cpp
==============================================================================
--- head/comms/svxlink/files/patch-async_audio_AsyncAudioDeviceOSS.cpp Wed Jan 7 11:28:01 2015 (r376458)
+++ head/comms/svxlink/files/patch-async_audio_AsyncAudioDeviceOSS.cpp Wed Jan 7 12:12:22 2015 (r376459)
@@ -1,5 +1,5 @@
---- async/audio/AsyncAudioDeviceOSS.cpp.orig 2014-04-09 22:38:17.000000000 -0700
-+++ async/audio/AsyncAudioDeviceOSS.cpp 2014-04-09 22:38:29.000000000 -0700
+--- src/async/audio/AsyncAudioDeviceOSS.cpp.orig 2014-04-09 22:38:17.000000000 -0700
++++ src/async/audio/AsyncAudioDeviceOSS.cpp 2014-04-09 22:38:29.000000000 -0700
@@ -41,6 +41,7 @@
#include <sys/soundcard.h>
#include <sys/ioctl.h>
Modified: head/comms/svxlink/files/patch-echolib_EchoLinkDirectoryCon.cpp
==============================================================================
--- head/comms/svxlink/files/patch-echolib_EchoLinkDirectoryCon.cpp Wed Jan 7 11:28:01 2015 (r376458)
+++ head/comms/svxlink/files/patch-echolib_EchoLinkDirectoryCon.cpp Wed Jan 7 12:12:22 2015 (r376459)
@@ -1,5 +1,5 @@
---- echolib/EchoLinkDirectoryCon.cpp.orig 2014-04-09 23:13:08.000000000 -0700
-+++ echolib/EchoLinkDirectoryCon.cpp 2014-04-09 23:13:15.000000000 -0700
+--- src/echolib/EchoLinkDirectoryCon.cpp.orig 2014-04-09 23:13:08.000000000 -0700
++++ src/echolib/EchoLinkDirectoryCon.cpp 2014-04-09 23:13:15.000000000 -0700
@@ -204,7 +204,7 @@
}
else
Modified: head/comms/svxlink/files/patch-echolib_EchoLinkDispatcher.h
==============================================================================
--- head/comms/svxlink/files/patch-echolib_EchoLinkDispatcher.h Wed Jan 7 11:28:01 2015 (r376458)
+++ head/comms/svxlink/files/patch-echolib_EchoLinkDispatcher.h Wed Jan 7 12:12:22 2015 (r376459)
@@ -1,5 +1,5 @@
---- echolib/EchoLinkDispatcher.h.orig 2014-04-10 02:13:14.000000000 -0700
-+++ echolib/EchoLinkDispatcher.h 2014-04-10 02:22:41.000000000 -0700
+--- src/echolib/EchoLinkDispatcher.h.orig 2014-04-10 02:13:14.000000000 -0700
++++ src/echolib/EchoLinkDispatcher.h 2014-04-10 02:22:41.000000000 -0700
@@ -215,7 +215,8 @@
return a1 < a2;
}
Modified: head/comms/svxlink/files/patch-locationinfo_LocationInfo.cpp
==============================================================================
--- head/comms/svxlink/files/patch-locationinfo_LocationInfo.cpp Wed Jan 7 11:28:01 2015 (r376458)
+++ head/comms/svxlink/files/patch-locationinfo_LocationInfo.cpp Wed Jan 7 12:12:22 2015 (r376459)
@@ -1,5 +1,5 @@
---- locationinfo/LocationInfo.cpp.orig 2014-04-09 23:26:23.000000000 -0700
-+++ locationinfo/LocationInfo.cpp 2014-04-09 23:26:32.000000000 -0700
+--- src/locationinfo/LocationInfo.cpp.orig 2014-04-09 23:26:23.000000000 -0700
++++ src/locationinfo/LocationInfo.cpp 2014-04-09 23:26:32.000000000 -0700
@@ -480,7 +480,7 @@
}
Added: head/comms/svxlink/files/patch-src_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/svxlink/files/patch-src_CMakeLists.txt Wed Jan 7 12:12:22 2015 (r376459)
@@ -0,0 +1,52 @@
+--- 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 @@
+ 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 @@
+ 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)
+@@ -83,6 +78,15 @@
+ set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include)
+ 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
++endif(QT_ONLY)
++)
++
+ # Where to install libraries
+ if(NOT DEFINED LIB_INSTALL_DIR)
+ set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+@@ -312,10 +316,12 @@
+
+ # Add directories to build
+ add_subdirectory(async)
++if(NOT QT_ONLY)
+ add_subdirectory(misc)
+ add_subdirectory(echolib)
+ add_subdirectory(locationinfo)
+ add_subdirectory(svxlink)
++endif(NOT QT_ONLY)
+ if(USE_QT)
+ add_subdirectory(qtel)
+ endif(USE_QT)
Added: head/comms/svxlink/files/patch-src_async_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/svxlink/files/patch-src_async_CMakeLists.txt Wed Jan 7 12:12:22 2015 (r376459)
@@ -0,0 +1,13 @@
+--- 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
+@@ -1,7 +1,9 @@
++if(NOT QT_ONLY)
+ add_subdirectory(core)
+ add_subdirectory(cpp)
+ add_subdirectory(audio)
++add_subdirectory(demo)
++endif(NOT QT_ONLY)
+ if(USE_QT)
+ add_subdirectory(qt)
+ endif(USE_QT)
+-add_subdirectory(demo)
Added: head/comms/svxlink/files/patch-src_async_qt_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/svxlink/files/patch-src_async_qt_CMakeLists.txt Wed Jan 7 12:12:22 2015 (r376459)
@@ -0,0 +1,15 @@
+--- 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 @@
+
+ set(QTHEADERS AsyncQtApplication.h AsyncQtTimer.h AsyncQtDnsLookupWorker.h)
+
++if(QT_ONLY)
++find_library(ASYNCCORE_LIB asynccore ${LIB_INSTALL_DIR})
++set(LIBS ${LIBS} ${ASYNCCORE_LIB})
++else(QT_ONLY)
+ set(LIBS ${LIBS} asynccore)
++endif(QT_ONLY)
+
+ # Copy exported include files to the global include directory
+ foreach(incfile ${EXPINC})
Added: head/comms/svxlink/files/patch-src_doc_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/svxlink/files/patch-src_doc_CMakeLists.txt Wed Jan 7 12:12:22 2015 (r376459)
@@ -0,0 +1,17 @@
+--- 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
+@@ -2,6 +2,7 @@
+ add_custom_target(doc)
+
+ # Add targets to generate API documentation with Doxygen if it's installed
++if(NOT QT_ONLY)
+ find_package(Doxygen)
+ if(DOXYGEN_FOUND)
+ configure_file(doxygen.echolib.in doxygen.echolib @ONLY)
+@@ -32,5 +33,6 @@
+ "echolib;async"
+ )
+ endif(DOXYGEN_FOUND)
++endif(NOT QT_ONLY)
+
+ add_subdirectory(man)
Added: head/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt Wed Jan 7 12:12:22 2015 (r376459)
@@ -0,0 +1,20 @@
+--- 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
+@@ -1,9 +1,16 @@
+ # 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
+ ModuleTclVoiceMail.conf.5 ModuleDtmfRepeater.conf.5
+- ModulePropagationMonitor.conf.5 ModuleSelCallEnc.conf.5 qtel.1
++ ModulePropagationMonitor.conf.5 ModuleSelCallEnc.conf.5
+ )
++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.
+ include(FindGZIP)
Added: head/comms/svxlink/files/patch-src_qtel_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/svxlink/files/patch-src_qtel_CMakeLists.txt Wed Jan 7 12:12:22 2015 (r376459)
@@ -0,0 +1,17 @@
+--- 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 @@
+ 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})
++else(QT_ONLY)
+ set(LIBS ${LIBS} echolib asyncqt asyncaudio asynccore)
++endif(QT_ONLY)
+
+ # Find the GSM codec library and include directory
+ find_package(GSM REQUIRED)
Added: head/comms/svxlink/files/patch-svxlink_svxlink_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/svxlink/files/patch-svxlink_svxlink_CMakeLists.txt Wed Jan 7 12:12:22 2015 (r376459)
@@ -0,0 +1,15 @@
+--- ./src/svxlink/svxlink/CMakeLists.txt.orig 2015-01-05 18:06:11.000000000 -0800
++++ ./src/svxlink/svxlink/CMakeLists.txt 2015-01-05 18:06:33.000000000 -0800
+@@ -24,9 +24,9 @@
+ 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/files/patch-svxlink_trx_NetTrxMsg.h
==============================================================================
--- head/comms/svxlink/files/patch-svxlink_trx_NetTrxMsg.h Wed Jan 7 11:28:01 2015 (r376458)
+++ head/comms/svxlink/files/patch-svxlink_trx_NetTrxMsg.h Wed Jan 7 12:12:22 2015 (r376459)
@@ -1,5 +1,5 @@
---- svxlink/trx/NetTrxMsg.h.orig 2014-04-09 23:51:14.000000000 -0700
-+++ svxlink/trx/NetTrxMsg.h 2014-04-09 23:51:53.000000000 -0700
+--- src/svxlink/trx/NetTrxMsg.h.orig 2014-04-09 23:51:14.000000000 -0700
++++ src/svxlink/trx/NetTrxMsg.h 2014-04-09 23:51:53.000000000 -0700
@@ -176,8 +176,8 @@
MsgProtoVer(void)
: Msg(TYPE, sizeof(MsgProtoVer)), m_major(MAJOR),
Modified: head/comms/svxlink/files/patch-svxlink_trx_NetTrxTcpClient.cpp
==============================================================================
--- head/comms/svxlink/files/patch-svxlink_trx_NetTrxTcpClient.cpp Wed Jan 7 11:28:01 2015 (r376458)
+++ head/comms/svxlink/files/patch-svxlink_trx_NetTrxTcpClient.cpp Wed Jan 7 12:12:22 2015 (r376459)
@@ -1,5 +1,5 @@
---- svxlink/trx/NetTrxTcpClient.cpp.orig 2014-04-09 23:51:30.000000000 -0700
-+++ svxlink/trx/NetTrxTcpClient.cpp 2014-04-09 23:52:13.000000000 -0700
+--- src/svxlink/trx/NetTrxTcpClient.cpp.orig 2014-04-09 23:51:30.000000000 -0700
++++ src/svxlink/trx/NetTrxTcpClient.cpp 2014-04-09 23:52:13.000000000 -0700
@@ -328,8 +328,8 @@
{
MsgProtoVer *ver_msg = reinterpret_cast<MsgProtoVer *>(msg);
Modified: head/comms/svxlink/files/patch-svxlink_trx_SwDtmfDecoder.cpp
==============================================================================
--- head/comms/svxlink/files/patch-svxlink_trx_SwDtmfDecoder.cpp Wed Jan 7 11:28:01 2015 (r376458)
+++ head/comms/svxlink/files/patch-svxlink_trx_SwDtmfDecoder.cpp Wed Jan 7 12:12:22 2015 (r376459)
@@ -1,5 +1,5 @@
---- svxlink/trx/SwDtmfDecoder.cpp.orig 2014-04-09 23:44:56.000000000 -0700
-+++ svxlink/trx/SwDtmfDecoder.cpp 2014-04-09 23:47:28.000000000 -0700
+--- src/svxlink/trx/SwDtmfDecoder.cpp.orig 2014-04-09 23:44:56.000000000 -0700
++++ src/svxlink/trx/SwDtmfDecoder.cpp 2014-04-09 23:47:28.000000000 -0700
@@ -175,14 +175,14 @@
{
int cfg_fwd_twist = atoi(value.c_str());
Modified: head/comms/svxlink/files/patch-svxlink_trx_ToneDecoder.cpp
==============================================================================
--- head/comms/svxlink/files/patch-svxlink_trx_ToneDecoder.cpp Wed Jan 7 11:28:01 2015 (r376458)
+++ head/comms/svxlink/files/patch-svxlink_trx_ToneDecoder.cpp Wed Jan 7 12:12:22 2015 (r376459)
@@ -1,5 +1,5 @@
---- svxlink/trx/ToneDetector.cpp.orig 2014-04-09 23:45:04.000000000 -0700
-+++ svxlink/trx/ToneDetector.cpp 2014-04-09 23:47:33.000000000 -0700
+--- src/svxlink/trx/ToneDetector.cpp.orig 2014-04-09 23:45:04.000000000 -0700
++++ src/svxlink/trx/ToneDetector.cpp 2014-04-09 23:47:33.000000000 -0700
@@ -335,7 +335,7 @@
{
if (thresh > 0.0f)
Modified: head/comms/svxlink/pkg-descr
==============================================================================
--- head/comms/svxlink/pkg-descr Wed Jan 7 11:28:01 2015 (r376458)
+++ head/comms/svxlink/pkg-descr Wed Jan 7 12:12:22 2015 (r376459)
@@ -1,5 +1,4 @@
The SvxLink project is a flexible, general purpose voice services system for
-ham radio use. The project also includes Qtel, an EchoLink client GUI
-application.
+ham radio use.
-WWW: http://sourceforge.net/apps/trac/svxlink/
+WWW: http://www.svxlink.org/
Modified: head/comms/svxlink/pkg-plist
==============================================================================
--- head/comms/svxlink/pkg-plist Wed Jan 7 11:28:01 2015 (r376458)
+++ head/comms/svxlink/pkg-plist Wed Jan 7 12:12:22 2015 (r376459)
@@ -1,7 +1,6 @@
bin/svxlink
bin/remotetrx
bin/siglevdetcal
-%%QTEL%%bin/qtel
@sample etc/svxlink/svxlink.d/ModuleHelp.conf.sample
@sample etc/svxlink/svxlink.d/ModuleParrot.conf.sample
@sample etc/svxlink/svxlink.d/ModuleEchoLink.conf.sample
@@ -58,42 +57,34 @@ include/svxlink/AsyncAudioRecorder.h
include/svxlink/AsyncAudioJitterFifo.h
include/svxlink/AsyncAudioDeviceFactory.h
include/svxlink/AsyncAudioDevice.h
-%%QTEL%%include/svxlink/AsyncQtApplication.h
include/svxlink/common.h
include/svxlink/EchoLinkDirectory.h
include/svxlink/EchoLinkDispatcher.h
include/svxlink/EchoLinkQso.h
include/svxlink/EchoLinkStationData.h
include/svxlink/EchoLinkProxy.h
-lib/libasynccore.a
-lib/libasynccore-1.2.0.so
-lib/libasynccore.so.1.2
+lib/libasynccore.so.1.3.0
+lib/libasynccore.so.1.3
lib/libasynccore.so
-lib/libasynccpp.a
-lib/libasynccpp-1.2.0.so
-lib/libasynccpp.so.1.2
+lib/libasynccpp.so.1.3.0
+lib/libasynccpp.so.1.3
lib/libasynccpp.so
-lib/libasyncaudio.a
-lib/libasyncaudio-1.2.0.so
-lib/libasyncaudio.so.1.2
+lib/libasyncaudio.so.1.3.0
+lib/libasyncaudio.so.1.3
lib/libasyncaudio.so
-%%QTEL%%lib/libasyncqt.a
-%%QTEL%%lib/libasyncqt-1.2.0.so
-%%QTEL%%lib/libasyncqt.so.1.2
-%%QTEL%%lib/libasyncqt.so
-lib/libecholib.a
lib/svxlink/ModuleHelp.so
lib/svxlink/ModuleParrot.so
lib/svxlink/ModuleEchoLink.so
lib/svxlink/ModuleTcl.so
lib/svxlink/ModuleDtmfRepeater.so
lib/svxlink/ModuleMetarInfo.so
-lib/libecholib-1.2.1.so
-lib/libecholib.so.1.2
+lib/libecholib.so.1.3.0
+lib/libecholib.so.1.3
lib/libecholib.so
-lib/liblocationinfo.a
-lib/libtrx.a
-%%QTEL%%share/applications/qtel.desktop
+%%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
@@ -115,23 +106,9 @@ lib/libtrx.a
%%DATADIR%%/modules.d/ModuleTclVoiceMail.tcl
%%DATADIR%%/modules.d/ModulePropagationMonitor.tcl
%%DATADIR%%/modules.d/ModuleSelCallEnc.tcl
-%%QTEL%%share/qtel/translations/qtel_sv.qm
-%%QTEL%%share/qtel/translations/qtel_de.qm
-%%QTEL%%share/qtel/translations/qtel_tr.qm
-%%QTEL%%share/qtel/translations/qtel_nl.qm
-%%QTEL%%share/qtel/translations/qtel_it.qm
-%%QTEL%%share/qtel/translations/qtel_uk.qm
-%%QTEL%%share/qtel/translations/qtel_ru.qm
-%%QTEL%%share/qtel/translations/qtel_hu.qm
-%%QTEL%%share/qtel/translations/qtel_es.qm
-%%QTEL%%share/qtel/translations/qtel_ja.qm
-%%QTEL%%share/qtel/translations/qtel_fr.qm
-%%QTEL%%share/qtel/sounds/connect.raw
-%%QTEL%%share/icons/link.xpm
man/man1/svxlink.1.gz
man/man1/remotetrx.1.gz
man/man1/siglevdetcal.1.gz
-%%QTEL%%man/man1/qtel.1.gz
man/man5/svxlink.conf.5.gz
man/man5/ModuleHelp.conf.5.gz
man/man5/ModuleParrot.conf.5.gz
@@ -141,6 +118,7 @@ man/man5/ModuleDtmfRepeater.conf.5.gz
man/man5/ModulePropagationMonitor.conf.5.gz
man/man5/ModuleSelCallEnc.conf.5.gz
man/man5/remotetrx.conf.5.gz
+ at dir %%DATADIR%%/sounds
@dir /var/spool/svxlink/voice_mail
@dir /var/spool/svxlink/qso_recorder
@dir /var/spool/svxlink/propagation_monitor
More information about the svn-ports-all
mailing list