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
2015-01-07 12:12:22 +00:00 · 2015-01-07 12:12:22 +00:00 · 7d6f65abc1
commit 7d6f65abc1
parent a236d3780e
28 changed files with 234 additions and 417 deletions
--- a/comms/svxlink/Makefile
+++ b/comms/svxlink/Makefile
@ -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@FreeBSD.org
-COMMENT=	General purpose ham radio voice services and Qtel Echolink client
+MAINTAINER=	hamradio@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>
--- a/comms/svxlink/distinfo
+++ b/comms/svxlink/distinfo
@ -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
--- a/comms/svxlink/files/patch-Makefile
+++ b/comms/svxlink/files/patch-Makefile
@ -1,15 +0,0 @@
--- Makefile.orig	2013-03-09 00:18:15.000000000 -0800
-+++ Makefile	2014-04-10 04:56:53.000000000 -0700
-@@ -67,10 +67,10 @@
- ARCHIVENAME	= $$(basename $$(pwd)).tgz
- 
- # Used to get bold text in echo statements
-BOLD		= "\033[1m"
-+#BOLD		= "\033[1m"
- 
- # End bold text
-NBOLD		= "\033[0m"
-+#NBOLD		= "\033[0m"
- 
- # Create softlink
- MKSOFT		= ln -s
--- a/comms/svxlink/files/patch-async_audio_AsyncAudioDeviceOSS.cpp
+++ b/comms/svxlink/files/patch-async_audio_AsyncAudioDeviceOSS.cpp
@ -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>
--- a/comms/svxlink/files/patch-async_core_AsyncConfig.h
+++ b/comms/svxlink/files/patch-async_core_AsyncConfig.h
@ -1,35 +0,0 @@
--- async/core/AsyncConfig.h.orig	2013-05-25 13:14:51.000000000 -0700
-+++ async/core/AsyncConfig.h	2014-04-20 22:49:04.000000000 -0700
-@@ -212,7 +212,9 @@
-       }
-       std::stringstream ssval(str_val);
-       Rsp tmp;
-      ssval >> tmp >> std::ws;
-+      ssval >> tmp;
-+      if(!ssval.eof())
-+        ssval >> std::ws;
-       if (ssval.fail() || !ssval.eof())
-       {
- 	return false;
-@@ -261,7 +263,9 @@
-       while (!ssval.eof())
-       {
-         Value tmp;
-        ssval >> tmp >> std::ws;
-+        ssval >> tmp;
-+        if(!ssval.eof())
-+          ssval >> std::ws;
-         if (ssval.fail())
-         {
-           return false;
-@@ -304,7 +308,9 @@
-       }
-       std::stringstream ssval(str_val);
-       Rsp tmp;
-      ssval >> tmp >> std::ws;
-+      ssval >> tmp;
-+      if(!ssval.eof())
-+        ssval >> std::ws;
-       if (ssval.fail() || !ssval.eof() || (tmp < min) || (tmp > max))
-       {
- 	return false;
--- a/comms/svxlink/files/patch-create_config.sh
+++ b/comms/svxlink/files/patch-create_config.sh
@ -1,92 +0,0 @@
--- create_config.sh.orig	2013-10-13 02:39:16.000000000 -0700
-+++ create_config.sh	2014-04-11 12:04:57.000000000 -0700
-@@ -61,43 +61,45 @@
- fi
- 
- # Checking for QT
-info "--- Checking for QT..."
-if which pkg-config > /dev/null 2>&1; then
-  if pkg-config QtCore; then
-    QT_MODULES="QtCore QtGui QtNetwork"
-    info "yes (pkg-config QtCore)\n"
-    output "QT_LIBPATH=$(pkg-config $QT_MODULES --libs-only-L)"
-    output "QT_LIBS=$(pkg-config $QT_MODULES --libs-only-l)"
-    output "QT_INCPATH=$(pkg-config $QT_MODULES --cflags-only-I)"
-    output "QT_CFLAGS=$(pkg-config $QT_MODULES --cflags-only-other)"
-    QT_PREFIX=$(pkg-config QtCore --variable=prefix)
-    QT_BIN="${QT_PREFIX}/bin"
-    output "QT_BIN=${QT_BIN}"
-    QT_MOC=$(pkg-config QtCore --variable=moc_location)
-    if [ ! -x "$QT_MOC" ]; then
-      QT_MOC="$QT_BIN/moc"
-    fi
-    QT_UIC=$(pkg-config QtCore --variable=uic_location)
-    if [ ! -x "$QT_UIC" ]; then
-      QT_UIC="$QT_BIN/uic"
-    fi
-    QT_RCC=$(pkg-config QtCore --variable=rcc_location)
-    if [ ! -x "$QT_RCC" ]; then
-      QT_RCC="$QT_BIN/rcc"
-+if [ "$WITHOUT_QT" != "yes" ]; then
-+  info "--- Checking for QT..."
-+  if which pkg-config > /dev/null 2>&1; then
-+    if pkg-config QtCore; then
-+      QT_MODULES="QtCore QtGui QtNetwork"
-+      info "yes (pkg-config QtCore)\n"
-+      output "QT_LIBPATH=$(pkg-config $QT_MODULES --libs-only-L)"
-+      output "QT_LIBS=$(pkg-config $QT_MODULES --libs-only-l)"
-+      output "QT_INCPATH=$(pkg-config $QT_MODULES --cflags-only-I)"
-+      output "QT_CFLAGS=$(pkg-config $QT_MODULES --cflags-only-other)"
-+      #QT_PREFIX=$(pkg-config QtCore --variable=prefix)
-+      QT_BIN="${QT_PREFIX}/bin"
-+      output "QT_BIN=${QT_BIN}"
-+      QT_MOC=$(pkg-config QtCore --variable=moc_location)
-+      if [ ! -x "$QT_MOC" ]; then
-+        QT_MOC="$QT_BIN/moc"
-+      fi
-+      QT_UIC=$(pkg-config QtCore --variable=uic_location)
-+      if [ ! -x "$QT_UIC" ]; then
-+        QT_UIC="$QT_BIN/uic"
-+      fi
-+      QT_RCC=$(pkg-config QtCore --variable=rcc_location)
-+      if [ ! -x "$QT_RCC" ]; then
-+        QT_RCC="$QT_BIN/rcc"
-+      fi
-+      QT_LRELEASE=$(pkg-config QtCore --variable=lrelease_location)
-+      if [ ! -x "$QT_LRELEASE" ]; then
-+        QT_LRELEASE="$QT_BIN/lrelease"
-+      fi
-+      output "QT_MOC=$MOC"
-+      output "QT_UIC=$UIC"
-+      output "QT_RCC=$RCC"
-+      output "QT_LRELEASE=$LRELEASE"
-+    else
-+      info "no (optional)\n"
-     fi
-    QT_LRELEASE=$(pkg-config QtCore --variable=lrelease_location)
-    if [ ! -x "$QT_LRELEASE" ]; then
-      QT_LRELEASE="$QT_BIN/lrelease"
-    fi
-    output "QT_MOC=${QT_MOC}"
-    output "QT_UIC=${QT_UIC}"
-    output "QT_RCC=${QT_RCC}"
-    output "QT_LRELEASE=${QT_LRELEASE}"
-   else
-     info "no (optional)\n"
-   fi
-else
-  info "no (optional)\n"
- fi
- 
- # Checking for libsigc++
-@@ -120,9 +122,7 @@
- 
- # Checking for tcl development library
- info "--- Checking for TCL development library..."
-tclConfig=$(ls /usr/lib/tclConfig.sh /usr/lib/tcl8.*/tclConfig.sh \
-	       /usr/lib64/tclConfig.sh /usr/lib64/tcl8.*/tclConfig.sh \
-	    2>/dev/null | head -1)
-+tclConfig=$(ls ${TCL_LIBDIR}/tclConfig.sh 2>/dev/null | head -1)
- if [ -n "$tclConfig" -a -r "$tclConfig" ]; then
-   . $tclConfig
-   info "${TCL_VERSION}\n"
--- a/comms/svxlink/files/patch-doc_man_Makefile.default
+++ b/comms/svxlink/files/patch-doc_man_Makefile.default
@ -1,24 +0,0 @@
--- doc/man/Makefile.default.orig	2011-05-15 01:59:35.000000000 -0700
-+++ doc/man/Makefile.default	2014-04-11 12:08:08.000000000 -0700
-@@ -11,6 +11,7 @@
- 
- # Include version information
- -include $(ROOT)/versions
-+-include $(ROOT)/.config
- 
- 
- ###############################################################################
-@@ -150,8 +151,11 @@
- 		  ModuleTclVoiceMail.conf.5.gz ModuleDtmfRepeater.conf.5.gz \
- 		  ModulePropagationMonitor.conf.5.gz \
- 		  ModuleSelCallEnc.conf.5.gz \
-		  remotetrx.1.gz remotetrx.conf.5.gz siglevdetcal.1.gz \
-		  qtel.1.gz
-+		  remotetrx.1.gz remotetrx.conf.5.gz siglevdetcal.1.gz
-+
-+ifdef QT_BIN
-+PRE_TARGETS	+=qtel.1.gz
-+endif
- 
- #POST_TARGETS	= 
- 
--- a/comms/svxlink/files/patch-echolib_EchoLinkDirectoryCon.cpp
+++ b/comms/svxlink/files/patch-echolib_EchoLinkDirectoryCon.cpp
@ -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
--- a/comms/svxlink/files/patch-echolib_EchoLinkDispatcher.h
+++ b/comms/svxlink/files/patch-echolib_EchoLinkDispatcher.h
@ -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;
       }
--- a/comms/svxlink/files/patch-locationinfo_LocationInfo.cpp
+++ b/comms/svxlink/files/patch-locationinfo_LocationInfo.cpp
@ -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 @@
   }
 
--- a/comms/svxlink/files/patch-makefile.cfg
+++ b/comms/svxlink/files/patch-makefile.cfg
@ -1,11 +0,0 @@
--- makefile.cfg.orig	2013-03-24 02:49:05.000000000 -0700
-+++ makefile.cfg	2014-04-10 05:10:07.000000000 -0700
-@@ -60,7 +60,7 @@
- endif
- 
- # Set default include path
-INCPATH       		= 
-+INCPATH       		= ${ADD_INCPATH}
- 
- # CFLAGS (for CC) and CXXFLAGS (for CXX)
- CFLAGS += 
--- a/comms/svxlink/files/patch-makefile.inc
+++ b/comms/svxlink/files/patch-makefile.inc
@ -1,91 +0,0 @@
--- makefile.inc.orig	2014-04-10 04:44:46.000000000 -0700
-+++ makefile.inc	2014-04-10 04:45:04.000000000 -0700
-@@ -160,7 +160,7 @@
- 	    else \
- 	      $(ECHO) --- Installing $(BOLD)$$file$(NBOLD) in \
- 	              $(BOLD)$${target_dir}$(NBOLD)...; \
-	      cp -pdf $$file $${target_dir}; \
-+	      cp -pf $$file $${target_dir}; \
- 	      [ -n "$$perm" -a "$$perm" != '-' ] \
- 	          && chmod $$perm $${target_dir}/`basename $$file`; \
- 	      [ -z "$$NO_CHOWN" -a -n "$$owner" -a "$$owner" != '-' ] \
-@@ -245,7 +245,7 @@
- 	    target_dir=$${dir}; \
- 	  fi; \
- 	  if [ "$@" = "install-extras" ]; then \
-	    $(MKDIR) $${target_dir} -p; \
-+	    $(MKDIR) -p $${target_dir}; \
- 	    [ -n "$$perm" -a "$$perm" != '-' ] \
- 	        && chmod $$perm $${target_dir}; \
- 	    [ -z "$$NO_CHOWN" -a -n "$$owner" -a "$$owner" != '-' ] \
-@@ -311,10 +311,10 @@
-      }; remove_file
- 
- # Some useful printing macros
-BOLD		= "\033[1m"
-NBOLD		= "\033[0m"
-+#BOLD		= "\033[1m"
-+#NBOLD		= "\033[0m"
-
- #ECHO		= /bin/echo -e
- BECHO		= $(ECHO) $(BOLD)txt $(NBOLD)
- 
- # Compiler
-@@ -408,7 +408,7 @@
- ifdef PROGS
- $(PROGS):	$(notdir $(PROGS:%=%.o)) $(PRGOBJS) $(LIBDEP)
- 	if [ -n "$(BIN)" -a ! -d "$(BIN)" ]; then \
-	  $(MKDIR) $(BIN) -p; \
-+	  $(MKDIR) -p $(BIN); \
- 	fi
- 	BASENAME=`basename $@`_version; \
- 	if [ -r $${BASENAME}.h -a -r $${BASENAME}.c ]; then \
-@@ -429,7 +429,7 @@
- ifdef CPPPROGS
- $(CPPPROGS):	$(notdir $(CPPPROGS:%=%.o)) $(PRGOBJS) $(LIBDEP)
- 	if [ -n "$(BIN)" -a ! -d "$(BIN)" ]; then \
-	  $(MKDIR) $(BIN) -p; \
-+	  $(MKDIR) -p $(BIN); \
- 	fi
- 	BASENAME=`basename $@`_version; \
- 	if [ -r $${BASENAME}.h -a -r $${BASENAME}.c ]; then \
-@@ -522,7 +522,7 @@
- $(EXPINC:%=$(INC)/%):
- 	$(ECHO) --- Creating $(BOLD)$@$(NBOLD)...
- 	if [ -n "$(INC)" -a ! -d "$(INC)" ]; then \
-	  $(MKDIR) $(INC) -p; \
-+	  $(MKDIR) -p $(INC); \
- 	fi
- 	$(RM) $@
- 	ln -s $$($(REVPATH) $$(dirname $@))/$$(basename $@) $@
-@@ -535,7 +535,7 @@
- 	$(RM) $(LIBFILE)
- 	$(ECHO) --- Creating archive $(BOLD)$@$(NBOLD)...
- 	if [ -n "$(LIB)" -a ! -d "$(LIB)" ]; then \
-	  $(MKDIR) $(LIB) -p; \
-+	  $(MKDIR) -p $(LIB); \
-       	fi
- 	$(AR) cq $(LIBFILE) $(LIBOBJS)
- 	if [ -n "$(STATIC_LIBS)" ]; then \
-@@ -801,12 +801,12 @@
- endif
- 
- $(ROOT)/.config:	$(ROOT)/create_config.sh
- 	echo -e --- Creating $(BOLD)$@$(NBOLD)...
- 	$(ROOT)/create_config.sh $@
- 
- .config:
- 	if [ -x ./create_config ]; then \
- 	  echo -e --- Creating $(BOLD)$@$(NBOLD)...; \
- 	  rm -f $@; \
- 	  ./create_config $@; \
- 	  echo "MAKEFILE_LOCAL_CONFIG_INCLUDED = 1" >> $@; \
-@@ -815,7 +815,7 @@
- # Generate version files
- version/%.h: $(ROOT)/versions
- 	if [ ! -d version ]; then \
-	  $(MKDIR) version -p; \
-+	  $(MKDIR) -p version; \
- 	fi; \
- 	. $(ROOT)/versions; \
- 	if [ -n "$${$*}" ]; then \
--- a/comms/svxlink/files/patch-misc_common.h
+++ b/comms/svxlink/files/patch-misc_common.h
@ -1,13 +0,0 @@
--- misc/common.h.orig	2013-09-14 03:27:37.000000000 -0700
-+++ misc/common.h	2014-04-20 22:45:31.000000000 -0700
-@@ -119,7 +119,9 @@
- static bool setValueFromString(ValueType &val, const std::string &str)
- {
-   std::istringstream ss(str);
-  ss >> std::noskipws >> val >> std::ws;
-+  ss >> std::noskipws >> val;
-+  if(!ss.eof())
-+    ss >> std::ws;
-   return !ss.fail() && ss.eof();
- } /* setValueFromString */
- 
--- a/comms/svxlink/files/patch-src_CMakeLists.txt
+++ b/comms/svxlink/files/patch-src_CMakeLists.txt
@ -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)
--- a/comms/svxlink/files/patch-src_async_CMakeLists.txt
+++ b/comms/svxlink/files/patch-src_async_CMakeLists.txt
@ -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)
--- a/comms/svxlink/files/patch-src_async_qt_CMakeLists.txt
+++ b/comms/svxlink/files/patch-src_async_qt_CMakeLists.txt
@ -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})
--- a/comms/svxlink/files/patch-src_doc_CMakeLists.txt
+++ b/comms/svxlink/files/patch-src_doc_CMakeLists.txt
@ -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)
--- a/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt
+++ b/comms/svxlink/files/patch-src_doc_man_CMakeLists.txt
@ -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)
--- a/comms/svxlink/files/patch-src_qtel_CMakeLists.txt
+++ b/comms/svxlink/files/patch-src_qtel_CMakeLists.txt
@ -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)
--- a/comms/svxlink/files/patch-svxlink_Makefile.default
+++ b/comms/svxlink/files/patch-svxlink_Makefile.default
@ -1,11 +0,0 @@
--- svxlink/svxlink/Makefile.default.orig	2014-04-09 23:54:07.000000000 -0700
-+++ svxlink/svxlink/Makefile.default	2014-04-09 23:54:12.000000000 -0700
-@@ -34,7 +34,7 @@
- PROJLIBS	= -ltrx -llocationinfo -lasynccpp -lasyncaudio -lasynccore
- 
- # Libraries external to the project
-LIBS		= -ldl -lpopt -lgsm $(TCL_LIBS) $(GCRYPT_LIBS) $(SIGC_LIBS)
-+LIBS		= -lpopt -lgsm $(TCL_LIBS) $(GCRYPT_LIBS) $(SIGC_LIBS)
- 
- # Specify Qt header files here that you want to run the
- # Qt Meta Object Compiler on (for programs).
--- a/comms/svxlink/files/patch-svxlink_scripts_Makefile.default
+++ b/comms/svxlink/files/patch-svxlink_scripts_Makefile.default
@ -1,17 +0,0 @@
--- svxlink/scripts/Makefile.default.orig	2010-12-04 06:27:53.000000000 -0800
-+++ svxlink/scripts/Makefile.default	2014-04-10 01:39:24.000000000 -0700
-@@ -217,14 +217,6 @@
- # Additional files to install
- install-extras uninstall-extras rpm-extras:
- 	$(DIRSPEC) /var/spool/svxlink[755,svxlink,daemon]
-	$(FILESPEC) etc/logrotate.d/svxlink[644,root,root,config] /etc/logrotate.d
-	$(FILESPEC) etc/logrotate.d/remotetrx[644,root,root,config] /etc/logrotate.d
-	$(FILESPEC) etc/init.d/svxlink[755,root,root] /etc/init.d
-	$(FILESPEC) etc/sysconfig/svxlink[755,root,root,config] /etc/sysconfig
-	$(FILESPEC) etc/10-svxlink.rules[644,root,root,config] /etc/udev/rules.d
-	$(FILESPEC) etc/90-svxlink.perms[644,root,root,config] /etc/security/console.perms.d
-	$(FILESPEC) etc/init.d/remotetrx[755,root,root] /etc/init.d
-	$(FILESPEC) etc/sysconfig/remotetrx[755,root,root,config] /etc/sysconfig
- 
- 
- #
--- a/comms/svxlink/files/patch-svxlink_svxlink_CMakeLists.txt
+++ b/comms/svxlink/files/patch-svxlink_svxlink_CMakeLists.txt
@ -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)
--- a/comms/svxlink/files/patch-svxlink_trx_NetTrxMsg.h
+++ b/comms/svxlink/files/patch-svxlink_trx_NetTrxMsg.h
@ -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),
--- a/comms/svxlink/files/patch-svxlink_trx_NetTrxTcpClient.cpp
+++ b/comms/svxlink/files/patch-svxlink_trx_NetTrxTcpClient.cpp
@ -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);
--- a/comms/svxlink/files/patch-svxlink_trx_SwDtmfDecoder.cpp
+++ b/comms/svxlink/files/patch-svxlink_trx_SwDtmfDecoder.cpp
@ -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());
--- a/comms/svxlink/files/patch-svxlink_trx_ToneDecoder.cpp
+++ b/comms/svxlink/files/patch-svxlink_trx_ToneDecoder.cpp
@ -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)
--- a/comms/svxlink/pkg-descr
+++ b/comms/svxlink/pkg-descr
@ -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/
--- a/comms/svxlink/pkg-plist
+++ b/comms/svxlink/pkg-plist
@ -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
+@dir %%DATADIR%%/sounds
@dir /var/spool/svxlink/voice_mail
@dir /var/spool/svxlink/qso_recorder
@dir /var/spool/svxlink/propagation_monitor