diff --git a/comms/Makefile b/comms/Makefile index 7bf3c33751e7..19190ca43d24 100644 --- a/comms/Makefile +++ b/comms/Makefile @@ -124,6 +124,7 @@ SUBDIR += qpage SUBDIR += qrq SUBDIR += qsstv + SUBDIR += qtel SUBDIR += remserial SUBDIR += rubygem-callsign SUBDIR += rubygem-ruby-termios diff --git a/comms/qtel/Makefile b/comms/qtel/Makefile new file mode 100644 index 000000000000..c2887a769b37 --- /dev/null +++ b/comms/qtel/Makefile @@ -0,0 +1,58 @@ +# New ports collection makefile for: qtel +# Date Created: 2012-05-22 +# Whome: Stephen Hurd +# +# $FreeBSD$ +# + +PORTNAME= qtel +PORTVERSION= 11.05 +CATEGORIES= comms hamradio +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= svxlink/svxlink/${PORTVERSION} +DISTNAME= svxlink-${PORTVERSION} + +MAINTAINER= shurd@sasktel.net +COMMENT= Qt EchoLink Client and SvrLink audio server + +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config +LIB_DEPENDS= sigc-1.2:${PORTSDIR}/devel/libsigc++12 \ + speex:${PORTSDIR}/audio/speex \ + gcrypt:${PORTSDIR}/security/libgcrypt \ + gsm:${PORTSDIR}/audio/gsm \ + popt:${PORTSDIR}/devel/popt + +MAN1= svxlink.1 \ + remotetrx.1 \ + siglevdetcal.1 \ + qtel.1 +MAN5= svxlink.conf.5 \ + ModuleHelp.conf.5 \ + ModuleParrot.conf.5 \ + ModuleEchoLink.conf.5 \ + ModuleTclVoiceMail.conf.5 \ + ModuleDtmfRepeater.conf.5 \ + ModulePropagationMonitor.conf.5 \ + ModuleSelCallEnc.conf.5 \ + remotetrx.conf.5 +MANCOMPRESSED= yes +USE_GMAKE= yes +USE_QT_VER= 3 +USE_TCL= yes +USE_RC_SUBR= svxlink remotetrx +USE_LDCONFIG= ${LOCALBASE}/lib ${LOCALBASE}/lib/svxlink + +.include +.if ${OSVERSION} < 802517 +BROKEN= will not compile before Version 8.2 STABLE +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + `grep -lr %%LOCALBASE%% ${WRKSRC}` + @${REINPLACE_CMD} -e 's|%%MAN1PREFIX%%|${MAN1PREFIX}|' \ + `grep -lr %%MAN1PREFIX%% ${WRKSRC}` + @${REINPLACE_CMD} -e 's|%%MAN5PREFIX%%|${MAN5PREFIX}|' \ + `grep -lr %%MAN5PREFIX%% ${WRKSRC}` + +.include diff --git a/comms/qtel/distinfo b/comms/qtel/distinfo new file mode 100644 index 000000000000..73e44c6c7da1 --- /dev/null +++ b/comms/qtel/distinfo @@ -0,0 +1,2 @@ +SHA256 (svxlink-11.05.tar.gz) = 3368b0920cbd55990805027be7492e47d11e1d84a2b1672484bf17b934913474 +SIZE (svxlink-11.05.tar.gz) = 854546 diff --git a/comms/qtel/files/patch-Makefile b/comms/qtel/files/patch-Makefile new file mode 100644 index 000000000000..29bcf383ddb8 --- /dev/null +++ b/comms/qtel/files/patch-Makefile @@ -0,0 +1,47 @@ +--- ../svxlink-11.05.orig/Makefile 2011-03-13 08:43:39.000000000 -0700 ++++ Makefile 2012-05-28 10:27:56.000000000 -0700 +@@ -116,7 +116,7 @@ + for dir in $${SUBDIRS}; do \ + if [ -d $$dir ]; then \ + $(PRINT_DIR) $(CURRENT_SUBDIR)$$dir ; \ +- make CURRENT_SUBDIR="$(CURRENT_SUBDIR)$$dir/" -C $$dir $@; \ ++ $(MAKE) CURRENT_SUBDIR="$(CURRENT_SUBDIR)$$dir/" -C $$dir $@; \ + ec=$$?; \ + if [ $$ec -ne 0 ]; then \ + exit $$ec; \ +@@ -151,7 +151,7 @@ + for dir in $(REVDIRS); do \ + if [ -d $$dir ]; then \ + $(PRINT_DIR) $(CURRENT_SUBDIR)$$dir ; \ +- make CURRENT_SUBDIR="$(CURRENT_SUBDIR)$$dir/" -C $$dir $@; \ ++ $(MAKE) CURRENT_SUBDIR="$(CURRENT_SUBDIR)$$dir/" -C $$dir $@; \ + fi \ + done + else +@@ -185,7 +185,7 @@ + for dir in $(REVDIRS); do \ + if [ -d $$dir ]; then \ + $(PRINT_DIR) $(CURRENT_SUBDIR)$$dir ; \ +- make CURRENT_SUBDIR="$(CURRENT_SUBDIR)$$dir/" -C $$dir $@; \ ++ $(MAKE) CURRENT_SUBDIR="$(CURRENT_SUBDIR)$$dir/" -C $$dir $@; \ + fi \ + done + $(RM) *~ $(ARCHIVENAME) .config +@@ -257,7 +257,7 @@ + if [ -r $$dir/makefile.dirs ]; then \ + ( \ + cd $$dir; $(MKSOFT) $${ROOT}/Makefile; \ +- make makefiles; \ ++ $(MAKE) makefiles; \ + ); \ + else \ + ( cd $$dir; $(MKSOFT) $${ROOT}/makefile.sub Makefile ); \ +@@ -294,7 +294,7 @@ + for dir in $${SUBDIRS}; do \ + if [ -d $$dir ]; then \ + $(PRINT_DIR) $(CURRENT_SUBDIR)$$dir ; \ +- make CURRENT_SUBDIR="$(CURRENT_SUBDIR)$$dir/" \ ++ $(MAKE) CURRENT_SUBDIR="$(CURRENT_SUBDIR)$$dir/" \ + MADE_FROM_TOP=1 -C $$dir $@; \ + fi \ + done diff --git a/comms/qtel/files/patch-async-audio-Makefile.default b/comms/qtel/files/patch-async-audio-Makefile.default new file mode 100644 index 000000000000..55c7dc6e568b --- /dev/null +++ b/comms/qtel/files/patch-async-audio-Makefile.default @@ -0,0 +1,51 @@ +--- ../svxlink-11.05.orig/async/audio/Makefile.default 2010-02-21 12:21:23.000000000 -0800 ++++ async/audio/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -71,7 +71,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -158,7 +158,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -167,7 +167,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -195,8 +195,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -280,8 +280,8 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +-# $(DIRSPEC) /var/spool/myprog[755,root,root] +-# $(FILESPEC) install-extras/myprog.conf[644,root,root] /etc ++# $(DIRSPEC) /var/spool/myprog[755,root,wheel] ++# $(FILESPEC) install-extras/myprog.conf[644,root,wheel] /etc + + + # diff --git a/comms/qtel/files/patch-async-core-Makefile.default b/comms/qtel/files/patch-async-core-Makefile.default new file mode 100644 index 000000000000..56a7713c4d16 --- /dev/null +++ b/comms/qtel/files/patch-async-core-Makefile.default @@ -0,0 +1,38 @@ +--- ../svxlink-11.05.orig/async/core/Makefile.default 2008-03-20 01:28:38.000000000 -0700 ++++ async/core/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -69,7 +69,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -123,7 +123,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -132,7 +132,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -160,7 +160,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) + + + ############################################################################### diff --git a/comms/qtel/files/patch-async-cpp-Makefile.default b/comms/qtel/files/patch-async-cpp-Makefile.default new file mode 100644 index 000000000000..a8fe23567136 --- /dev/null +++ b/comms/qtel/files/patch-async-cpp-Makefile.default @@ -0,0 +1,38 @@ +--- ../svxlink-11.05.orig/async/cpp/Makefile.default 2008-04-26 12:08:37.000000000 -0700 ++++ async/cpp/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -69,7 +69,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -115,7 +115,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -124,7 +124,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -152,7 +152,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) + + + ############################################################################### diff --git a/comms/qtel/files/patch-async-demo-AsyncAudioIO_demo.cpp b/comms/qtel/files/patch-async-demo-AsyncAudioIO_demo.cpp new file mode 100644 index 000000000000..f4d5b1509ee2 --- /dev/null +++ b/comms/qtel/files/patch-async-demo-AsyncAudioIO_demo.cpp @@ -0,0 +1,20 @@ +--- ../svxlink-11.05.orig/async/demo/AsyncAudioIO_demo.cpp 2010-02-21 12:21:23.000000000 -0800 ++++ async/demo/AsyncAudioIO_demo.cpp 2012-05-28 10:27:56.000000000 -0700 +@@ -106,7 +106,7 @@ + MyClass(void) + { + // Create a new audio IO object +- audio_io = new AudioIO("alsa:default", 0); ++ audio_io = new AudioIO("oss:/dev/dsp", 0); + + // Open it for both reading and writing + audio_io->open(AudioIO::MODE_RDWR); +@@ -117,7 +117,7 @@ + // Register the audio device as the audio source for this object + registerSource(audio_io); + +- SineGenerator *sine_gen = new SineGenerator("alsa:default", 1); ++ SineGenerator *sine_gen = new SineGenerator("oss:/dev/dsp", 1); + sine_gen->setFq(1000); + sine_gen->setLevel(2); + sine_gen->enable(true); diff --git a/comms/qtel/files/patch-async-demo-Makefile.default b/comms/qtel/files/patch-async-demo-Makefile.default new file mode 100644 index 000000000000..403a4013ef29 --- /dev/null +++ b/comms/qtel/files/patch-async-demo-Makefile.default @@ -0,0 +1,29 @@ +--- ../svxlink-11.05.orig/async/demo/Makefile.default 2011-04-21 04:40:56.000000000 -0700 ++++ async/demo/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -130,7 +130,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -139,7 +139,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -167,7 +167,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) + + + ############################################################################### diff --git a/comms/qtel/files/patch-async-qt-Makefile.default b/comms/qtel/files/patch-async-qt-Makefile.default new file mode 100644 index 000000000000..f1cbce37b538 --- /dev/null +++ b/comms/qtel/files/patch-async-qt-Makefile.default @@ -0,0 +1,38 @@ +--- ../svxlink-11.05.orig/async/qt/Makefile.default 2007-07-17 16:03:33.000000000 -0700 ++++ async/qt/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -72,7 +72,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -120,7 +120,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -129,7 +129,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + endif # QT_BIN + +@@ -159,7 +159,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) + + + ############################################################################### diff --git a/comms/qtel/files/patch-create_config.sh b/comms/qtel/files/patch-create_config.sh new file mode 100644 index 000000000000..d26188963d96 --- /dev/null +++ b/comms/qtel/files/patch-create_config.sh @@ -0,0 +1,31 @@ +--- create_config.sh.orig 2009-04-19 14:10:53.000000000 -0700 ++++ create_config.sh 2012-06-24 10:20:20.000000000 -0700 +@@ -121,12 +121,15 @@ + # 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 \ ++ /usr/lib64/tclConfig.sh /usr/lib64/tcl8.*/tclConfig.sh /usr/local/lib/tcl8.*/tclConfig.sh \ + 2>/dev/null | head -1) + if [ -n "$tclConfig" -a -r "$tclConfig" ]; then + . $tclConfig + info "${TCL_VERSION}\n" +- output "TCL_LIBS=-ltcl${TCL_VERSION}" ++ TCL_SVER=`echo ${TCL_VERSION} | tr -d .` ++ output "TCL_LIBPATH=-L/usr/local/lib" ++ output "TCL_LIBS=-ltcl${TCL_SVER}" ++ output "TCL_INCPATH=-I/usr/local/include/tcl${TCL_VERSION}" + else + info "no (required)\n" + exit_error +@@ -137,8 +140,8 @@ + if which pkg-config > /dev/null 2>&1; then + if pkg-config speex; then + ver=$(pkg-config speex --modversion) +- ver_major=$(echo $ver | sed -r 's/^([0-9]+)\..*$/\1/') +- ver_minor=$(echo $ver | sed -r 's/^([0-9]+)\.([0-9]+).*$/\2/') ++ ver_major=$(echo $ver | sed -E 's/^([0-9]+)\..*$/\1/') ++ ver_minor=$(echo $ver | sed -E 's/^([0-9]+)\.([0-9]+).*$/\2/') + info "$ver\n" + output "SPEEX_LIBPATH=$(pkg-config speex --libs-only-L)" + output "SPEEX_LIBS=$(pkg-config speex --libs-only-l)" diff --git a/comms/qtel/files/patch-doc-man-Makefile.default b/comms/qtel/files/patch-doc-man-Makefile.default new file mode 100644 index 000000000000..baed912e59ee --- /dev/null +++ b/comms/qtel/files/patch-doc-man-Makefile.default @@ -0,0 +1,75 @@ +--- ../svxlink-11.05.orig/doc/man/Makefile.default 2011-05-15 01:59:35.000000000 -0700 ++++ doc/man/Makefile.default 2012-05-28 10:27:55.000000000 -0700 +@@ -47,7 +47,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -94,7 +94,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -103,7 +103,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -131,8 +131,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -227,20 +227,20 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +-# $(DIRSPEC) /var/spool/myprog[755,root,root] +- $(FILESPEC) svxlink.1.gz[644,root,root] /usr/share/man/man1 +- $(FILESPEC) svxlink.conf.5.gz[644,root,root] /usr/share/man/man5 +- $(FILESPEC) ModuleHelp.conf.5.gz[644,root,root] /usr/share/man/man5 +- $(FILESPEC) ModuleParrot.conf.5.gz[644,root,root] /usr/share/man/man5 +- $(FILESPEC) ModuleEchoLink.conf.5.gz[644,root,root] /usr/share/man/man5 +- $(FILESPEC) ModuleTclVoiceMail.conf.5.gz[644,root,root] /usr/share/man/man5 +- $(FILESPEC) ModuleDtmfRepeater.conf.5.gz[644,root,root] /usr/share/man/man5 +- $(FILESPEC) ModulePropagationMonitor.conf.5.gz[644,root,root] /usr/share/man/man5 +- $(FILESPEC) ModuleSelCallEnc.conf.5.gz[644,root,root] /usr/share/man/man5 +- $(FILESPEC) remotetrx.1.gz[644,root,root] /usr/share/man/man1 +- $(FILESPEC) remotetrx.conf.5.gz[644,root,root] /usr/share/man/man5 +- $(FILESPEC) siglevdetcal.1.gz[644,root,root] /usr/share/man/man1 +- $(FILESPEC) qtel.1.gz[644,root,root] /usr/share/man/man1 ++# $(DIRSPEC) /var/spool/myprog[755,root,wheel] ++ $(FILESPEC) svxlink.1.gz[644,root,wheel] %%MAN1PREFIX%%/man/man1 ++ $(FILESPEC) svxlink.conf.5.gz[644,root,wheel] %%MAN5PREFIX%%/man/man5 ++ $(FILESPEC) ModuleHelp.conf.5.gz[644,root,wheel] %%MAN5PREFIX%%/man/man5 ++ $(FILESPEC) ModuleParrot.conf.5.gz[644,root,wheel] %%MAN5PREFIX%%/man/man5 ++ $(FILESPEC) ModuleEchoLink.conf.5.gz[644,root,wheel] %%MAN5PREFIX%%/man/man5 ++ $(FILESPEC) ModuleTclVoiceMail.conf.5.gz[644,root,wheel] %%MAN5PREFIX%%/man/man5 ++ $(FILESPEC) ModuleDtmfRepeater.conf.5.gz[644,root,wheel] %%MAN5PREFIX%%/man/man5 ++ $(FILESPEC) ModulePropagationMonitor.conf.5.gz[644,root,wheel] %%MAN5PREFIX%%/man/man5 ++ $(FILESPEC) ModuleSelCallEnc.conf.5.gz[644,root,wheel] %%MAN5PREFIX%%/man/man5 ++ $(FILESPEC) remotetrx.1.gz[644,root,wheel] %%MAN1PREFIX%%/man/man1 ++ $(FILESPEC) remotetrx.conf.5.gz[644,root,wheel] %%MAN5PREFIX%%/man/man5 ++ $(FILESPEC) siglevdetcal.1.gz[644,root,wheel] %%MAN1PREFIX%%/man/man1 ++ $(FILESPEC) qtel.1.gz[644,root,wheel] %%MAN1PREFIX%%/man/man1 + + + diff --git a/comms/qtel/files/patch-doc-man-ModuleDtmfRepeater.conf.5 b/comms/qtel/files/patch-doc-man-ModuleDtmfRepeater.conf.5 new file mode 100644 index 000000000000..6422bc0a5727 --- /dev/null +++ b/comms/qtel/files/patch-doc-man-ModuleDtmfRepeater.conf.5 @@ -0,0 +1,18 @@ +--- ../svxlink-11.05.orig/doc/man/ModuleDtmfRepeater.conf.5 2011-05-15 01:59:35.000000000 -0700 ++++ doc/man/ModuleDtmfRepeater.conf.5 2012-05-28 10:27:55.000000000 -0700 +@@ -36,13 +36,13 @@ + .SH FILES + . + .TP +-.IR /etc/svxlink/svxlink.conf " (or deprecated " /etc/svxlink.conf ")" ++.IR %%LOCALBASE%%/etc/svxlink/svxlink.conf " (or deprecated " %%LOCALBASE%%/etc/svxlink.conf ")" + The system wide configuration file. + .TP + .IR ~/.svxlink/svxlink.conf + Per user configuration file. + .TP +-.I /etc/svxlink/svxlink.d/ModuleDtmfRepeater.conf ++.I %%LOCALBASE%%/etc/svxlink/svxlink.d/ModuleDtmfRepeater.conf + Global modularized configuration file. Depends on the CFG_DIR configuration + variable setting. + .TP diff --git a/comms/qtel/files/patch-doc-man-ModuleEchoLink.conf.5 b/comms/qtel/files/patch-doc-man-ModuleEchoLink.conf.5 new file mode 100644 index 000000000000..8788917bed18 --- /dev/null +++ b/comms/qtel/files/patch-doc-man-ModuleEchoLink.conf.5 @@ -0,0 +1,18 @@ +--- ../svxlink-11.05.orig/doc/man/ModuleEchoLink.conf.5 2011-05-15 01:59:35.000000000 -0700 ++++ doc/man/ModuleEchoLink.conf.5 2012-05-28 10:27:55.000000000 -0700 +@@ -171,13 +171,13 @@ + .SH FILES + . + .TP +-.IR /etc/svxlink/svxlink.conf " (or deprecated " /etc/svxlink.conf ")" ++.IR %%LOCALBASE%%/etc/svxlink/svxlink.conf " (or deprecated " %%LOCALBASE%%/etc/svxlink.conf ")" + The system wide configuration file. + .TP + .IR ~/.svxlink/svxlink.conf + Per user configuration file. + .TP +-.I /etc/svxlink/svxlink.d/ModuleEchoLink.conf ++.I %%LOCALBASE%%/etc/svxlink/svxlink.d/ModuleEchoLink.conf + Global modularized configuration file. Depends on the CFG_DIR configuration + variable setting. + .TP diff --git a/comms/qtel/files/patch-doc-man-ModuleHelp.conf.5 b/comms/qtel/files/patch-doc-man-ModuleHelp.conf.5 new file mode 100644 index 000000000000..ed7072d71ad5 --- /dev/null +++ b/comms/qtel/files/patch-doc-man-ModuleHelp.conf.5 @@ -0,0 +1,18 @@ +--- ../svxlink-11.05.orig/doc/man/ModuleHelp.conf.5 2011-05-15 01:59:35.000000000 -0700 ++++ doc/man/ModuleHelp.conf.5 2012-05-28 10:27:55.000000000 -0700 +@@ -24,13 +24,13 @@ + .SH FILES + . + .TP +-.IR /etc/svxlink/svxlink.conf " (or deprecated " /etc/svxlink.conf ")" ++.IR %%LOCALBASE%%/etc/svxlink/svxlink.conf " (or deprecated " %%LOCALBASE%%/etc/svxlink.conf ")" + The system wide configuration file. + .TP + .IR ~/.svxlink/svxlink.conf + Per user configuration file. + .TP +-.I /etc/svxlink/svxlink.d/ModuleHelp.conf ++.I %%LOCALBASE%%/etc/svxlink/svxlink.d/ModuleHelp.conf + Global modularized configuration file. Depends on the CFG_DIR configuration + variable setting. + .TP diff --git a/comms/qtel/files/patch-doc-man-ModuleParrot.conf.5 b/comms/qtel/files/patch-doc-man-ModuleParrot.conf.5 new file mode 100644 index 000000000000..b587b721b243 --- /dev/null +++ b/comms/qtel/files/patch-doc-man-ModuleParrot.conf.5 @@ -0,0 +1,18 @@ +--- ../svxlink-11.05.orig/doc/man/ModuleParrot.conf.5 2011-05-15 01:59:35.000000000 -0700 ++++ doc/man/ModuleParrot.conf.5 2012-05-28 10:27:55.000000000 -0700 +@@ -41,13 +41,13 @@ + .SH FILES + . + .TP +-.IR /etc/svxlink/svxlink.conf " (or deprecated " /etc/svxlink.conf ")" ++.IR %%LOCALBASE%%/etc/svxlink/svxlink.conf " (or deprecated " %%LOCALBASE%%/etc/svxlink.conf ")" + The system wide configuration file. + .TP + .IR ~/.svxlink/svxlink.conf + Per user configuration file. + .TP +-.I /etc/svxlink/svxlink.d/ModuleParrot.conf ++.I %%LOCALBASE%%/etc/svxlink/svxlink.d/ModuleParrot.conf + Global modularized configuration file. Depends on the CFG_DIR configuration + variable setting. + .TP diff --git a/comms/qtel/files/patch-doc-man-ModulePropagationMonitor.conf.5 b/comms/qtel/files/patch-doc-man-ModulePropagationMonitor.conf.5 new file mode 100644 index 000000000000..571da6c036ee --- /dev/null +++ b/comms/qtel/files/patch-doc-man-ModulePropagationMonitor.conf.5 @@ -0,0 +1,36 @@ +--- ../svxlink-11.05.orig/doc/man/ModulePropagationMonitor.conf.5 2011-05-15 01:59:35.000000000 -0700 ++++ doc/man/ModulePropagationMonitor.conf.5 2012-05-28 10:27:55.000000000 -0700 +@@ -58,7 +58,7 @@ + utility. When an incoming email is received, the mail server call procmail + which look for a configuration file in the destination users home directory. + For SvxLink, the home directory should be set to +-.IR /etc/svxlink . ++.IR %%LOCALBASE%%/etc/svxlink . + In that directory a procmail configuration file, + .BR .procmailrc , + is installed by default. The syntax is a bit cryptic but the file contains +@@ -87,13 +87,13 @@ + .SH FILES + . + .TP +-.IR /etc/svxlink/svxlink.conf " (or deprecated " /etc/svxlink.conf ")" ++.IR %%LOCALBASE%%/etc/svxlink/svxlink.conf " (or deprecated " %%LOCALBASE%%/etc/svxlink.conf ")" + The system wide configuration file. + .TP + .IR ~/.svxlink/svxlink.conf + Per user configuration file. + .TP +-.I /etc/svxlink/svxlink.d/ModulePropagationMonitor.conf ++.I %%LOCALBASE%%/etc/svxlink/svxlink.d/ModulePropagationMonitor.conf + Global modularized configuration file. Depends on the CFG_DIR configuration + variable setting. + .TP +@@ -105,7 +105,7 @@ + Spool directory for alert mails. This is the default path. What path is + actually used is determined by the SPOOL_DIR configuration variable. + .TP +-.I /etc/svxlink/.procmailrc ++.I %%LOCALBASE%%/etc/svxlink/.procmailrc + The configuration file for procmail. Procmail is used to write incoming + alert emails into files in the spool directory. + . diff --git a/comms/qtel/files/patch-doc-man-ModuleSelCallEnc.conf.5 b/comms/qtel/files/patch-doc-man-ModuleSelCallEnc.conf.5 new file mode 100644 index 000000000000..fb45f6b8407f --- /dev/null +++ b/comms/qtel/files/patch-doc-man-ModuleSelCallEnc.conf.5 @@ -0,0 +1,18 @@ +--- ../svxlink-11.05.orig/doc/man/ModuleSelCallEnc.conf.5 2011-05-15 01:59:35.000000000 -0700 ++++ doc/man/ModuleSelCallEnc.conf.5 2012-05-28 10:27:55.000000000 -0700 +@@ -27,13 +27,13 @@ + .SH FILES + . + .TP +-.IR /etc/svxlink/svxlink.conf " (or deprecated " /etc/svxlink.conf ")" ++.IR %%LOCALBASE%%/etc/svxlink/svxlink.conf " (or deprecated " %%LOCALBASE%%/etc/svxlink.conf ")" + The system wide configuration file. + .TP + .IR ~/.svxlink/svxlink.conf + Per user configuration file. + .TP +-.I /etc/svxlink/svxlink.d/ModuleSelCallEnc.conf ++.I %%LOCALBASE%%/etc/svxlink/svxlink.d/ModuleSelCallEnc.conf + Global modularized configuration file. Depends on the CFG_DIR configuration + variable setting. + .TP diff --git a/comms/qtel/files/patch-doc-man-ModuleTclVoiceMail.conf.5 b/comms/qtel/files/patch-doc-man-ModuleTclVoiceMail.conf.5 new file mode 100644 index 000000000000..b9a5dc862edd --- /dev/null +++ b/comms/qtel/files/patch-doc-man-ModuleTclVoiceMail.conf.5 @@ -0,0 +1,35 @@ +--- ../svxlink-11.05.orig/doc/man/ModuleTclVoiceMail.conf.5 2011-05-15 01:59:35.000000000 -0700 ++++ doc/man/ModuleTclVoiceMail.conf.5 2012-05-28 10:27:55.000000000 -0700 +@@ -22,20 +22,20 @@ + .P + The TclVoiceMail module does not have any module specific configuration + variables. It is configured in another configuration file. Its default location +-is /etc/svxlink/TclVoiceMail.conf. The configuration file is also looked for in ++is %%LOCALBASE%%/etc/svxlink/TclVoiceMail.conf. The configuration file is also looked for in + directory "$HOME/.svxlink/". The comments in that file should be enough to + understand how to configure the voice mail module. + . + .SH FILES + . + .TP +-.IR /etc/svxlink/svxlink.conf " (or deprecated " /etc/svxlink.conf ")" ++.IR %%LOCALBASE%%/etc/svxlink/svxlink.conf " (or deprecated " %%LOCALBASE%%/etc/svxlink.conf ")" + The system wide configuration file. + .TP + .IR ~/.svxlink/svxlink.conf + Per user configuration file. + .TP +-.I /etc/svxlink/svxlink.d/ModuleTclVoiceMail.conf ++.I %%LOCALBASE%%/etc/svxlink/svxlink.d/ModuleTclVoiceMail.conf + Global modularized configuration file. Depends on the CFG_DIR configuration + variable setting. + .TP +@@ -43,7 +43,7 @@ + Per user modularized configuration file. Depends on the CFG_DIR configuration + variable setting. + .TP +-.I /etc/svxlink/TclVoiceMail.conf ++.I %%LOCALBASE%%/etc/svxlink/TclVoiceMail.conf + System wide configuration file for the TclVoiceMail module. + .TP + .I ~/.svxlink/TclVoiceMail.conf diff --git a/comms/qtel/files/patch-doc-man-qtel.1 b/comms/qtel/files/patch-doc-man-qtel.1 new file mode 100644 index 000000000000..86bb918e3c4b --- /dev/null +++ b/comms/qtel/files/patch-doc-man-qtel.1 @@ -0,0 +1,11 @@ +--- ../svxlink-11.05.orig/doc/man/qtel.1 2011-02-20 08:32:21.000000000 -0800 ++++ doc/man/qtel.1 2012-05-28 10:27:55.000000000 -0700 +@@ -51,7 +51,7 @@ + .B http://sourceforge.net/apps/trac/svxlink/wiki/QtelUserDocs + or at + .B +-/usr/share/doc/svxlink/qteluserdoc.pdf ++%%LOCALBASE%%/share/doc/svxlink/qteluserdoc.pdf + . + .SH AUTHOR + . diff --git a/comms/qtel/files/patch-doc-man-remotetrx.1 b/comms/qtel/files/patch-doc-man-remotetrx.1 new file mode 100644 index 000000000000..d2d88eeaf305 --- /dev/null +++ b/comms/qtel/files/patch-doc-man-remotetrx.1 @@ -0,0 +1,20 @@ +--- ../svxlink-11.05.orig/doc/man/remotetrx.1 2011-05-15 01:59:35.000000000 -0700 ++++ doc/man/remotetrx.1 2012-05-28 10:27:55.000000000 -0700 +@@ -61,7 +61,7 @@ + .SH FILES + . + .TP +-.IR /etc/svxlink/remotetrx.conf " (or deprecated " /etc/remotetrx.conf ")" ++.IR %%LOCALBASE%%/etc/svxlink/remotetrx.conf " (or deprecated " /etc/remotetrx.conf ")" + The system wide configuration file. See + .BR remotetrx.conf (5) + for further details. +@@ -71,7 +71,7 @@ + .BR remotetrx.conf (5) + for further details. + .TP +-.I /etc/svxlink/remotetrx.d/* ++.I %%LOCALBASE%%/etc/svxlink/remotetrx.d/* + Additional configuration files. This directory is setup by the CFG_DIR + configuration variable. + . diff --git a/comms/qtel/files/patch-doc-man-remotetrx.conf.5 b/comms/qtel/files/patch-doc-man-remotetrx.conf.5 new file mode 100644 index 000000000000..b010e1fca95f --- /dev/null +++ b/comms/qtel/files/patch-doc-man-remotetrx.conf.5 @@ -0,0 +1,27 @@ +--- ../svxlink-11.05.orig/doc/man/remotetrx.conf.5 2011-05-15 01:59:35.000000000 -0700 ++++ doc/man/remotetrx.conf.5 2012-05-28 10:27:55.000000000 -0700 +@@ -31,7 +31,7 @@ + .BR $HOME/.svxlink/remotetrx.conf . + If no user specific configuration file can be found, remotetrx will look + for the system wide configuration file +-.BR /etc/svxlink/remotetrx.conf . ++.BR %%LOCALBASE%%/etc/svxlink/remotetrx.conf . + The + .B --config + command line option may also be used to specify an arbitrary configuration file. +@@ -235,13 +235,13 @@ + .SH FILES + . + .TP +-.IR /etc/svxlink/remotetrx.conf " (or deprecated " /etc/remotetrx.conf ")" ++.IR %%LOCALBASE%%/etc/svxlink/remotetrx.conf " (or deprecated " /etc/remotetrx.conf ")" + The system wide configuration file. + .TP + .IR ~/.svxlink/remotetrx.conf + Per user configuration file. + .TP +-.I /etc/svxlink/remotetrx.d/* ++.I %%LOCALBASE%%/etc/svxlink/remotetrx.d/* + Additional configuration files. + . + .SH AUTHOR diff --git a/comms/qtel/files/patch-doc-man-svxlink.1 b/comms/qtel/files/patch-doc-man-svxlink.1 new file mode 100644 index 000000000000..7ceaba52e3b0 --- /dev/null +++ b/comms/qtel/files/patch-doc-man-svxlink.1 @@ -0,0 +1,20 @@ +--- ../svxlink-11.05.orig/doc/man/svxlink.1 2011-05-15 01:59:35.000000000 -0700 ++++ doc/man/svxlink.1 2012-05-28 10:27:55.000000000 -0700 +@@ -41,7 +41,7 @@ + .SH FILES + . + .TP +-.IR /etc/svxlink.conf " (or deprecated " /etc/svxlink.conf ")" ++.IR %%LOCALBASE%%/etc/svxlink.conf " (or deprecated " %%LOCALBASE%%/etc/svxlink.conf ")" + The system wide configuration file. See + .BR svxlink.conf (5) + for further details. +@@ -51,7 +51,7 @@ + .BR svxlink.conf (5) + for further details. + .TP +-.I /etc/svxlink/svxlink.d/* ++.I %%LOCALBASE%%/etc/svxlink/svxlink.d/* + Additional configuration files. Typically one configuration file per module. + . + .SH ENVIRONMENT diff --git a/comms/qtel/files/patch-doc-man-svxlink.conf.5 b/comms/qtel/files/patch-doc-man-svxlink.conf.5 new file mode 100644 index 000000000000..5eac133399dd --- /dev/null +++ b/comms/qtel/files/patch-doc-man-svxlink.conf.5 @@ -0,0 +1,77 @@ +--- doc/man/svxlink.conf.5.orig 2011-05-15 01:59:35.000000000 -0700 ++++ doc/man/svxlink.conf.5 2012-06-24 10:45:02.000000000 -0700 +@@ -16,7 +16,7 @@ + .BR $HOME/.svxlink/svxlink.conf . + If no user specific configuration file can be found, SvxLink will look for + the system wide configuration file +-.BR /etc/svxlink/svxlink.conf . ++.BR /usr/local/etc/svxlink/svxlink.conf . + The + .B --config + command line option may also be used to specify an arbitrary configuration file. +@@ -185,7 +185,7 @@ + .B EVENT_HANDLER + Point out the TCL event handler script to use. The TCL event handler script is + responsible for playing the correct audio clips when an event occurr. +-The default location is /usr/share/svxlink/events.tcl. ++The default location is /usr/local/share/svxlink/events.tcl. + .TP + .B DEFAULT_LANG + Set the default language to use for announcements. It should be set to an ISO +@@ -474,7 +474,7 @@ + Always "Local" for a local receiver. + .TP + .B AUDIO_DEV +-Specify the audio device to use. Normally /dev/dsp. ++Specify the audio device to use. Normally oss:/dev/dsp. + .TP + .B AUDIO_CHANNEL + Specify the audio channel to use. SvxLink can use the left/right stereo +@@ -482,7 +482,7 @@ + .TP + .B SQL_DET + Specify the type of squelch detector to use. Possible values are: VOX, CTCSS, +-SERIAL, EVDEV or SIGLEV. ++SERIAL or SIGLEV. + + The VOX squelch detector determines if there is a signal + present by calculating a mean value of the sound samples. The VOX squelch +@@ -500,13 +500,6 @@ + hardware indicator of when the squelch is open. Specify which serial port/pin to + use with SERIAL_PORT and SERIAL_PIN. + +-The EVDEV squelch detector read squelch events from a /dev/input/eventX device. +-An example where this could be useful is if you have a USB audio device with +-some buttons on it. Some of these devices generate key press events, much like +-a keyboard. Specify which /dev/input device node to use using the EVDEV_DEVNAME +-config variable. Set which events that should open and close the squelch using +-the EVDEV_OPEN and EVDEV_CLOSE config variables. +- + The SIGLEV squelch detector use signal level measurements to determine if the + squelch is open or not. Which signal level detector to use is determined by the + setting of the SIGLEV_DET configuration variable. The open and close +@@ -902,7 +895,7 @@ + Always "Local" for a local transmitter. + .TP + .B AUDIO_DEV +-Specify the audio device to use. Normally /dev/dsp. ++Specify the audio device to use. Normally oss:/dev/dsp. + .TP + .B AUDIO_CHANNEL + Specify the audio channel to use. SvxLink can use the left/right stereo +@@ -1351,13 +1344,13 @@ + .SH FILES + . + .TP +-.IR /etc/svxlink/svxlink.conf " (or deprecated " /etc/svxlink.conf ")" ++.IR /usr/local/etc/svxlink/svxlink.conf " (or deprecated " %%LOCALBASE%%/etc/svxlink.conf ")" + The system wide configuration file. + .TP + .IR ~/.svxlink/svxlink.conf + Per user configuration file. + .TP +-.I /etc/svxlink/svxlink.d/* ++.I /usr/local/etc/svxlink/svxlink.d/* + Additional configuration files. Typically one configuration file per module. + . + .SH AUTHOR diff --git a/comms/qtel/files/patch-echolib-EchoLinkQsoTest.cpp b/comms/qtel/files/patch-echolib-EchoLinkQsoTest.cpp new file mode 100644 index 000000000000..4e0d2a5a84f1 --- /dev/null +++ b/comms/qtel/files/patch-echolib-EchoLinkQsoTest.cpp @@ -0,0 +1,11 @@ +--- ../svxlink-11.05.orig/echolib/EchoLinkQsoTest.cpp 2011-05-14 00:27:24.000000000 -0700 ++++ echolib/EchoLinkQsoTest.cpp 2012-05-28 10:27:55.000000000 -0700 +@@ -159,7 +159,7 @@ + + //sigc_src = new SigCAudioSource; + +- audio_io = new AudioIO("alsa:default", 0); ++ audio_io = new AudioIO("oss:/dev/dsp", 0); + full_duplex = audio_io->isFullDuplexCapable(); + if (full_duplex) + { diff --git a/comms/qtel/files/patch-echolib-Makefile.default b/comms/qtel/files/patch-echolib-Makefile.default new file mode 100644 index 000000000000..a491e529e82d --- /dev/null +++ b/comms/qtel/files/patch-echolib-Makefile.default @@ -0,0 +1,47 @@ +--- echolib/Makefile.default.orig 2011-04-21 04:40:56.000000000 -0700 ++++ echolib/Makefile.default 2012-05-28 13:35:08.000000000 -0700 +@@ -52,7 +52,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-#PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++#PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + PROGS_INSTALL = + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. +@@ -102,7 +102,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(LIB_INC:%=%[644,root,root]) ++INC_INSTALL = $(LIB_INC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -111,7 +111,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -139,7 +139,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -176,7 +176,7 @@ + + # Paths to library-directories. All directories must be preceeded + # by the "-L" switch. +-LIBPATH += ++LIBPATH += -L%%LOCALBASE%%/lib + + # Additional warnings to use. If you want to override the default + # warnings, change the "+=" to "=". diff --git a/comms/qtel/files/patch-locationinfo-LocationInfo.cpp b/comms/qtel/files/patch-locationinfo-LocationInfo.cpp new file mode 100644 index 000000000000..130ba92e0a7b --- /dev/null +++ b/comms/qtel/files/patch-locationinfo-LocationInfo.cpp @@ -0,0 +1,11 @@ +--- ../svxlink-11.05.orig/locationinfo/LocationInfo.cpp 2011-03-01 16:11:17.000000000 -0800 ++++ locationinfo/LocationInfo.cpp 2012-05-28 10:27:56.000000000 -0700 +@@ -412,7 +412,7 @@ + } + + double tmp = sqrt(2.0 * loc_cfg.height * sqrt((loc_cfg.power / 10.0) * +- pow10(loc_cfg.gain / 10.0) / 2)) * range_factor; ++ pow(10, loc_cfg.gain / 10.0) / 2)) * range_factor; + + return lrintf(tmp); + diff --git a/comms/qtel/files/patch-locationinfo-Makefile.default b/comms/qtel/files/patch-locationinfo-Makefile.default new file mode 100644 index 000000000000..7e1435e7e823 --- /dev/null +++ b/comms/qtel/files/patch-locationinfo-Makefile.default @@ -0,0 +1,38 @@ +--- ../svxlink-11.05.orig/locationinfo/Makefile.default 2010-04-10 07:45:52.000000000 -0700 ++++ locationinfo/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -51,7 +51,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-#PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++#PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + PROGS_INSTALL = + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. +@@ -100,7 +100,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(LIB_INC:%=%[644,root,root]) ++INC_INSTALL = $(LIB_INC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -109,7 +109,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -137,7 +137,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) + + + ############################################################################### diff --git a/comms/qtel/files/patch-makefile.cfg b/comms/qtel/files/patch-makefile.cfg new file mode 100644 index 000000000000..5036b955fd49 --- /dev/null +++ b/comms/qtel/files/patch-makefile.cfg @@ -0,0 +1,49 @@ +--- ../svxlink-11.05.orig/makefile.cfg 2010-02-21 12:21:23.000000000 -0800 ++++ makefile.cfg 2012-05-28 10:27:56.000000000 -0700 +@@ -36,31 +36,31 @@ + + # Path to where to install library files. + ifndef LIB_INSTALL_DIR +-LIB_INSTALL_DIR = /usr/lib ++LIB_INSTALL_DIR = %%LOCALBASE%%/lib + endif + + # Path to where to install include files. + ifndef INC_INSTALL_DIR +-INC_INSTALL_DIR = /usr/include/svxlink ++INC_INSTALL_DIR = %%LOCALBASE%%/include/svxlink + endif + + # Path to where to install program files. + ifndef BIN_INSTALL_DIR +-BIN_INSTALL_DIR = /usr/bin ++BIN_INSTALL_DIR = %%LOCALBASE%%/bin + endif + + # Path to where to install system program files (daemons). + ifndef SBIN_INSTALL_DIR +-SBIN_INSTALL_DIR = /usr/sbin ++SBIN_INSTALL_DIR = %%LOCALBASE%%/sbin + endif + + # Path to where to install plugins. + ifndef PLUGIN_INSTALL_DIR +-PLUGIN_INSTALL_DIR = /usr/lib/svxlink ++PLUGIN_INSTALL_DIR = %%LOCALBASE%%/lib/svxlink + endif + + # Set default include path +-INCPATH = ++INCPATH = -I%%LOCALBASE%%/include + + # CFLAGS (for CC) and CXXFLAGS (for CXX) + CFLAGS += +@@ -78,7 +78,7 @@ + DEBUG_CFLAGS = -g + + # Compile ALSA audio support +-ASYNC_AUDIO_ALSA_SUPPORT=1 ++#ASYNC_AUDIO_ALSA_SUPPORT=1 + + # Compile OSS audio support + ASYNC_AUDIO_OSS_SUPPORT=1 diff --git a/comms/qtel/files/patch-makefile.inc b/comms/qtel/files/patch-makefile.inc new file mode 100644 index 000000000000..c7ebe87497c5 --- /dev/null +++ b/comms/qtel/files/patch-makefile.inc @@ -0,0 +1,20 @@ +--- ../svxlink-11.05.orig/makefile.inc 2011-03-01 16:11:17.000000000 -0800 ++++ makefile.inc 2012-05-28 10:27:56.000000000 -0700 +@@ -43,6 +43,8 @@ + BIN := $(ROOT)/$(BIN) + RPM_DIR := $(ROOT)/$(RPM_DIR) + ++vpath %.h $(INC) %%LOCALBASE%%/include %%LOCALBASE%%/include/tcl8.5 ++ + # Path used by gcc to find library/include files. If you want to add a path + # to the list. Use a "+=" after including this file. + # Ex. LIBPATH += /usr/X11R6/lib +@@ -162,7 +164,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" != '-' ] \ diff --git a/comms/qtel/files/patch-misc-Makefile.default b/comms/qtel/files/patch-misc-Makefile.default new file mode 100644 index 000000000000..96ed4e150b7d --- /dev/null +++ b/comms/qtel/files/patch-misc-Makefile.default @@ -0,0 +1,51 @@ +--- ../svxlink-11.05.orig/misc/Makefile.default 2010-04-05 14:05:21.000000000 -0700 ++++ misc/Makefile.default 2012-05-28 10:27:55.000000000 -0700 +@@ -47,7 +47,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -94,7 +94,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -103,7 +103,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -131,8 +131,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -216,8 +216,8 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +-# $(DIRSPEC) /var/spool/myprog[755,root,root] +-# $(FILESPEC) install-extras/myprog.conf[644,root,root] /etc ++# $(DIRSPEC) /var/spool/myprog[755,root,wheel] ++# $(FILESPEC) install-extras/myprog.conf[644,root,wheel] /etc + + + # diff --git a/comms/qtel/files/patch-qtel-Makefile.default b/comms/qtel/files/patch-qtel-Makefile.default new file mode 100644 index 000000000000..e0d1c0223607 --- /dev/null +++ b/comms/qtel/files/patch-qtel-Makefile.default @@ -0,0 +1,90 @@ +--- ../svxlink-11.05.orig/qtel/Makefile.default 2011-05-01 06:05:49.000000000 -0700 ++++ qtel/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -55,7 +55,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -104,7 +104,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -113,7 +113,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -141,7 +141,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -245,29 +245,29 @@ + # Additional files to install + install-extras uninstall-extras rpm-extras: + ifdef QT_BIN +- $(FILESPEC) translations/qtel_sv.qm[644,root,root] \ +- /usr/share/qtel/translations +- $(FILESPEC) translations/qtel_de.qm[644,root,root] \ +- /usr/share/qtel/translations +- $(FILESPEC) translations/qtel_tr.qm[644,root,root] \ +- /usr/share/qtel/translations +- $(FILESPEC) translations/qtel_nl.qm[644,root,root] \ +- /usr/share/qtel/translations +- $(FILESPEC) translations/qtel_uk.qm[644,root,root] \ +- /usr/share/qtel/translations +- $(FILESPEC) translations/qtel_ru.qm[644,root,root] \ +- /usr/share/qtel/translations +- $(FILESPEC) translations/qtel_hu.qm[644,root,root] \ +- /usr/share/qtel/translations +- $(FILESPEC) translations/qtel_es.qm[644,root,root] \ +- /usr/share/qtel/translations +- $(FILESPEC) translations/qtel_ja.qm[644,root,root] \ +- /usr/share/qtel/translations +- $(FILESPEC) connect.raw[644,root,root] /usr/share/qtel/sounds +- $(FILESPEC) qtel.desktop[644,root,root] /usr/share/applications +- $(FILESPEC) images/link.xpm[644,root,root] /usr/share/icons ++ $(FILESPEC) translations/qtel_sv.qm[644,root,wheel] \ ++ %%LOCALBASE%%/share/qtel/translations ++ $(FILESPEC) translations/qtel_de.qm[644,root,wheel] \ ++ %%LOCALBASE%%/share/qtel/translations ++ $(FILESPEC) translations/qtel_tr.qm[644,root,wheel] \ ++ %%LOCALBASE%%/share/qtel/translations ++ $(FILESPEC) translations/qtel_nl.qm[644,root,wheel] \ ++ %%LOCALBASE%%/share/qtel/translations ++ $(FILESPEC) translations/qtel_uk.qm[644,root,wheel] \ ++ %%LOCALBASE%%/share/qtel/translations ++ $(FILESPEC) translations/qtel_ru.qm[644,root,wheel] \ ++ %%LOCALBASE%%/share/qtel/translations ++ $(FILESPEC) translations/qtel_hu.qm[644,root,wheel] \ ++ %%LOCALBASE%%/share/qtel/translations ++ $(FILESPEC) translations/qtel_es.qm[644,root,wheel] \ ++ %%LOCALBASE%%/share/qtel/translations ++ $(FILESPEC) translations/qtel_ja.qm[644,root,wheel] \ ++ %%LOCALBASE%%/share/qtel/translations ++ $(FILESPEC) connect.raw[644,root,wheel] %%LOCALBASE%%/share/qtel/sounds ++ $(FILESPEC) qtel.desktop[644,root,wheel] %%LOCALBASE%%/share/applications ++ $(FILESPEC) images/link.xpm[644,root,wheel] %%LOCALBASE%%/share/icons + endif +-# $(DIRSPEC) /var/spool/myprog[755,root,root] ++# $(DIRSPEC) /var/spool/myprog[755,root,wheel] + + + diff --git a/comms/qtel/files/patch-qtel-Settings.cpp b/comms/qtel/files/patch-qtel-Settings.cpp new file mode 100644 index 000000000000..5efddb6b6afc --- /dev/null +++ b/comms/qtel/files/patch-qtel-Settings.cpp @@ -0,0 +1,14 @@ +--- ../svxlink-11.05.orig/qtel/Settings.cpp 2010-02-21 15:01:06.000000000 -0800 ++++ qtel/Settings.cpp 2012-05-28 10:27:56.000000000 -0700 +@@ -119,9 +119,9 @@ + #define CONF_LIST_REFRESH_TIME_DEFAULT 5 + #define CONF_START_AS_BUSY_DEFAULT false + +-#define CONF_AUDIO_DEVICE_DEFAULT "alsa:default" ++#define CONF_AUDIO_DEVICE_DEFAULT "oss:/dev/dsp" + #define CONF_USE_FULL_DUPLEX_DEFAULT false +-#define CONF_CONNECT_SOUND_DEFAULT "/usr/share/qtel/sounds/connect.raw" ++#define CONF_CONNECT_SOUND_DEFAULT "%%LOCALBASE%%/share/qtel/sounds/connect.raw" + + #define CONF_CHAT_ENCODING_DEFAULT "ISO8859-1" + diff --git a/comms/qtel/files/patch-qtel-SettingsDialog.ui b/comms/qtel/files/patch-qtel-SettingsDialog.ui new file mode 100644 index 000000000000..fff3653dd62c --- /dev/null +++ b/comms/qtel/files/patch-qtel-SettingsDialog.ui @@ -0,0 +1,11 @@ +--- ../svxlink-11.05.orig/qtel/SettingsDialog.ui 2010-02-21 15:01:06.000000000 -0800 ++++ qtel/SettingsDialog.ui 2012-05-28 10:27:56.000000000 -0700 +@@ -344,7 +344,7 @@ + audio_device + + +- The audio device to use (e.g. alsa:default) ++ The audio device to use (e.g. oss:/dev/dsp) + + + diff --git a/comms/qtel/files/patch-qtel-qtel.cpp b/comms/qtel/files/patch-qtel-qtel.cpp new file mode 100644 index 000000000000..511968eaa892 --- /dev/null +++ b/comms/qtel/files/patch-qtel-qtel.cpp @@ -0,0 +1,11 @@ +--- ../svxlink-11.05.orig/qtel/qtel.cpp 2009-07-19 15:51:16.000000000 -0700 ++++ qtel/qtel.cpp 2012-05-28 10:27:56.000000000 -0700 +@@ -141,7 +141,7 @@ + + QTranslator translator(0); + translator.load(QString("qtel_") + QTextCodec::locale(), +- "/usr/share/qtel/translations"); ++ "%%LOCALBASE%%/share/qtel/translations"); + app.installTranslator(&translator); + + Settings *settings = Settings::instance(); diff --git a/comms/qtel/files/patch-qtel-qtel.desktop b/comms/qtel/files/patch-qtel-qtel.desktop new file mode 100644 index 000000000000..d60486ee6d2b --- /dev/null +++ b/comms/qtel/files/patch-qtel-qtel.desktop @@ -0,0 +1,14 @@ +--- qtel/qtel.desktop.orig 2006-12-03 13:49:57.000000000 -0800 ++++ qtel/qtel.desktop 2012-05-28 13:28:36.000000000 -0700 +@@ -2,9 +2,9 @@ + Encoding=UTF-8 + Name=Qtel + GenericName=EchoLink Client +-Exec=/usr/bin/qtel ++Exec=%%LOCALBASE%%/bin/qtel + Terminal=false + Categories=Application;HamRadio;Qt;Network; +-Icon=/usr/share/icons/link.xpm ++Icon=%%LOCALBASE%%/share/icons/link.xpm + Comment=The Qt EchoLink Client + Type=Application diff --git a/comms/qtel/files/patch-qtel-translations-qtel_de.ts b/comms/qtel/files/patch-qtel-translations-qtel_de.ts new file mode 100644 index 000000000000..401cb65d8d58 --- /dev/null +++ b/comms/qtel/files/patch-qtel-translations-qtel_de.ts @@ -0,0 +1,13 @@ +--- ../svxlink-11.05.orig/qtel/translations/qtel_de.ts 2011-04-23 01:43:50.000000000 -0700 ++++ qtel/translations/qtel_de.ts 2012-05-28 10:27:56.000000000 -0700 +@@ -679,8 +679,8 @@ + Passworte stimmen nicht überein + + +- The audio device to use (e.g. alsa:default) +- Das Audiogerät, welches genutzt werden soll (z.B. alsa:default) ++ The audio device to use (e.g. oss:/dev/dsp) ++ Das Audiogerät, welches genutzt werden soll (z.B. oss:/dev/dsp) + + + diff --git a/comms/qtel/files/patch-qtel-translations-qtel_es.ts b/comms/qtel/files/patch-qtel-translations-qtel_es.ts new file mode 100644 index 000000000000..5b4bd365c783 --- /dev/null +++ b/comms/qtel/files/patch-qtel-translations-qtel_es.ts @@ -0,0 +1,13 @@ +--- ../svxlink-11.05.orig/qtel/translations/qtel_es.ts 2011-05-01 07:03:20.000000000 -0700 ++++ qtel/translations/qtel_es.ts 2012-05-28 10:27:56.000000000 -0700 +@@ -580,8 +580,8 @@ + Dúplex completo + + +- The audio device to use (e.g. alsa:default) +- El dispositivo de audio a utilizar (ej. alsa:default) ++ The audio device to use (e.g. oss:/dev/dsp) ++ El dispositivo de audio a utilizar (ej. oss:/dev/dsp) + + + Check this check box to enable full duplex operation diff --git a/comms/qtel/files/patch-qtel-translations-qtel_hu.ts b/comms/qtel/files/patch-qtel-translations-qtel_hu.ts new file mode 100644 index 000000000000..7f770cfada36 --- /dev/null +++ b/comms/qtel/files/patch-qtel-translations-qtel_hu.ts @@ -0,0 +1,11 @@ +--- ../svxlink-11.05.orig/qtel/translations/qtel_hu.ts 2011-04-21 06:45:13.000000000 -0700 ++++ qtel/translations/qtel_hu.ts 2012-05-28 10:27:56.000000000 -0700 +@@ -582,7 +582,7 @@ + Válaszd-ki-a-kapcsolódási-hangot + + +- The audio device to use (e.g. alsa:default) ++ The audio device to use (e.g. oss:/dev/dsp) + + + diff --git a/comms/qtel/files/patch-qtel-translations-qtel_it.ts b/comms/qtel/files/patch-qtel-translations-qtel_it.ts new file mode 100644 index 000000000000..787b984ba3d4 --- /dev/null +++ b/comms/qtel/files/patch-qtel-translations-qtel_it.ts @@ -0,0 +1,13 @@ +--- ../svxlink-11.05.orig/qtel/translations/qtel_it.ts 2011-05-01 06:13:25.000000000 -0700 ++++ qtel/translations/qtel_it.ts 2012-05-28 10:27:56.000000000 -0700 +@@ -678,8 +678,8 @@ + Password divercere + + +- The audio device to use (e.g. alsa:default) +- Il dispositivo audio da utilizzare (p.e. alsa:default) ++ The audio device to use (e.g. oss:/dev/dsp) ++ Il dispositivo audio da utilizzare (p.e. oss:/dev/dsp) + + + diff --git a/comms/qtel/files/patch-qtel-translations-qtel_ja.ts b/comms/qtel/files/patch-qtel-translations-qtel_ja.ts new file mode 100644 index 000000000000..6e1927111f50 --- /dev/null +++ b/comms/qtel/files/patch-qtel-translations-qtel_ja.ts @@ -0,0 +1,13 @@ +--- ../svxlink-11.05.orig/qtel/translations/qtel_ja.ts 2011-05-01 06:05:49.000000000 -0700 ++++ qtel/translations/qtel_ja.ts 2012-05-28 10:27:56.000000000 -0700 +@@ -675,8 +675,8 @@ + パスワードが合っていません + + +- The audio device to use (e.g. alsa:default) +- 使用するオーディオデバイス (e.g. alsa:default, ex. alsa:hw:0, alsa:plughw:0, oss:/dev/dsp) ++ The audio device to use (e.g. oss:/dev/dsp) ++ 使用するオーディオデバイス (e.g. oss:/dev/dsp, ex. alsa:hw:0, alsa:plughw:0, oss:oss:/dev/dsp) + + + diff --git a/comms/qtel/files/patch-qtel-translations-qtel_nl.ts b/comms/qtel/files/patch-qtel-translations-qtel_nl.ts new file mode 100644 index 000000000000..85785ae72ea6 --- /dev/null +++ b/comms/qtel/files/patch-qtel-translations-qtel_nl.ts @@ -0,0 +1,11 @@ +--- ../svxlink-11.05.orig/qtel/translations/qtel_nl.ts 2011-04-21 06:45:13.000000000 -0700 ++++ qtel/translations/qtel_nl.ts 2012-05-28 10:27:56.000000000 -0700 +@@ -674,7 +674,7 @@ + + + +- The audio device to use (e.g. alsa:default) ++ The audio device to use (e.g. oss:/dev/dsp) + + + diff --git a/comms/qtel/files/patch-qtel-translations-qtel_ru.ts b/comms/qtel/files/patch-qtel-translations-qtel_ru.ts new file mode 100644 index 000000000000..a8711e201182 --- /dev/null +++ b/comms/qtel/files/patch-qtel-translations-qtel_ru.ts @@ -0,0 +1,13 @@ +--- ../svxlink-11.05.orig/qtel/translations/qtel_ru.ts 2011-04-23 01:43:50.000000000 -0700 ++++ qtel/translations/qtel_ru.ts 2012-05-28 10:27:56.000000000 -0700 +@@ -679,8 +679,8 @@ + Пароли не совпадают + + +- The audio device to use (e.g. alsa:default) +- Использовать аудио устройство (напр. alsa:default) ++ The audio device to use (e.g. oss:/dev/dsp) ++ Использовать аудио устройство (напр. oss:/dev/dsp) + + + diff --git a/comms/qtel/files/patch-qtel-translations-qtel_sv.ts b/comms/qtel/files/patch-qtel-translations-qtel_sv.ts new file mode 100644 index 000000000000..faee37311410 --- /dev/null +++ b/comms/qtel/files/patch-qtel-translations-qtel_sv.ts @@ -0,0 +1,13 @@ +--- ../svxlink-11.05.orig/qtel/translations/qtel_sv.ts 2011-04-21 06:45:13.000000000 -0700 ++++ qtel/translations/qtel_sv.ts 2012-05-28 10:27:56.000000000 -0700 +@@ -680,8 +680,8 @@ + De två lösenord du angav är ej lika + + +- The audio device to use (e.g. alsa:default) +- Den ljudenhet som skall användas (ex: alsa:default) ++ The audio device to use (e.g. oss:/dev/dsp) ++ Den ljudenhet som skall användas (ex: oss:/dev/dsp) + + + diff --git a/comms/qtel/files/patch-qtel-translations-qtel_tmpl.ts b/comms/qtel/files/patch-qtel-translations-qtel_tmpl.ts new file mode 100644 index 000000000000..1bc61e8f1c32 --- /dev/null +++ b/comms/qtel/files/patch-qtel-translations-qtel_tmpl.ts @@ -0,0 +1,11 @@ +--- ../svxlink-11.05.orig/qtel/translations/qtel_tmpl.ts 2011-04-21 07:32:55.000000000 -0700 ++++ qtel/translations/qtel_tmpl.ts 2012-05-28 10:27:56.000000000 -0700 +@@ -548,7 +548,7 @@ + + + +- The audio device to use (e.g. alsa:default) ++ The audio device to use (e.g. oss:/dev/dsp) + + + diff --git a/comms/qtel/files/patch-qtel-translations-qtel_tr.ts b/comms/qtel/files/patch-qtel-translations-qtel_tr.ts new file mode 100644 index 000000000000..9377a2d8c133 --- /dev/null +++ b/comms/qtel/files/patch-qtel-translations-qtel_tr.ts @@ -0,0 +1,11 @@ +--- ../svxlink-11.05.orig/qtel/translations/qtel_tr.ts 2011-04-21 06:45:13.000000000 -0700 ++++ qtel/translations/qtel_tr.ts 2012-05-28 10:27:56.000000000 -0700 +@@ -673,7 +673,7 @@ + + + +- The audio device to use (e.g. alsa:default) ++ The audio device to use (e.g. oss:/dev/dsp) + + + diff --git a/comms/qtel/files/patch-qtel-translations-qtel_uk.ts b/comms/qtel/files/patch-qtel-translations-qtel_uk.ts new file mode 100644 index 000000000000..2a3b2cda9259 --- /dev/null +++ b/comms/qtel/files/patch-qtel-translations-qtel_uk.ts @@ -0,0 +1,13 @@ +--- ../svxlink-11.05.orig/qtel/translations/qtel_uk.ts 2011-04-23 01:43:50.000000000 -0700 ++++ qtel/translations/qtel_uk.ts 2012-05-28 10:27:56.000000000 -0700 +@@ -678,8 +678,8 @@ + Введено різні паролі + + +- The audio device to use (e.g. alsa:default) +- Задіяти аудіо пристрій (напр. alsa:default) ++ The audio device to use (e.g. oss:/dev/dsp) ++ Задіяти аудіо пристрій (напр. oss:/dev/dsp) + + + diff --git a/comms/qtel/files/patch-svxlink-ChangeLog b/comms/qtel/files/patch-svxlink-ChangeLog new file mode 100644 index 000000000000..33156bb0f5f2 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-ChangeLog @@ -0,0 +1,20 @@ +--- ../svxlink-11.05.orig/svxlink/ChangeLog 2011-05-14 00:34:49.000000000 -0700 ++++ svxlink/ChangeLog 2012-05-28 10:27:56.000000000 -0700 +@@ -172,7 +172,7 @@ + * Configuration variable VOX_LIMIT has been renamed to VOX_THRESH. + + * SvxLink system global configuration files are now by default stored in +- the /etc/svxlink directory. ++ the %%LOCALBASE%%/etc/svxlink directory. + + * New directory layout for event scripts and sound clips. The main event + scripts are now stored in /usr/share/svxlink/events.d. The sound clip +@@ -489,7 +489,7 @@ + * Now also looking for the configuration file at $HOME/.svxlink/svxlink.conf + + * New configuration variable GLOBAL/CFG_DIR. It should point out a directory +- (e.g. /etc/svxlink.d) where additional configuration files can be found. ++ (e.g. %%LOCALBASE%%/etc/svxlink.d) where additional configuration files can be found. + This will make it possible for each module to have its own configuration + file. Good for modularity and it's easier to install third party modules. + diff --git a/comms/qtel/files/patch-svxlink-dtmf_plot-Makefile.default b/comms/qtel/files/patch-svxlink-dtmf_plot-Makefile.default new file mode 100644 index 000000000000..f925cbf5b863 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-dtmf_plot-Makefile.default @@ -0,0 +1,51 @@ +--- ../svxlink-11.05.orig/svxlink/dtmf_plot/Makefile.default 2008-04-12 08:45:44.000000000 -0700 ++++ svxlink/dtmf_plot/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -52,7 +52,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -101,7 +101,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -110,7 +110,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -138,8 +138,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -243,8 +243,8 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +-# $(DIRSPEC) /var/spool/myprog[755,root,root] +-# $(FILESPEC) install-extras/myprog.conf[644,root,root] /etc ++# $(DIRSPEC) /var/spool/myprog[755,root,wheel] ++# $(FILESPEC) install-extras/myprog.conf[644,root,wheel] /etc + + + realclean:: diff --git a/comms/qtel/files/patch-svxlink-dtmf_plot-dtmf_plot.cpp b/comms/qtel/files/patch-svxlink-dtmf_plot-dtmf_plot.cpp new file mode 100644 index 000000000000..4aadf7a8b6ab --- /dev/null +++ b/comms/qtel/files/patch-svxlink-dtmf_plot-dtmf_plot.cpp @@ -0,0 +1,15 @@ +--- ../svxlink-11.05.orig/svxlink/dtmf_plot/dtmf_plot.cpp 2008-08-26 12:35:08.000000000 -0700 ++++ svxlink/dtmf_plot/dtmf_plot.cpp 2012-05-28 10:27:56.000000000 -0700 +@@ -230,10 +230,10 @@ + overtone_plot = new BarPlot(plot_win->overtone_plot, end_ko-start_ko+1); + overtone_plot->setHighlight(dtmf_ko); + +- AudioIO audio_io("/dev/dsp", 0); ++ AudioIO audio_io("oss:/dev/dsp", 0); + if (!audio_io.open(AudioIO::MODE_RD)) + { +- printf("*** ERROR: Could not open audio device /dev/dsp\n"); ++ printf("*** ERROR: Could not open audio device oss:/dev/dsp\n"); + exit(1); + } + diff --git a/comms/qtel/files/patch-svxlink-modules-dtmf_repeater-Makefile.default b/comms/qtel/files/patch-svxlink-modules-dtmf_repeater-Makefile.default new file mode 100644 index 000000000000..fbdfc7973371 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-modules-dtmf_repeater-Makefile.default @@ -0,0 +1,53 @@ +--- ../svxlink-11.05.orig/svxlink/modules/dtmf_repeater/Makefile.default 2010-12-04 06:27:53.000000000 -0800 ++++ svxlink/modules/dtmf_repeater/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -47,7 +47,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -94,7 +94,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -103,7 +103,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -131,8 +131,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -216,9 +216,9 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +-# $(DIRSPEC) /var/spool/myprog[755,root,root] +- $(FILESPEC) DtmfRepeater.tcl[644,root,root] /usr/share/svxlink/events.d +- $(FILESPEC) ModuleDtmfRepeater.conf[644,root,root,config] /etc/svxlink/svxlink.d ++# $(DIRSPEC) /var/spool/myprog[755,root,wheel] ++ $(FILESPEC) DtmfRepeater.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d ++ $(FILESPEC) ModuleDtmfRepeater.conf[644,root,wheel,config] %%LOCALBASE%%/etc/svxlink/svxlink.d + + + diff --git a/comms/qtel/files/patch-svxlink-modules-echolink-Makefile.default b/comms/qtel/files/patch-svxlink-modules-echolink-Makefile.default new file mode 100644 index 000000000000..a9739ebd0a90 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-modules-echolink-Makefile.default @@ -0,0 +1,69 @@ +--- ../svxlink-11.05.orig/svxlink/modules/echolink/Makefile.default 2010-12-04 06:27:53.000000000 -0800 ++++ svxlink/modules/echolink/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -47,7 +47,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -94,7 +94,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -103,7 +103,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -131,8 +131,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -189,11 +189,11 @@ + + # Paths to includefile-directories. All directories must be preceeded + # by the "-I" switch. +-INCPATH += $(SIGC_INCPATH) -I/usr/include/gsm -I/usr/include/tcl8.4 ++INCPATH += $(TCL_INCPATH) $(SIGC_INCPATH) -I/usr/include/gsm -I/usr/include/tcl8.4 + + # Paths to library-directories. All directories must be preceeded + # by the "-L" switch. +-LIBPATH += ++LIBPATH += $(TCL_LIBPATH) + + # Additional warnings to use. If you want to override the default + # warnings, change the "+=" to "=". +@@ -216,10 +216,10 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +-# $(DIRSPEC) /var/spool/myprog[755,root,root] +-# $(FILESPEC) install-extras/myprog.conf[644,root,root] /etc +- $(FILESPEC) EchoLink.tcl[644,root,root] /usr/share/svxlink/events.d +- $(FILESPEC) ModuleEchoLink.conf[644,root,root,config] /etc/svxlink/svxlink.d ++# $(DIRSPEC) /var/spool/myprog[755,root,wheel] ++# $(FILESPEC) install-extras/myprog.conf[644,root,wheel] /etc ++ $(FILESPEC) EchoLink.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d ++ $(FILESPEC) ModuleEchoLink.conf[644,root,wheel,config] %%LOCALBASE%%/etc/svxlink/svxlink.d + + + # diff --git a/comms/qtel/files/patch-svxlink-modules-help-Makefile.default b/comms/qtel/files/patch-svxlink-modules-help-Makefile.default new file mode 100644 index 000000000000..07d8a7366ca6 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-modules-help-Makefile.default @@ -0,0 +1,53 @@ +--- ../svxlink-11.05.orig/svxlink/modules/help/Makefile.default 2010-12-04 06:27:53.000000000 -0800 ++++ svxlink/modules/help/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -47,7 +47,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -94,7 +94,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -103,7 +103,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -131,8 +131,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -216,9 +216,9 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +-# $(DIRSPEC) /var/spool/myprog[755,root,root] +- $(FILESPEC) Help.tcl[644,root,root] /usr/share/svxlink/events.d +- $(FILESPEC) ModuleHelp.conf[644,root,root,config] /etc/svxlink/svxlink.d ++# $(DIRSPEC) /var/spool/myprog[755,root,wheel] ++ $(FILESPEC) Help.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d ++ $(FILESPEC) ModuleHelp.conf[644,root,wheel,config] %%LOCALBASE%%/etc/svxlink/svxlink.d + + + # diff --git a/comms/qtel/files/patch-svxlink-modules-metarinfo-Makefile.default b/comms/qtel/files/patch-svxlink-modules-metarinfo-Makefile.default new file mode 100644 index 000000000000..7280a143b4e6 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-modules-metarinfo-Makefile.default @@ -0,0 +1,53 @@ +--- ../svxlink-11.05.orig/svxlink/modules/metarinfo/Makefile.default 2010-12-04 06:27:53.000000000 -0800 ++++ svxlink/modules/metarinfo/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -47,7 +47,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -94,7 +94,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -103,7 +103,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -131,8 +131,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -216,9 +216,9 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +-# $(DIRSPEC) /var/spool/myprog[755,root,root] +- $(FILESPEC) MetarInfo.tcl[644,root,root] /usr/share/svxlink/events.d +- $(FILESPEC) ModuleMetarInfo.conf[644,root,root,config] /etc/svxlink/svxlink.d ++# $(DIRSPEC) /var/spool/myprog[755,root,wheel] ++ $(FILESPEC) MetarInfo.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d ++ $(FILESPEC) ModuleMetarInfo.conf[644,root,wheel,config] %%LOCALBASE%%/etc/svxlink/svxlink.d + + + diff --git a/comms/qtel/files/patch-svxlink-modules-metarinfo-ModuleMetarInfo.conf.5 b/comms/qtel/files/patch-svxlink-modules-metarinfo-ModuleMetarInfo.conf.5 new file mode 100644 index 000000000000..9284c8a6c2d4 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-modules-metarinfo-ModuleMetarInfo.conf.5 @@ -0,0 +1,18 @@ +--- ../svxlink-11.05.orig/svxlink/modules/metarinfo/ModuleMetarInfo.conf.5 2010-02-13 03:11:36.000000000 -0800 ++++ svxlink/modules/metarinfo/ModuleMetarInfo.conf.5 2012-05-28 10:27:56.000000000 -0700 +@@ -51,13 +51,13 @@ + .SH FILES + . + .TP +-.I /etc/svxlink.conf ++.I %%LOCALBASE%%/etc/svxlink.conf + The system wide configuration file. + .TP + .IR ~/.svxlink/svxlink.conf " or " ~/.svxlinkrc + Per user configuration file. + .TP +-.I /etc/svxlink.d/ModuleMetarInfo.conf ++.I %%LOCALBASE%%/etc/svxlink.d/ModuleMetarInfo.conf + Global modularized configuration file. Depends on the CFG_DIR configuration + variable setting. + .TP diff --git a/comms/qtel/files/patch-svxlink-modules-metarinfo-README b/comms/qtel/files/patch-svxlink-modules-metarinfo-README new file mode 100644 index 000000000000..6adf96387717 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-modules-metarinfo-README @@ -0,0 +1,20 @@ +--- ../svxlink-11.05.orig/svxlink/modules/metarinfo/README 2009-10-24 06:34:04.000000000 -0700 ++++ svxlink/modules/metarinfo/README 2012-05-28 10:27:56.000000000 -0700 +@@ -72,7 +72,7 @@ + INSTALL: + + - recompile and reinstall the latest trunk of SvxLink +-- edit the /etc/svxlink/ModuleMetarInfo.conf as your own needs ++- edit the %%LOCALBASE%%/etc/svxlink/ModuleMetarInfo.conf as your own needs + - create the directory: /usr/share/svxlink/sounds/MetarInfo and copy the raw-files + into it + - to activate the module, you also have to add an entry "ModuleMetarInfo" in +@@ -85,7 +85,7 @@ + + + CONFIGURATION: +-In /etc/svxlink.d/ModuleMetarInfo.conf ++In %%LOCALBASE%%/etc/svxlink.d/ModuleMetarInfo.conf + + ID=5 + ID-Number of your module, you can activate it by sending 5 and # diff --git a/comms/qtel/files/patch-svxlink-modules-parrot-Makefile.default b/comms/qtel/files/patch-svxlink-modules-parrot-Makefile.default new file mode 100644 index 000000000000..2dd5d0a456ef --- /dev/null +++ b/comms/qtel/files/patch-svxlink-modules-parrot-Makefile.default @@ -0,0 +1,55 @@ +--- ../svxlink-11.05.orig/svxlink/modules/parrot/Makefile.default 2010-12-04 06:27:53.000000000 -0800 ++++ svxlink/modules/parrot/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -47,7 +47,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -94,7 +94,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -103,7 +103,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -131,8 +131,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -216,10 +216,10 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +-# $(DIRSPEC) /var/spool/myprog[755,root,root] +-# $(FILESPEC) install-extras/myprog.conf[644,root,root] /etc +- $(FILESPEC) Parrot.tcl[644,root,root] /usr/share/svxlink/events.d +- $(FILESPEC) ModuleParrot.conf[644,root,root,config] /etc/svxlink/svxlink.d ++# $(DIRSPEC) /var/spool/myprog[755,root,wheel] ++# $(FILESPEC) install-extras/myprog.conf[644,root,wheel] /etc ++ $(FILESPEC) Parrot.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d ++ $(FILESPEC) ModuleParrot.conf[644,root,wheel,config] %%LOCALBASE%%/etc/svxlink/svxlink.d + + + # diff --git a/comms/qtel/files/patch-svxlink-modules-propagation_monitor-Makefile.default b/comms/qtel/files/patch-svxlink-modules-propagation_monitor-Makefile.default new file mode 100644 index 000000000000..85223910b857 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-modules-propagation_monitor-Makefile.default @@ -0,0 +1,55 @@ +--- ../svxlink-11.05.orig/svxlink/modules/propagation_monitor/Makefile.default 2010-12-05 09:34:33.000000000 -0800 ++++ svxlink/modules/propagation_monitor/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -47,7 +47,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -94,7 +94,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -103,7 +103,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -131,8 +131,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -217,10 +217,10 @@ + # Additional files to install + install-extras uninstall-extras rpm-extras: + $(DIRSPEC) /var/spool/svxlink/propagation_monitor[755,svxlink,daemon] +- $(FILESPEC) ModulePropagationMonitor.tcl[644,root,root] /usr/share/svxlink/modules.d +- $(FILESPEC) PropagationMonitor.tcl[644,root,root] /usr/share/svxlink/events.d +- $(FILESPEC) ModulePropagationMonitor.conf[644,root,root,config] /etc/svxlink/svxlink.d +- $(FILESPEC) .procmailrc[644,root,root,config] /etc/svxlink ++ $(FILESPEC) ModulePropagationMonitor.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/modules.d ++ $(FILESPEC) PropagationMonitor.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d ++ $(FILESPEC) ModulePropagationMonitor.conf[644,root,wheel,config] %%LOCALBASE%%/etc/svxlink/svxlink.d ++ $(FILESPEC) .procmailrc[644,root,wheel,config] %%LOCALBASE%%/etc/svxlink + + + # diff --git a/comms/qtel/files/patch-svxlink-modules-selcallenc-Makefile.default b/comms/qtel/files/patch-svxlink-modules-selcallenc-Makefile.default new file mode 100644 index 000000000000..1c32b3c50cdf --- /dev/null +++ b/comms/qtel/files/patch-svxlink-modules-selcallenc-Makefile.default @@ -0,0 +1,53 @@ +--- ../svxlink-11.05.orig/svxlink/modules/selcallenc/Makefile.default 2010-12-05 09:34:33.000000000 -0800 ++++ svxlink/modules/selcallenc/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -47,7 +47,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -94,7 +94,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -103,7 +103,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -131,8 +131,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -216,9 +216,9 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +- $(FILESPEC) ModuleSelCallEnc.tcl[644,root,root] /usr/share/svxlink/modules.d +- $(FILESPEC) SelCallEnc.tcl[644,root,root] /usr/share/svxlink/events.d +- $(FILESPEC) ModuleSelCallEnc.conf[644,root,root,config] /etc/svxlink/svxlink.d ++ $(FILESPEC) ModuleSelCallEnc.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/modules.d ++ $(FILESPEC) SelCallEnc.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d ++ $(FILESPEC) ModuleSelCallEnc.conf[644,root,wheel,config] %%LOCALBASE%%/etc/svxlink/svxlink.d + + + # diff --git a/comms/qtel/files/patch-svxlink-modules-tcl-Makefile.default b/comms/qtel/files/patch-svxlink-modules-tcl-Makefile.default new file mode 100644 index 000000000000..2b0bec53a90c --- /dev/null +++ b/comms/qtel/files/patch-svxlink-modules-tcl-Makefile.default @@ -0,0 +1,53 @@ +--- ../svxlink-11.05.orig/svxlink/modules/tcl/Makefile.default 2010-12-05 09:34:33.000000000 -0800 ++++ svxlink/modules/tcl/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -47,7 +47,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -94,7 +94,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -103,7 +103,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -131,8 +131,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -216,9 +216,9 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +-# $(DIRSPEC) /var/spool/myprog[755,root,root] +- $(FILESPEC) ModuleTcl.tcl.example[644,root,root] /usr/share/svxlink/modules.d +- $(FILESPEC) Tcl.tcl.example[644,root,root] /usr/share/svxlink/events.d ++# $(DIRSPEC) /var/spool/myprog[755,root,wheel] ++ $(FILESPEC) ModuleTcl.tcl.example[644,root,wheel] %%LOCALBASE%%/share/svxlink/modules.d ++ $(FILESPEC) Tcl.tcl.example[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d + + + # diff --git a/comms/qtel/files/patch-svxlink-modules-tcl_voice_mail-Makefile.default b/comms/qtel/files/patch-svxlink-modules-tcl_voice_mail-Makefile.default new file mode 100644 index 000000000000..aada513658da --- /dev/null +++ b/comms/qtel/files/patch-svxlink-modules-tcl_voice_mail-Makefile.default @@ -0,0 +1,55 @@ +--- ../svxlink-11.05.orig/svxlink/modules/tcl_voice_mail/Makefile.default 2010-12-05 09:34:33.000000000 -0800 ++++ svxlink/modules/tcl_voice_mail/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -47,7 +47,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -94,7 +94,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -103,7 +103,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -131,8 +131,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -217,10 +217,10 @@ + # Additional files to install + install-extras uninstall-extras rpm-extras: + $(DIRSPEC) /var/spool/svxlink/voice_mail[755,svxlink,daemon] +- $(FILESPEC) ModuleTclVoiceMail.tcl[644,root,root] /usr/share/svxlink/modules.d +- $(FILESPEC) TclVoiceMail.tcl[644,root,root] /usr/share/svxlink/events.d +- $(FILESPEC) TclVoiceMail.conf[644,root,root,config] /etc/svxlink +- $(FILESPEC) ModuleTclVoiceMail.conf[644,root,root,config] /etc/svxlink/svxlink.d ++ $(FILESPEC) ModuleTclVoiceMail.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/modules.d ++ $(FILESPEC) TclVoiceMail.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d ++ $(FILESPEC) TclVoiceMail.conf[644,root,wheel,config] %%LOCALBASE%%/etc/svxlink ++ $(FILESPEC) ModuleTclVoiceMail.conf[644,root,wheel,config] %%LOCALBASE%%/etc/svxlink/svxlink.d + + + # diff --git a/comms/qtel/files/patch-svxlink-modules-tcl_voice_mail-ModuleTclVoiceMail.tcl b/comms/qtel/files/patch-svxlink-modules-tcl_voice_mail-ModuleTclVoiceMail.tcl new file mode 100644 index 000000000000..aac4fbe5a860 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-modules-tcl_voice_mail-ModuleTclVoiceMail.tcl @@ -0,0 +1,11 @@ +--- ../svxlink-11.05.orig/svxlink/modules/tcl_voice_mail/ModuleTclVoiceMail.tcl 2010-12-05 09:34:33.000000000 -0800 ++++ svxlink/modules/tcl_voice_mail/ModuleTclVoiceMail.tcl 2012-05-28 10:27:56.000000000 -0700 +@@ -47,7 +47,7 @@ + # + # Configuration file names + # +-set cfg_etc "/etc/svxlink/TclVoiceMail.conf"; ++set cfg_etc "%%LOCALBASE%%/etc/svxlink/TclVoiceMail.conf"; + set cfg_home "$env(HOME)/.svxlink/TclVoiceMail.conf"; + + diff --git a/comms/qtel/files/patch-svxlink-modules-template-Makefile.default b/comms/qtel/files/patch-svxlink-modules-template-Makefile.default new file mode 100644 index 000000000000..a85965ea0292 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-modules-template-Makefile.default @@ -0,0 +1,53 @@ +--- ../svxlink-11.05.orig/svxlink/modules/template/Makefile.default 2006-12-05 13:17:42.000000000 -0800 ++++ svxlink/modules/template/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -47,7 +47,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -94,7 +94,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -103,7 +103,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -131,8 +131,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -216,9 +216,9 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +-# $(DIRSPEC) /var/spool/myprog[755,root,root] +- $(FILESPEC) Template.tcl[644,root,root] /usr/share/svxlink/sounds/events.d +- $(FILESPEC) ModuleTemplate.conf[644,root,root,config] /etc/svxlink.d ++# $(DIRSPEC) /var/spool/myprog[755,root,wheel] ++ $(FILESPEC) Template.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/sounds/events.d ++ $(FILESPEC) ModuleTemplate.conf[644,root,wheel,config] %%LOCALBASE%%/etc/svxlink.d + + + diff --git a/comms/qtel/files/patch-svxlink-remotetrx-Makefile.default b/comms/qtel/files/patch-svxlink-remotetrx-Makefile.default new file mode 100644 index 000000000000..d68b5c5caddc --- /dev/null +++ b/comms/qtel/files/patch-svxlink-remotetrx-Makefile.default @@ -0,0 +1,51 @@ +--- ../svxlink-11.05.orig/svxlink/remotetrx/Makefile.default 2011-04-21 04:40:56.000000000 -0700 ++++ svxlink/remotetrx/Makefile.default 2012-05-28 10:27:55.000000000 -0700 +@@ -48,7 +48,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -95,7 +95,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -104,7 +104,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -132,8 +132,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -218,8 +218,8 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +-# $(DIRSPEC) /var/spool/myprog[755,root,root] +- $(FILESPEC) remotetrx.conf[644,root,root,config] /etc/svxlink ++# $(DIRSPEC) /var/spool/myprog[755,root,wheel] ++ $(FILESPEC) remotetrx.conf[644,root,wheel,config] %%LOCALBASE%%/etc/svxlink + + + # diff --git a/comms/qtel/files/patch-svxlink-remotetrx-remotetrx.cpp b/comms/qtel/files/patch-svxlink-remotetrx-remotetrx.cpp new file mode 100644 index 000000000000..ab28af56eb86 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-remotetrx-remotetrx.cpp @@ -0,0 +1,20 @@ +--- ../svxlink-11.05.orig/svxlink/remotetrx/remotetrx.cpp 2011-04-21 06:45:13.000000000 -0700 ++++ svxlink/remotetrx/remotetrx.cpp 2012-05-28 10:27:55.000000000 -0700 +@@ -371,7 +371,7 @@ + cfg_filename += "/.svxlink/remotetrx.conf"; + if (!cfg.open(cfg_filename)) + { +- cfg_filename = "/etc/svxlink/remotetrx.conf"; ++ cfg_filename = "%%LOCALBASE%%/etc/svxlink/remotetrx.conf"; + if (!cfg.open(cfg_filename)) + { + cfg_filename = "/etc/remotetrx.conf"; +@@ -379,7 +379,7 @@ + { + cerr << "*** ERROR: Could not open configuration file. Tried:\n" + << "\t" << home_dir << "/.svxlink/remotetrx.conf\n" +- << "\t/etc/svxlink/remotetrx.conf\n" ++ << "\t%%LOCALBASE%%/etc/svxlink/remotetrx.conf\n" + << "\t/etc/remotetrx.conf\n" + << "Possible reasons for failure are: None of the files exist,\n" + << "you do not have permission to read the file or there was a\n" diff --git a/comms/qtel/files/patch-svxlink-scripts-Makefile.default b/comms/qtel/files/patch-svxlink-scripts-Makefile.default new file mode 100644 index 000000000000..1cbc2503ebce --- /dev/null +++ b/comms/qtel/files/patch-svxlink-scripts-Makefile.default @@ -0,0 +1,63 @@ +--- ../svxlink-11.05.orig/svxlink/scripts/Makefile.default 2010-12-04 06:27:53.000000000 -0800 ++++ svxlink/scripts/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -47,7 +47,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -94,7 +94,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -103,7 +103,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -131,8 +131,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -217,14 +217,14 @@ + # 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 ++# $(FILESPEC) etc/logrotate.d/svxlink[644,root,wheel,config] /etc/logrotate.d ++# $(FILESPEC) etc/logrotate.d/remotetrx[644,root,wheel,config] /etc/logrotate.d ++# $(FILESPEC) etc/init.d/svxlink[755,root,wheel] /etc/init.d ++# $(FILESPEC) etc/sysconfig/svxlink[755,root,wheel,config] /etc/sysconfig ++# $(FILESPEC) etc/10-svxlink.rules[644,root,wheel,config] /etc/udev/rules.d ++# $(FILESPEC) etc/90-svxlink.perms[644,root,wheel,config] /etc/security/console.perms.d ++# $(FILESPEC) etc/init.d/remotetrx[755,root,wheel] /etc/init.d ++# $(FILESPEC) etc/sysconfig/remotetrx[755,root,wheel,config] /etc/sysconfig + + + # diff --git a/comms/qtel/files/patch-svxlink-scripts-etc-sysconfig-svxlink b/comms/qtel/files/patch-svxlink-scripts-etc-sysconfig-svxlink new file mode 100644 index 000000000000..180c6864b644 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-scripts-etc-sysconfig-svxlink @@ -0,0 +1,11 @@ +--- ../svxlink-11.05.orig/svxlink/scripts/etc/sysconfig/svxlink 2006-03-19 05:17:35.000000000 -0800 ++++ svxlink/scripts/etc/sysconfig/svxlink 2012-05-28 10:27:56.000000000 -0700 +@@ -11,7 +11,7 @@ + USER=svxlink + + # Specify which configuration file to use +-CFGFILE=/etc/svxlink.conf ++CFGFILE=%%LOCALBASE%%/etc/svxlink.conf + + # Environment variables to set up. Separate variables with a space. + ENV="ASYNC_AUDIO_NOTRIGGER=1" diff --git a/comms/qtel/files/patch-svxlink-siglevdetcal-Makefile.default b/comms/qtel/files/patch-svxlink-siglevdetcal-Makefile.default new file mode 100644 index 000000000000..dcd0f498fee0 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-siglevdetcal-Makefile.default @@ -0,0 +1,51 @@ +--- ../svxlink-11.05.orig/svxlink/siglevdetcal/Makefile.default 2011-04-21 04:40:56.000000000 -0700 ++++ svxlink/siglevdetcal/Makefile.default 2012-05-28 10:27:55.000000000 -0700 +@@ -47,7 +47,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -94,7 +94,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + + # Library to install (just one at the moment). + # You may optionally specify mode, owner and group if you want to. +@@ -103,7 +103,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -131,8 +131,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -216,8 +216,8 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +-# $(DIRSPEC) /var/spool/myprog[755,root,root] +-# $(FILESPEC) install-extras/myprog.conf[644,root,root] /etc ++# $(DIRSPEC) /var/spool/myprog[755,root,wheel] ++# $(FILESPEC) install-extras/myprog.conf[644,root,wheel] /etc + + + # diff --git a/comms/qtel/files/patch-svxlink-svxlink-Makefile.default b/comms/qtel/files/patch-svxlink-svxlink-Makefile.default new file mode 100644 index 000000000000..8d6b2386c405 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-svxlink-Makefile.default @@ -0,0 +1,92 @@ +--- ../svxlink-11.05.orig/svxlink/svxlink/Makefile.default 2011-04-21 04:40:56.000000000 -0700 ++++ svxlink/svxlink/Makefile.default 2012-05-28 10:27:55.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). +@@ -49,7 +49,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -96,7 +96,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-#INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++#INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + INC_INSTALL = + + # Library to install (just one at the moment). +@@ -106,7 +106,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -134,7 +134,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -191,11 +191,11 @@ + + # Paths to includefile-directories. All directories must be preceeded + # by the "-I" switch. +-INCPATH += $(SIGC_INCPATH) -I/usr/include/gsm -I/usr/include/tcl8.4 ++INCPATH += $(TCL_INCPATH) $(SIGC_INCPATH) -I/usr/include/gsm -I/usr/include/tcl8.4 + + # Paths to library-directories. All directories must be preceeded + # by the "-L" switch. +-LIBPATH += ++LIBPATH += $(TCL_LIBPATH) + + # Additional warnings to use. If you want to override the default + # warnings, change the "+=" to "=". +@@ -219,19 +219,19 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +- $(DIRSPEC) /etc/svxlink/svxlink.d[755,root,root] ++ $(DIRSPEC) %%LOCALBASE%%/etc/svxlink/svxlink.d[755,root,wheel] + $(DIRSPEC) /var/spool/svxlink/qso_recorder[755,svxlink,daemon] +- $(FILESPEC) svxlink.conf[644,root,root,config] /etc/svxlink +- $(FILESPEC) events.tcl[644,root,root] /usr/share/svxlink +- $(FILESPEC) RepeaterLogic.tcl[644,root,root] /usr/share/svxlink/events.d +- $(FILESPEC) SimplexLogic.tcl[644,root,root] /usr/share/svxlink/events.d +- $(FILESPEC) Module.tcl[644,root,root] /usr/share/svxlink/events.d +- $(FILESPEC) Logic.tcl[644,root,root] /usr/share/svxlink/events.d +- $(FILESPEC) CW.tcl[644,root,root] /usr/share/svxlink/events.d +- $(FILESPEC) SelCall.tcl[644,root,root] /usr/share/svxlink/events.d +- $(FILESPEC) locale.tcl[644,root,root] /usr/share/svxlink/events.d ++ $(FILESPEC) svxlink.conf[644,root,wheel,config] %%LOCALBASE%%/etc/svxlink ++ $(FILESPEC) events.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink ++ $(FILESPEC) RepeaterLogic.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d ++ $(FILESPEC) SimplexLogic.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d ++ $(FILESPEC) Module.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d ++ $(FILESPEC) Logic.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d ++ $(FILESPEC) CW.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d ++ $(FILESPEC) SelCall.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d ++ $(FILESPEC) locale.tcl[644,root,wheel] %%LOCALBASE%%/share/svxlink/events.d + +-#$(FILESPEC) event_test.tcl[755,root,root] /usr/share/svxlink ++#$(FILESPEC) event_test.tcl[755,root,wheel] %%LOCALBASE%%/share/svxlink + + + # diff --git a/comms/qtel/files/patch-svxlink-svxlink-svxlink.conf b/comms/qtel/files/patch-svxlink-svxlink-svxlink.conf new file mode 100644 index 000000000000..8831b377fab2 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-svxlink-svxlink.conf @@ -0,0 +1,20 @@ +--- ../svxlink-11.05.orig/svxlink/svxlink/svxlink.conf 2011-02-24 15:24:30.000000000 -0800 ++++ svxlink/svxlink/svxlink.conf 2012-05-28 10:27:55.000000000 -0700 +@@ -22,7 +22,7 @@ + LONG_IDENT_INTERVAL=60 + #IDENT_ONLY_AFTER_TX=4 + #EXEC_CMD_ON_SQL_CLOSE=500 +-EVENT_HANDLER=/usr/share/svxlink/events.tcl ++EVENT_HANDLER=%%LOCALBASE%%/share/svxlink/events.tcl + DEFAULT_LANG=en_US + RGR_SOUND_DELAY=0 + REPORT_CTCSS=136.5 +@@ -45,7 +45,7 @@ + LONG_IDENT_INTERVAL=60 + #IDENT_ONLY_AFTER_TX=4 + #EXEC_CMD_ON_SQL_CLOSE=500 +-EVENT_HANDLER=/usr/share/svxlink/events.tcl ++EVENT_HANDLER=%%LOCALBASE%%/share/svxlink/events.tcl + DEFAULT_LANG=en_US + RGR_SOUND_DELAY=0 + REPORT_CTCSS=136.5 diff --git a/comms/qtel/files/patch-svxlink-svxlink-svxlink.cpp b/comms/qtel/files/patch-svxlink-svxlink-svxlink.cpp new file mode 100644 index 000000000000..695dbfc84e29 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-svxlink-svxlink.cpp @@ -0,0 +1,23 @@ +--- ../svxlink-11.05.orig/svxlink/svxlink/svxlink.cpp 2011-04-21 05:46:47.000000000 -0700 ++++ svxlink/svxlink/svxlink.cpp 2012-05-28 10:27:55.000000000 -0700 +@@ -345,16 +345,16 @@ + cfg_filename += "/.svxlink/svxlink.conf"; + if (!cfg.open(cfg_filename)) + { +- cfg_filename = "/etc/svxlink/svxlink.conf"; ++ cfg_filename = "%%LOCALBASE%%/etc/svxlink/svxlink.conf"; + if (!cfg.open(cfg_filename)) + { +- cfg_filename = "/etc/svxlink.conf"; ++ cfg_filename = "%%LOCALBASE%%/etc/svxlink.conf"; + if (!cfg.open(cfg_filename)) + { + cerr << "*** ERROR: Could not open configuration file. Tried:\n" + << "\t" << home_dir << "/.svxlink/svxlink.conf\n" +- << "\t/etc/svxlink/svxlink.conf\n" +- << "\t/etc/svxlink.conf\n" ++ << "\t%%LOCALBASE%%/etc/svxlink/svxlink.conf\n" ++ << "\t%%LOCALBASE%%/etc/svxlink.conf\n" + << "Possible reasons for failure are: None of the files exist,\n" + << "you do not have permission to read the file or there was a\n" + << "syntax error in the file\n"; diff --git a/comms/qtel/files/patch-svxlink-trx-LocalRx.cpp b/comms/qtel/files/patch-svxlink-trx-LocalRx.cpp new file mode 100644 index 000000000000..4347fc74de7e --- /dev/null +++ b/comms/qtel/files/patch-svxlink-trx-LocalRx.cpp @@ -0,0 +1,21 @@ +--- svxlink/trx/LocalRx.cpp.orig 2012-06-24 10:40:14.000000000 -0700 ++++ svxlink/trx/LocalRx.cpp 2012-06-24 10:40:33.000000000 -0700 +@@ -448,15 +448,17 @@ + { + squelch_det = new SquelchSigLev(siglevdet); + } ++#if 0 + else if (sql_det_str == "EVDEV") + { + squelch_det = new SquelchEvDev; + } ++#endif + else + { + cerr << "*** ERROR: Unknown squelch type specified in config variable " + << name() << "/SQL_DET. Legal values are: VOX, CTCSS, SIGLEV, " +- << "EVDEV and SERIAL\n"; ++ << "and SERIAL\n"; + // FIXME: Cleanup + return false; + } diff --git a/comms/qtel/files/patch-svxlink-trx-Makefile.default b/comms/qtel/files/patch-svxlink-trx-Makefile.default new file mode 100644 index 000000000000..423ace1d34d2 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-trx-Makefile.default @@ -0,0 +1,51 @@ +--- ../svxlink-11.05.orig/svxlink/trx/Makefile.default 2011-02-24 15:24:30.000000000 -0800 ++++ svxlink/trx/Makefile.default 2012-05-28 10:27:56.000000000 -0700 +@@ -47,7 +47,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PROGS_INSTALL = $(PROGS:%=%[755,root,root]) $(CPPPROGS:%=%[755,root,root]) ++PROGS_INSTALL = $(PROGS:%=%[755,root,wheel]) $(CPPPROGS:%=%[755,root,wheel]) + + # Daemons (server processes) to install. Same format as PROGS_INSTALL. + DAEMONS_INSTALL = +@@ -100,7 +100,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-#INC_INSTALL = $(EXPINC:%=%[644,root,root]) ++#INC_INSTALL = $(EXPINC:%=%[644,root,wheel]) + INC_INSTALL = + + # Library to install (just one at the moment). +@@ -110,7 +110,7 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-LIB_INSTALL = $(LIBNAME:%=%[-,root,root]) ++LIB_INSTALL = $(LIBNAME:%=%[-,root,wheel]) + + + ############################################################################### +@@ -138,8 +138,8 @@ + # Where: 750 = The mode + # - = Preserve owner + # mygroup = Set group mygroup +-PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,root]) \ +- $(PLUGINS_CPP:%=%.so[755,root,root]) ++PLUGINS_INSTALL = $(PLUGINS:%=%.so[755,root,wheel]) \ ++ $(PLUGINS_CPP:%=%.so[755,root,wheel]) + + + ############################################################################### +@@ -224,8 +224,8 @@ + + # Additional files to install + install-extras uninstall-extras rpm-extras: +-# $(DIRSPEC) /var/spool/myprog[755,root,root] +-# $(FILESPEC) install-extras/myprog.conf[644,root,root] /etc ++# $(DIRSPEC) /var/spool/myprog[755,root,wheel] ++# $(FILESPEC) install-extras/myprog.conf[644,root,wheel] /etc + + # + # EOF -- This file has not been truncated. diff --git a/comms/qtel/files/patch-svxlink-trx-NetTrxMsg.h b/comms/qtel/files/patch-svxlink-trx-NetTrxMsg.h new file mode 100644 index 000000000000..1d7da5ac7b2d --- /dev/null +++ b/comms/qtel/files/patch-svxlink-trx-NetTrxMsg.h @@ -0,0 +1,12 @@ +--- ../svxlink-11.05.orig/svxlink/trx/NetTrxMsg.h 2010-05-09 07:16:30.000000000 -0700 ++++ svxlink/trx/NetTrxMsg.h 2012-05-28 10:27:56.000000000 -0700 +@@ -59,6 +59,9 @@ + * + ****************************************************************************/ + ++// From sys/types.h ++#undef major ++#undef minor + + + /**************************************************************************** diff --git a/comms/qtel/files/patch-svxlink-trx-SigLevDetNoise.cpp b/comms/qtel/files/patch-svxlink-trx-SigLevDetNoise.cpp new file mode 100644 index 000000000000..91828d43e9e6 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-trx-SigLevDetNoise.cpp @@ -0,0 +1,11 @@ +--- ../svxlink-11.05.orig/svxlink/trx/SigLevDetNoise.cpp 2009-07-20 03:58:22.000000000 -0700 ++++ svxlink/trx/SigLevDetNoise.cpp 2012-05-28 10:27:56.000000000 -0700 +@@ -147,7 +147,7 @@ + void SigLevDetNoise::reset(void) + { + filter->reset(); +- last_siglev = pow10f(-offset / slope); ++ last_siglev = powf(10,-offset / slope); + } /* SigLevDetNoise::reset */ + + diff --git a/comms/qtel/files/patch-svxlink-trx-SquelchEvDev.cpp b/comms/qtel/files/patch-svxlink-trx-SquelchEvDev.cpp new file mode 100644 index 000000000000..56ac1fdb08dc --- /dev/null +++ b/comms/qtel/files/patch-svxlink-trx-SquelchEvDev.cpp @@ -0,0 +1,16 @@ +--- svxlink/trx/SquelchEvDev.cpp.orig 2011-02-24 15:24:30.000000000 -0800 ++++ svxlink/trx/SquelchEvDev.cpp 2012-06-24 10:41:44.000000000 -0700 +@@ -24,7 +24,7 @@ + \endverbatim + */ + +- ++#if 0 + + /**************************************************************************** + * +@@ -265,3 +265,4 @@ + * This file has not been truncated + */ + ++#endif diff --git a/comms/qtel/files/patch-svxlink-trx-SwDtmfDecoder.cpp b/comms/qtel/files/patch-svxlink-trx-SwDtmfDecoder.cpp new file mode 100644 index 000000000000..26ac2d8b879f --- /dev/null +++ b/comms/qtel/files/patch-svxlink-trx-SwDtmfDecoder.cpp @@ -0,0 +1,10 @@ +--- ../svxlink-11.05.orig/svxlink/trx/SwDtmfDecoder.cpp 2010-05-16 09:32:17.000000000 -0700 ++++ svxlink/trx/SwDtmfDecoder.cpp 2012-05-28 10:27:56.000000000 -0700 +@@ -37,6 +37,7 @@ + #include + + #include ++#define exp10f(x) exp((x)*log(10)) + + + diff --git a/comms/qtel/files/patch-svxlink-trx-ToneDetector.h b/comms/qtel/files/patch-svxlink-trx-ToneDetector.h new file mode 100644 index 000000000000..54eeba1a48f8 --- /dev/null +++ b/comms/qtel/files/patch-svxlink-trx-ToneDetector.h @@ -0,0 +1,11 @@ +--- ../svxlink-11.05.orig/svxlink/trx/ToneDetector.h 2009-11-23 14:18:45.000000000 -0800 ++++ svxlink/trx/ToneDetector.h 2012-05-28 10:27:56.000000000 -0700 +@@ -37,7 +37,7 @@ + + #include + #include +- ++#define exp10f(x) exp((x)*log(10)) + + /**************************************************************************** + * diff --git a/comms/qtel/files/remotetrx.in b/comms/qtel/files/remotetrx.in new file mode 100644 index 000000000000..e08a430d7d3a --- /dev/null +++ b/comms/qtel/files/remotetrx.in @@ -0,0 +1,65 @@ +#!/bin/sh +# +# remotetrx This shell script takes care of starting and stopping +# remotetrx (The SvxLink remote transceiver daemon). +# + +# PROVIDE: remotetrx +# REQUIRE: NETWORKING DAEMON +# BEFORE: LOGIN +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf to enable remotetrx: +# +# remotetrx_enable="YES" +# # optional +# remotetrx_flags= +# +# description: The SvxLink server is a multi purpose voice services system. \ +# It is targeted at ham radio use. Connect the sound card to a radio \ +# transceiver and load the modules you need. Enjoy... + +# Source function library. +. /etc/rc.subr + +name=remotetrx +rcvar=`set_rcvar` + +#start_remotetrx=start_remotetrx +#stop_remotetrx=stop_remotetrx + +start_cmd=${name}_start +stop_cmd=${name}_stop + +remotetrx_enable=${remotetrx_enable:-"NO"} +remotetrx_flags=${remotetrx_flags:-""} +remotetrx_user=${svxlink_user:-"svxlink"} +remotetrx_group=${svxlink_group:-"svxlink"} +remotetrx_conf=${svxlink_conf:="%%PREFIX%%/etc/svxlink/remotetrx.conf"} +remotetrx_logfile=${remotetrx_logfile:="/var/log/remotetrx"} +remotetrx_pidfile=${remotetrx_pidfile:="/var/run/remotetrx.pid"} + +#[--help] [--daemon] [--logfile=log file] [--config=configura- +# tion file] [--pidfile=pid file] [--runasuser=user name] + + +start_remotetrx() +{ + if ! checkyesno remotetrx_enable; then + return; + fi + + %%PREFIX%%/bin/$name --daemon --config=${remotetrx_conf} \ + --pidfile=${remotetrx_pidfile} --runasuser=${svxlink_user} +} + +stop_remotetrx() +{ + if ! checkyesno remotetrx_enable; then + return; + fi + + /bin/kill $(/bin/cat "${pidfile_remotetrx}") +} + +run_rc_command "$1" diff --git a/comms/qtel/files/svxlink.in b/comms/qtel/files/svxlink.in new file mode 100644 index 000000000000..71b2b1556805 --- /dev/null +++ b/comms/qtel/files/svxlink.in @@ -0,0 +1,61 @@ +#!/bin/sh +# +# svxlink This shell script takes care of starting and stopping +# svxlink (The SvxLink server daemon). +# +# PROVIDE: svnserve +# REQUIRE: DAEMON +# BEFORE: LOGIN +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf to enable SVNServe: +# +# svslink_enable="YES" +# # optional +# svnlink_flags= +# +# description: The SvxLink server is a multi purpose voice services system. \ +# It is targeted at ham radio use. Connect the sound card to a radio \ +# transceiver and load the modules you need. Enjoy... + +# Source function library. +. /etc/rc.subr + +name=svxlink +rcvar=`set_rcvar` + +start_cmd=${name}_start +stop_cmd=${name}_stop + +svxlink_enable=${svxlink_enable:-"NO"} +svxlink_flags=${svxlink_flags:-""} +svxlink_user=${svxlink_user:-"svxlink"} +svxlink_group=${svxlink_group:-"svxlink"} +svxlink_conf=${svxlink_conf:="%%PREFIX%%/etc/svxlink/svxlink.conf"} +svxlink_logfile=${svxlink_logfile:="/var/log/svslink"} +svxlink_pidfile=${svxlink-pidfil:="/var/run/svxlink.pid"} + +#if [ -f %%PREFIX%%/etc/sysconfig/$PROG ];then +# . %%PREFIX%%/etc/sysconfig/$PROG +#fi + +start_remotetrx() +{ + if ! checkyesno svxlink_enable; then + return; + fi + + %%PREFIX%%/bin/$name --daemon --config=${svxlink_conf} \ + --pidfile=${svxlink_pidfile} --runasuser=${svxlink_user} +} + +stop_remotetrx() +{ + if ! checkyesno svxlink_enable; then + return; + fi + + /bin/kill $(/bin/cat "${pidfile_svxlink}") +} + +run_rc_command "$1" diff --git a/comms/qtel/pkg-descr b/comms/qtel/pkg-descr new file mode 100644 index 000000000000..e2df4babdd91 --- /dev/null +++ b/comms/qtel/pkg-descr @@ -0,0 +1,4 @@ +Repeater controller and EchoLink (simplex or repeater) software including +a GUI, Qtel - The Qt EchoLink client, written using the Qt widget toolkit. + +WWW: http://sourceforge.net/apps/trac/svxlink diff --git a/comms/qtel/pkg-plist b/comms/qtel/pkg-plist new file mode 100644 index 000000000000..4b1af3ed6652 --- /dev/null +++ b/comms/qtel/pkg-plist @@ -0,0 +1,134 @@ +bin/qtel +bin/remotetrx +bin/siglevdetcal +bin/svxlink +etc/svxlink/.procmailrc +etc/svxlink/TclVoiceMail.conf +etc/svxlink/remotetrx.conf +etc/svxlink/svxlink.conf +etc/svxlink/svxlink.d/ModuleDtmfRepeater.conf +etc/svxlink/svxlink.d/ModuleEchoLink.conf +etc/svxlink/svxlink.d/ModuleHelp.conf +etc/svxlink/svxlink.d/ModuleMetarInfo.conf +etc/svxlink/svxlink.d/ModuleParrot.conf +etc/svxlink/svxlink.d/ModulePropagationMonitor.conf +etc/svxlink/svxlink.d/ModuleSelCallEnc.conf +etc/svxlink/svxlink.d/ModuleTclVoiceMail.conf +include/svxlink/AsyncApplication.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/AsyncAudioEncoder.h +include/svxlink/AsyncAudioFifo.h +include/svxlink/AsyncAudioFilter.h +include/svxlink/AsyncAudioIO.h +include/svxlink/AsyncAudioInterpolator.h +include/svxlink/AsyncAudioJitterFifo.h +include/svxlink/AsyncAudioMixer.h +include/svxlink/AsyncAudioPacer.h +include/svxlink/AsyncAudioPassthrough.h +include/svxlink/AsyncAudioProcessor.h +include/svxlink/AsyncAudioReader.h +include/svxlink/AsyncAudioRecorder.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/AsyncFdWatch.h +include/svxlink/AsyncIpAddress.h +include/svxlink/AsyncQtApplication.h +include/svxlink/AsyncSerial.h +include/svxlink/AsyncTcpClient.h +include/svxlink/AsyncTcpConnection.h +include/svxlink/AsyncTcpServer.h +include/svxlink/AsyncTimer.h +include/svxlink/AsyncUdpSocket.h +include/svxlink/EchoLinkDirectory.h +include/svxlink/EchoLinkDispatcher.h +include/svxlink/EchoLinkQso.h +include/svxlink/EchoLinkStationData.h +include/svxlink/SigCAudioSink.h +include/svxlink/SigCAudioSource.h +include/svxlink/common.h +lib/libasyncaudio-0.18.0.so +lib/libasyncaudio.a +lib/libasyncaudio.so +lib/libasyncaudio.so.0.18 +lib/libasynccore-0.18.0.so +lib/libasynccore.a +lib/libasynccore.so +lib/libasynccore.so.0.18 +lib/libasynccpp-0.18.0.so +lib/libasynccpp.a +lib/libasynccpp.so +lib/libasynccpp.so.0.18 +lib/libasyncqt-0.18.0.so +lib/libasyncqt.a +lib/libasyncqt.so +lib/libasyncqt.so.0.18 +lib/libecholib-0.14.0.so +lib/libecholib.a +lib/libecholib.so +lib/libecholib.so.0.14 +lib/liblocationinfo.a +lib/libtrx.a +lib/svxlink/ModuleDtmfRepeater.so +lib/svxlink/ModuleEchoLink.so +lib/svxlink/ModuleHelp.so +lib/svxlink/ModuleMetarInfo.so +lib/svxlink/ModuleParrot.so +lib/svxlink/ModuleTcl.so +share/applications/qtel.desktop +share/icons/link.xpm +share/qtel/sounds/connect.raw +share/qtel/translations/qtel_de.qm +share/qtel/translations/qtel_es.qm +share/qtel/translations/qtel_hu.qm +share/qtel/translations/qtel_ja.qm +share/qtel/translations/qtel_nl.qm +share/qtel/translations/qtel_ru.qm +share/qtel/translations/qtel_sv.qm +share/qtel/translations/qtel_tr.qm +share/qtel/translations/qtel_uk.qm +share/svxlink/events.d/CW.tcl +share/svxlink/events.d/DtmfRepeater.tcl +share/svxlink/events.d/EchoLink.tcl +share/svxlink/events.d/Help.tcl +share/svxlink/events.d/Logic.tcl +share/svxlink/events.d/MetarInfo.tcl +share/svxlink/events.d/Module.tcl +share/svxlink/events.d/Parrot.tcl +share/svxlink/events.d/PropagationMonitor.tcl +share/svxlink/events.d/RepeaterLogic.tcl +share/svxlink/events.d/SelCall.tcl +share/svxlink/events.d/SelCallEnc.tcl +share/svxlink/events.d/SimplexLogic.tcl +share/svxlink/events.d/Tcl.tcl.example +share/svxlink/events.d/TclVoiceMail.tcl +share/svxlink/events.d/locale.tcl +share/svxlink/events.tcl +share/svxlink/modules.d/ModulePropagationMonitor.tcl +share/svxlink/modules.d/ModuleSelCallEnc.tcl +share/svxlink/modules.d/ModuleTcl.tcl.example +share/svxlink/modules.d/ModuleTclVoiceMail.tcl +@dirrm etc/svxlink/svxlink.d +@dirrm etc/svxlink +@dirrm include/svxlink +@dirrm lib/svxlink +@dirrmtry share/applications +@dirrmtry share/icons +@dirrm share/qtel/sounds +@dirrm share/qtel/translations +@dirrm share/qtel +@dirrm share/svxlink/events.d +@dirrm share/svxlink/modules.d +@dirrm share/svxlink