Date: Sat, 20 Feb 2016 17:21:30 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409261 - in head/comms/soundmodem: . files Message-ID: <201602201721.u1KHLU9D092975@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Sat Feb 20 17:21:29 2016 New Revision: 409261 URL: https://svnweb.freebsd.org/changeset/ports/409261 Log: Update to 0.20 Clean up submitted patch to work with system clang compiler Change to new upstream repository PR: ports/206705 Submitted by: takefu@airport.fm Added: head/comms/soundmodem/files/patch-p3dmodem_testcrc.c (contents, props changed) head/comms/soundmodem/files/patch-pammodem_pammodem.c (contents, props changed) head/comms/soundmodem/files/soundmodem.in (contents, props changed) Deleted: head/comms/soundmodem/files/patch-configapp_src_main.c head/comms/soundmodem/files/patch-configapp_src_soundmodemconfig.8 head/comms/soundmodem/files/patch-newqpsk_complex.h head/comms/soundmodem/files/patch-newqpsk_fec.h head/comms/soundmodem/files/patch-newqpsk_filter.h head/comms/soundmodem/files/patch-newqpsk_misc.h head/comms/soundmodem/files/patch-pskmodem_pskmodem.c head/comms/soundmodem/files/patch-soundcard_main.c head/comms/soundmodem/files/patch-soundcard_modem.h head/comms/soundmodem/files/patch-soundcard_simd.h head/comms/soundmodem/files/patch-soundcard_soundmodem.8 head/comms/soundmodem/files/soundmodem Modified: head/comms/soundmodem/Makefile head/comms/soundmodem/distinfo (contents, props changed) head/comms/soundmodem/files/patch-configapp_src_Makefile.in (contents, props changed) head/comms/soundmodem/files/patch-configure (contents, props changed) head/comms/soundmodem/files/patch-fsk_gendf9icfilt.cc (contents, props changed) head/comms/soundmodem/files/patch-matlib_mat.hh (contents, props changed) head/comms/soundmodem/files/patch-newqpsk_filter-i386.h (contents, props changed) head/comms/soundmodem/files/patch-newqpsk_genfilt.c (contents, props changed) head/comms/soundmodem/files/patch-p3dmodem_genp3dtbl.c (contents, props changed) head/comms/soundmodem/files/patch-pammodem_genpamtbl.c (contents, props changed) head/comms/soundmodem/files/patch-pskmodem_genpsktbl.c (contents, props changed) head/comms/soundmodem/files/patch-soundcard_ptt.c (contents, props changed) head/comms/soundmodem/files/patch-soundcard_winlog.c (contents, props changed) head/comms/soundmodem/pkg-descr (contents, props changed) head/comms/soundmodem/pkg-plist (contents, props changed) Modified: head/comms/soundmodem/Makefile ============================================================================== --- head/comms/soundmodem/Makefile Sat Feb 20 17:00:11 2016 (r409260) +++ head/comms/soundmodem/Makefile Sat Feb 20 17:21:29 2016 (r409261) @@ -1,17 +1,15 @@ # $FreeBSD$ PORTNAME= soundmodem -PORTVERSION= 0.18 +PORTVERSION= 0.20 CATEGORIES= comms hamradio -MASTER_SITES= http://www.baycom.org/~tom/ham/soundmodem/ \ - http://soundmodem.vk4msl.yi.org/ \ - http://pv529.ncsrv.de/soundmodem/ \ - LOCAL/shurd +MASTER_SITES= http://download.gna.org/soundmodem/ MAINTAINER= hamradio@FreeBSD.org COMMENT= Amateur Radio sound modem -LICENSE= GPLv1 +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libaudiofile.so:${PORTSDIR}/audio/libaudiofile @@ -20,18 +18,15 @@ WRKSRC= ${WRKDIR}/${DISTNAME} USES= gmake pkgconfig gettext HAS_CONFIGURE= yes USE_GNOME= gtk20 libxml2 - -pre-patch: - @${CP} ${FILESDIR}/soundmodem ${WRKSRC} +USE_RC_SUBR= soundmodem +USE_SUBMAKE= yes post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/soundcard/soundmodem.8 \ - ${WRKSRC}/soundcard/main.c \ - ${WRKSRC}/configapp/src/soundmodemconfig.8 \ - ${WRKSRC}/configapp/src/main.c \ - ${WRKSRC}/soundmodem -post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/soundmodem ${STAGEDIR}${PREFIX}/etc/rc.d + ${REINPLACE_CMD} -e 's|/etc/ax25|${LOCALBASE}/etc|g' \ + ${WRKSRC}/configapp/src/main.c\ + ${WRKSRC}/configapp/src/soundmodemconfig.8\ + ${WRKSRC}/soundcard/soundmodem.8\ + ${WRKSRC}/soundcard/main.c\ + ${WRKSRC}/soundmodem.spec .include <bsd.port.mk> Modified: head/comms/soundmodem/distinfo ============================================================================== --- head/comms/soundmodem/distinfo Sat Feb 20 17:00:11 2016 (r409260) +++ head/comms/soundmodem/distinfo Sat Feb 20 17:21:29 2016 (r409261) @@ -1,2 +1,2 @@ -SHA256 (soundmodem-0.18.tar.gz) = f033c1716df1378cda646dbb1c48ea9fb9a068772c6686f2ca411bfa64245c1c -SIZE (soundmodem-0.18.tar.gz) = 485475 +SHA256 (soundmodem-0.20.tar.gz) = 3f880349cbe4c8e27f02d276b2d3318e6b721cad6c0ab2ba8e2c1768251fd494 +SIZE (soundmodem-0.20.tar.gz) = 507650 Modified: head/comms/soundmodem/files/patch-configapp_src_Makefile.in ============================================================================== --- head/comms/soundmodem/files/patch-configapp_src_Makefile.in Sat Feb 20 17:00:11 2016 (r409260) +++ head/comms/soundmodem/files/patch-configapp_src_Makefile.in Sat Feb 20 17:21:29 2016 (r409261) @@ -1,15 +1,15 @@ ---- configapp/src/Makefile.in.orig 2012-11-07 05:55:36.000000000 -0500 -+++ configapp/src/Makefile.in 2013-12-14 12:09:14.352210905 -0500 -@@ -87,7 +87,7 @@ - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(INTLLIBS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - SOURCES = $(soundmodemconfig_SOURCES) - DIST_SOURCES = $(soundmodemconfig_SOURCES) - am__can_run_installinfo = \ -@@ -300,7 +300,7 @@ +--- configapp/src/Makefile.in.orig 2015-05-04 17:59:05 UTC ++++ configapp/src/Makefile.in +@@ -106,7 +106,7 @@ soundmodemconfig_DEPENDENCIES = ../../so + ../../soundcard/libaudioio.a ../../soundcard/libpttio.a \ + $(MODEMLIBS) ../../matlib/libmat.a ../../libmisc/libmisc.a \ + ../../soundcard/libcommon.a $(am__DEPENDENCIES_1) +-soundmodemconfig_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++soundmodemconfig_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(INTLLIBS)\ + $(soundmodemconfig_LDFLAGS) $(LDFLAGS) -o $@ + AM_V_P = $(am__v_P_@AM_V@) + am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +@@ -366,7 +366,7 @@ soundmodemconfig_SOURCES = \ soundmodemconfig_LDADD = ../../soundcard/liblog.a ../../soundcard/libaudioio.a ../../soundcard/libpttio.a \ $(MODEMLIBS) ../../matlib/libmat.a ../../libmisc/libmisc.a ../../soundcard/libcommon.a \ Modified: head/comms/soundmodem/files/patch-configure ============================================================================== --- head/comms/soundmodem/files/patch-configure Sat Feb 20 17:00:11 2016 (r409260) +++ head/comms/soundmodem/files/patch-configure Sat Feb 20 17:21:29 2016 (r409261) @@ -1,6 +1,6 @@ ---- configure.orig 2012-11-07 05:55:37.000000000 -0500 -+++ configure 2012-11-07 07:02:34.000000000 -0500 -@@ -844,7 +844,7 @@ +--- configure.orig 2015-05-04 17:59:03 UTC ++++ configure +@@ -869,7 +869,7 @@ pdfdir='${docdir}' psdir='${docdir}' libdir='${exec_prefix}/lib' localedir='${datarootdir}/locale' @@ -9,7 +9,7 @@ ac_prev= ac_dashdash= -@@ -7265,7 +7265,7 @@ +@@ -7565,7 +7565,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ int main () { Modified: head/comms/soundmodem/files/patch-fsk_gendf9icfilt.cc ============================================================================== --- head/comms/soundmodem/files/patch-fsk_gendf9icfilt.cc Sat Feb 20 17:00:11 2016 (r409260) +++ head/comms/soundmodem/files/patch-fsk_gendf9icfilt.cc Sat Feb 20 17:21:29 2016 (r409261) @@ -1,6 +1,6 @@ ---- fsk/gendf9icfilt.cc.orig 2013-12-13 08:19:49.459920041 -0500 -+++ fsk/gendf9icfilt.cc 2013-12-13 08:43:50.641820677 -0500 -@@ -41,6 +41,8 @@ +--- fsk/gendf9icfilt.cc.orig 2003-01-06 14:28:19 UTC ++++ fsk/gendf9icfilt.cc +@@ -41,6 +41,8 @@ using namespace std; #include "getopt.h" @@ -9,7 +9,7 @@ /* --------------------------------------------------------------------- */ template<typename T> complex<T> rxfilter(T freq) -@@ -173,7 +175,8 @@ +@@ -173,7 +175,8 @@ static void printfcoeff(ostream& os, uns printtransferfunc(os, fftsz, over); else os << "/* this file is automatically generated, do not edit!! */\n\n"; Modified: head/comms/soundmodem/files/patch-matlib_mat.hh ============================================================================== --- head/comms/soundmodem/files/patch-matlib_mat.hh Sat Feb 20 17:00:11 2016 (r409260) +++ head/comms/soundmodem/files/patch-matlib_mat.hh Sat Feb 20 17:21:29 2016 (r409261) @@ -1,6 +1,6 @@ ---- matlib/mat.hh.orig 2013-12-13 08:25:15.148898287 -0500 -+++ matlib/mat.hh 2013-12-13 08:45:23.061999828 -0500 -@@ -91,36 +91,6 @@ +--- matlib/mat.hh.orig 2003-01-05 19:19:33 UTC ++++ matlib/mat.hh +@@ -91,36 +91,6 @@ template<typename T> void mmul(T *c, con memcpy(c, r, d1 * d3 * sizeof(c[0])); } @@ -37,7 +37,7 @@ /* Transpose a matrix (a el C^{d1 x d2}, b el C^{d2 x d1}) */ template<typename T> void mtranspose(T *b, const T *a, unsigned int d1, unsigned int d2) { -@@ -440,23 +410,6 @@ +@@ -440,23 +410,6 @@ template<typename T> void mlusolve(T *x, } } Modified: head/comms/soundmodem/files/patch-newqpsk_filter-i386.h ============================================================================== --- head/comms/soundmodem/files/patch-newqpsk_filter-i386.h Sat Feb 20 17:00:11 2016 (r409260) +++ head/comms/soundmodem/files/patch-newqpsk_filter-i386.h Sat Feb 20 17:21:29 2016 (r409261) @@ -1,5 +1,5 @@ ---- newqpsk/filter-i386.h.orig 2012-11-07 05:41:08.000000000 -0500 -+++ newqpsk/filter-i386.h 2013-12-14 17:39:18.000000000 -0500 +--- newqpsk/filter-i386.h.orig 2015-05-04 17:52:25 UTC ++++ newqpsk/filter-i386.h @@ -1,7 +1,7 @@ #ifndef _FILTER_I386_H #define _FILTER_I386_H Modified: head/comms/soundmodem/files/patch-newqpsk_genfilt.c ============================================================================== --- head/comms/soundmodem/files/patch-newqpsk_genfilt.c Sat Feb 20 17:00:11 2016 (r409260) +++ head/comms/soundmodem/files/patch-newqpsk_genfilt.c Sat Feb 20 17:21:29 2016 (r409261) @@ -1,6 +1,6 @@ ---- newqpsk/genfilt.c.orig 2014-12-01 09:43:37.000000000 +0000 -+++ newqpsk/genfilt.c 2014-12-01 09:43:45.000000000 +0000 -@@ -18,7 +18,7 @@ +--- newqpsk/genfilt.c.orig 2002-08-09 20:01:52 UTC ++++ newqpsk/genfilt.c +@@ -18,7 +18,7 @@ int main(int argc, char **argv) puts("#define _FILTER_I386_H"); puts("#define __HAVE_ARCH_MAC"); Modified: head/comms/soundmodem/files/patch-p3dmodem_genp3dtbl.c ============================================================================== --- head/comms/soundmodem/files/patch-p3dmodem_genp3dtbl.c Sat Feb 20 17:00:11 2016 (r409260) +++ head/comms/soundmodem/files/patch-p3dmodem_genp3dtbl.c Sat Feb 20 17:21:29 2016 (r409261) @@ -1,5 +1,5 @@ ---- p3dmodem/genp3dtbl.c.orig 2002-08-09 15:01:52.000000000 -0500 -+++ p3dmodem/genp3dtbl.c 2013-12-14 17:48:45.000000000 -0500 +--- p3dmodem/genp3dtbl.c.orig 2002-08-09 20:01:52 UTC ++++ p3dmodem/genp3dtbl.c @@ -39,6 +39,8 @@ #include <float.h> #include <stdio.h> Added: head/comms/soundmodem/files/patch-p3dmodem_testcrc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-p3dmodem_testcrc.c Sat Feb 20 17:21:29 2016 (r409261) @@ -0,0 +1,11 @@ +--- p3dmodem/testcrc.c.orig 2002-08-09 20:01:52 UTC ++++ p3dmodem/testcrc.c +@@ -40,6 +40,8 @@ + + #define BLOCKSZ 512 + ++unsigned int log_verblevel; ++ + static int testone(void) + { + unsigned char data[BLOCKSZ]; Modified: head/comms/soundmodem/files/patch-pammodem_genpamtbl.c ============================================================================== --- head/comms/soundmodem/files/patch-pammodem_genpamtbl.c Sat Feb 20 17:00:11 2016 (r409260) +++ head/comms/soundmodem/files/patch-pammodem_genpamtbl.c Sat Feb 20 17:21:29 2016 (r409261) @@ -1,5 +1,5 @@ ---- pammodem/genpamtbl.c.orig 2002-08-09 15:01:52.000000000 -0500 -+++ pammodem/genpamtbl.c 2013-12-14 17:52:08.000000000 -0500 +--- pammodem/genpamtbl.c.orig 2002-08-09 20:01:52 UTC ++++ pammodem/genpamtbl.c @@ -38,6 +38,8 @@ #include <math.h> #include <stdio.h> Added: head/comms/soundmodem/files/patch-pammodem_pammodem.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-pammodem_pammodem.c Sat Feb 20 17:21:29 2016 (r409261) @@ -0,0 +1,20 @@ +--- pammodem/pammodem.c.orig 2015-05-04 17:58:30 UTC ++++ pammodem/pammodem.c +@@ -160,7 +160,7 @@ struct rxstate { + unsigned int rxptr; + }; + +-extern inline int rxgsfir(const int16_t *buf, const int *coeff) ++inline int rxgsfir(const int16_t *buf, const int *coeff) + { + unsigned int i; + int s; +@@ -207,7 +207,7 @@ static void rxrewindsamples(struct rxsta + rx->rxphase -= ph; + } + +-only_inline int calcsync(int *toten, int *corren, int16_t *samples) ++inline int calcsync(int *toten, int *corren, int16_t *samples) + { + const int *tr = trainsyms; + unsigned int i; Modified: head/comms/soundmodem/files/patch-pskmodem_genpsktbl.c ============================================================================== --- head/comms/soundmodem/files/patch-pskmodem_genpsktbl.c Sat Feb 20 17:00:11 2016 (r409260) +++ head/comms/soundmodem/files/patch-pskmodem_genpsktbl.c Sat Feb 20 17:21:29 2016 (r409261) @@ -1,5 +1,5 @@ ---- pskmodem/genpsktbl.c.orig 2013-12-14 14:02:09.000000000 -0500 -+++ pskmodem/genpsktbl.c 2013-12-14 14:02:34.000000000 -0500 +--- pskmodem/genpsktbl.c.orig 2002-08-09 20:01:52 UTC ++++ pskmodem/genpsktbl.c @@ -40,6 +40,8 @@ #include <stdio.h> #include <string.h> Modified: head/comms/soundmodem/files/patch-soundcard_ptt.c ============================================================================== --- head/comms/soundmodem/files/patch-soundcard_ptt.c Sat Feb 20 17:00:11 2016 (r409260) +++ head/comms/soundmodem/files/patch-soundcard_ptt.c Sat Feb 20 17:21:29 2016 (r409261) @@ -1,8 +1,8 @@ ---- soundcard/ptt.c.orig 2012-11-07 11:05:55.000000000 -0500 -+++ soundcard/ptt.c 2012-11-07 11:06:15.000000000 -0500 -@@ -176,7 +176,7 @@ - #endif - +--- soundcard/ptt.c.orig 2014-09-01 16:22:57 UTC ++++ soundcard/ptt.c +@@ -250,7 +250,7 @@ int pttinit(struct pttio *state, const c + return 0; + } logprintf(MLOG_INFO, "Opening PTT device \"%s\"\n", path); - if ((fd = open(path, O_RDWR, 0)) < 0) { + if ((fd = open(path, O_RDWR|O_NONBLOCK, 0)) < 0) { Modified: head/comms/soundmodem/files/patch-soundcard_winlog.c ============================================================================== --- head/comms/soundmodem/files/patch-soundcard_winlog.c Sat Feb 20 17:00:11 2016 (r409260) +++ head/comms/soundmodem/files/patch-soundcard_winlog.c Sat Feb 20 17:21:29 2016 (r409261) @@ -1,5 +1,5 @@ ---- soundcard/winlog.c.orig 2013-12-13 08:55:02.797125391 -0500 -+++ soundcard/winlog.c 2013-12-13 08:55:35.636772475 -0500 +--- soundcard/winlog.c.orig 2002-12-31 11:30:52 UTC ++++ soundcard/winlog.c @@ -44,7 +44,7 @@ /* ---------------------------------------------------------------------- */ Added: head/comms/soundmodem/files/soundmodem.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/soundmodem.in Sat Feb 20 17:21:29 2016 (r409261) @@ -0,0 +1,39 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: soundmodem +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Add these lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# soundmodem_enable (bool): Set to NO by default. +# Set it to YES to enable soundmodem. +# soundmodem_config (path): Set to %%PREFIX%%/etc/soundmodem.conf +# by default. + +. /etc/rc.subr + +name=soundmodem +rcvar=soundmodem_enable +load_rc_config $name + +: ${soundmodem_enable:="NO"} +: ${soundmodem_config:="%%PREFIX%%/etc/soundmodem.conf"} + +command=%%PREFIX%%/sbin/${name} +command_args="$soundmodem_config --daemonize" +stop_cmd=soundmodem_stop + +required_files=%%PREFIX%%/etc/soundmodem.conf + +soundmodem_stop() +{ + echo "Stopping soundmodem." + killall soundmodem + return 0 +} + +run_rc_command "$1" Modified: head/comms/soundmodem/pkg-descr ============================================================================== --- head/comms/soundmodem/pkg-descr Sat Feb 20 17:00:11 2016 (r409260) +++ head/comms/soundmodem/pkg-descr Sat Feb 20 17:21:29 2016 (r409261) @@ -1,3 +1,3 @@ soundmodem Tom's userland modem on FreeBSD -WWW: http://www.baycom.org/~tom/ham/soundmodem/ +WWW: http://gna.org/projects/soundmodem Modified: head/comms/soundmodem/pkg-plist ============================================================================== --- head/comms/soundmodem/pkg-plist Sat Feb 20 17:00:11 2016 (r409260) +++ head/comms/soundmodem/pkg-plist Sat Feb 20 17:21:29 2016 (r409261) @@ -1,6 +1,5 @@ bin/soundmodemconfig sbin/soundmodem -etc/rc.d/soundmodem include/modem.h include/simd.h share/locale/fr/LC_MESSAGES/soundmodem.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602201721.u1KHLU9D092975>