Attachment 166227 Details for Bug 206705 – soundmodem-0.20.patch

[patch] soundmodem-0.20.patch

soundmodem.patch (text/plain), 25.29 KB, created by takefu on 2016-01-28 08:16:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2016-01-28 08:16:37 UTC

Size: 25.29 KB

patch

obsolete

>diff -dpruN /usr/ports/comms/soundmodem/Makefile ./Makefile
>--- /usr/ports/comms/soundmodem/Makefile	2015-05-14 10:15:04.000000000 +0000
>+++ ./Makefile	2016-01-25 22:57:06.000000000 +0000
>@@ -1,17 +1,15 @@
> # $FreeBSD: head/comms/soundmodem/Makefile 386312 2015-05-14 10:15:04Z mat $
> 
> 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|${PREFIX}/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>
>diff -dpruN /usr/ports/comms/soundmodem/distinfo ./distinfo
>--- /usr/ports/comms/soundmodem/distinfo	2014-12-12 14:30:06.000000000 +0000
>+++ ./distinfo	2016-01-21 08:27:57.000000000 +0000
>@@ -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
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-configapp_src_Makefile.in ./files/patch-configapp_src_Makefile.in
>--- /usr/ports/comms/soundmodem/files/patch-configapp_src_Makefile.in	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-configapp_src_Makefile.in	2016-01-21 08:52:00.000000000 +0000
>@@ -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 \
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-configapp_src_main.c ./files/patch-configapp_src_main.c
>--- /usr/ports/comms/soundmodem/files/patch-configapp_src_main.c	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-configapp_src_main.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- configapp/src/main.c.orig	2010-10-30 11:49:09.000000000 -0500
>-+++ configapp/src/main.c	2012-11-05 17:20:25.000000000 -0500
>-@@ -359,7 +359,7 @@
>- #else /* WIN32 */
>- 
>- static xmlDocPtr doc = NULL;
>--static const char *cfgfile = "/etc/ax25/soundmodem.conf";
>-+static const char *cfgfile = "%%PREFIX%%/etc/soundmodem.conf";
>- 
>- static xmlNodePtr findconfig(const char *newname)
>- {
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-configapp_src_soundmodemconfig.8 ./files/patch-configapp_src_soundmodemconfig.8
>--- /usr/ports/comms/soundmodem/files/patch-configapp_src_soundmodemconfig.8	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-configapp_src_soundmodemconfig.8	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- configapp/src/soundmodemconfig.8.orig	Fri Aug  9 16:01:51 2002
>-+++ configapp/src/soundmodemconfig.8	Sun Nov  5 21:59:09 2006
>-@@ -15,7 +15,7 @@
>- .SH DESCRIPTION
>- .B soundmodemconfig
>- is a GUI tool for creating a configuration file for soundmodem (8).
>--The default file name is /etc/ax25/soundmodem.conf, though
>-+The default file name is %%PREFIX%%/etc/soundmodem.conf, though
>- any other file name may be specified on the command line.
>- 
>- 
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-configure ./files/patch-configure
>--- /usr/ports/comms/soundmodem/files/patch-configure	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-configure	2016-01-21 07:55:37.000000000 +0000
>@@ -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	2012-12-15 00:35:42 UTC
>++++ configure
>+@@ -843,7 +843,7 @@ pdfdir='${docdir}'
>  psdir='${docdir}'
>  libdir='${exec_prefix}/lib'
>  localedir='${datarootdir}/locale'
>@@ -9,7 +9,7 @@
>  
>  ac_prev=
>  ac_dashdash=
>-@@ -7265,7 +7265,7 @@
>+@@ -7264,7 +7264,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
>  int
>  main ()
>  {
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-fsk_gendf9icfilt.cc ./files/patch-fsk_gendf9icfilt.cc
>--- /usr/ports/comms/soundmodem/files/patch-fsk_gendf9icfilt.cc	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-fsk_gendf9icfilt.cc	2016-01-21 07:55:37.000000000 +0000
>@@ -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 22:47:26 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";
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-matlib_mat.hh ./files/patch-matlib_mat.hh
>--- /usr/ports/comms/soundmodem/files/patch-matlib_mat.hh	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-matlib_mat.hh	2016-01-21 07:55:37.000000000 +0000
>@@ -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-06 22:47:26 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,
>  	}
>  }
>  
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-newqpsk_complex.h ./files/patch-newqpsk_complex.h
>--- /usr/ports/comms/soundmodem/files/patch-newqpsk_complex.h	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-newqpsk_complex.h	1970-01-01 00:00:00.000000000 +0000
>@@ -1,65 +0,0 @@
>---- newqpsk/complex.h.orig	2008-12-14 09:47:34.000000000 -0500
>-+++ newqpsk/complex.h	2013-12-14 17:54:58.000000000 -0500
>-@@ -13,7 +13,7 @@
>- /*
>-  * Complex multiplication.
>-  */
>--extern __inline__ complex cmul(complex x, complex y)
>-+static __inline__ complex cmul(complex x, complex y)
>- {
>- 	complex z;
>- 
>-@@ -27,7 +27,7 @@
>-  * Complex ... yeah, what??? Returns a complex number that has the
>-  * properties: |z| = |x| * |y|  and  arg(z) = arg(y) - arg(x)
>-  */
>--extern __inline__ complex ccor(complex x, complex y)
>-+static __inline__ complex ccor(complex x, complex y)
>- {
>- 	complex z;
>- 
>-@@ -40,7 +40,7 @@
>- /*
>-  * Real part of the complex ???
>-  */
>--extern __inline__ float ccorI(complex x, complex y)
>-+static __inline__ float ccorI(complex x, complex y)
>- {
>- 	return x.re * y.re + x.im * y.im;
>- }
>-@@ -48,7 +48,7 @@
>- /*
>-  * Imaginary part of the complex ???
>-  */
>--extern __inline__ float ccorQ(complex x, complex y)
>-+static __inline__ float ccorQ(complex x, complex y)
>- {
>- 	return x.re * y.im - x.im * y.re;
>- }
>-@@ -56,7 +56,7 @@
>- /*
>-  * Modulo (absolute value) of a complex number.
>-  */
>--extern __inline__ float cmod(complex x)
>-+static __inline__ float cmod(complex x)
>- {
>- 	return sqrt(x.re * x.re + x.im * x.im);
>- }
>-@@ -64,7 +64,7 @@
>- /*
>-  * Square of the absolute value (power).
>-  */
>--extern __inline__ float cpwr(complex x)
>-+static __inline__ float cpwr(complex x)
>- {
>- 	return (x.re * x.re + x.im * x.im);
>- }
>-@@ -72,7 +72,7 @@
>- /*
>-  * Argument of a complex number.
>-  */
>--extern __inline__ float carg(complex x)
>-+static __inline__ float carg(complex x)
>- {
>- 	return atan2(x.im, x.re);
>- }
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-newqpsk_fec.h ./files/patch-newqpsk_fec.h
>--- /usr/ports/comms/soundmodem/files/patch-newqpsk_fec.h	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-newqpsk_fec.h	1970-01-01 00:00:00.000000000 +0000
>@@ -1,20 +0,0 @@
>---- newqpsk/fec.h.orig	2002-08-09 15:01:52.000000000 -0500
>-+++ newqpsk/fec.h	2013-12-14 17:37:25.000000000 -0500
>-@@ -13,7 +13,7 @@
>- 
>- /* --------------------------------------------------------------------- */
>- 
>--extern inline void init_fec(struct fecstate *f)
>-+static inline void init_fec(struct fecstate *f)
>- {
>- 	switch (f->feclevel) {
>- 	case 0:
>-@@ -33,7 +33,7 @@
>- 
>- /* --------------------------------------------------------------------- */
>- 
>--extern inline void init_inlv(struct fecstate *f)
>-+static inline void init_inlv(struct fecstate *f)
>- {
>-         int i;
>- 
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-newqpsk_filter-i386.h ./files/patch-newqpsk_filter-i386.h
>--- /usr/ports/comms/soundmodem/files/patch-newqpsk_filter-i386.h	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-newqpsk_filter-i386.h	2016-01-21 07:55:37.000000000 +0000
>@@ -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	2012-12-15 00:35:56 UTC
>++++ newqpsk/filter-i386.h
> @@ -1,7 +1,7 @@
>  #ifndef _FILTER_I386_H
>  #define _FILTER_I386_H
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-newqpsk_filter.h ./files/patch-newqpsk_filter.h
>--- /usr/ports/comms/soundmodem/files/patch-newqpsk_filter.h	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-newqpsk_filter.h	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- newqpsk/filter.h.orig	2002-08-09 15:01:52.000000000 -0500
>-+++ newqpsk/filter.h	2013-12-14 17:39:02.000000000 -0500
>-@@ -12,7 +12,7 @@
>- /* ---------------------------------------------------------------------- */
>- 
>- #ifndef __HAVE_ARCH_MAC
>--extern inline float mac(const float *a, const float *b, unsigned int size)
>-+static inline float mac(const float *a, const float *b, unsigned int size)
>- {
>- 	float sum = 0;
>- 	unsigned int i;
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-newqpsk_genfilt.c ./files/patch-newqpsk_genfilt.c
>--- /usr/ports/comms/soundmodem/files/patch-newqpsk_genfilt.c	2014-12-01 09:52:14.000000000 +0000
>+++ ./files/patch-newqpsk_genfilt.c	2016-01-21 07:55:37.000000000 +0000
>@@ -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");
>  
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-newqpsk_misc.h ./files/patch-newqpsk_misc.h
>--- /usr/ports/comms/soundmodem/files/patch-newqpsk_misc.h	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-newqpsk_misc.h	1970-01-01 00:00:00.000000000 +0000
>@@ -1,80 +0,0 @@
>---- newqpsk/misc.h.orig	2002-08-09 15:01:52.000000000 -0500
>-+++ newqpsk/misc.h	2013-12-14 17:36:50.000000000 -0500
>-@@ -10,7 +10,7 @@
>- /*
>-  * Hamming weight (number of bits that are ones).
>-  */
>--extern inline unsigned int hweight32(unsigned int w) 
>-+static inline unsigned int hweight32(unsigned int w) 
>- {
>- 	w = (w & 0x55555555) + ((w >>  1) & 0x55555555);
>- 	w = (w & 0x33333333) + ((w >>  2) & 0x33333333);
>-@@ -20,7 +20,7 @@
>- 	return w;
>- }
>- 
>--extern inline unsigned int hweight16(unsigned short w)
>-+static inline unsigned int hweight16(unsigned short w)
>- {
>- 	w = (w & 0x5555) + ((w >> 1) & 0x5555);
>- 	w = (w & 0x3333) + ((w >> 2) & 0x3333);
>-@@ -29,7 +29,7 @@
>- 	return w;
>- }
>- 
>--extern inline unsigned int hweight8(unsigned char w)
>-+static inline unsigned int hweight8(unsigned char w)
>- {
>- 	w = (w & 0x55) + ((w >> 1) & 0x55);
>- 	w = (w & 0x33) + ((w >> 2) & 0x33);
>-@@ -42,7 +42,7 @@
>- /*
>-  * Reverse order of bits.
>-  */
>--extern inline unsigned int rbits32(unsigned int w)
>-+static inline unsigned int rbits32(unsigned int w)
>- {
>- 	w = ((w >>  1) & 0x55555555) | ((w <<  1) & 0xaaaaaaaa);
>- 	w = ((w >>  2) & 0x33333333) | ((w <<  2) & 0xcccccccc);
>-@@ -52,7 +52,7 @@
>- 	return w;
>- }
>- 
>--extern inline unsigned short rbits16(unsigned short w)
>-+static inline unsigned short rbits16(unsigned short w)
>- {
>- 	w = ((w >> 1) & 0x5555) | ((w << 1) & 0xaaaa);
>- 	w = ((w >> 2) & 0x3333) | ((w << 2) & 0xcccc);
>-@@ -61,7 +61,7 @@
>- 	return w;
>- }
>- 
>--extern inline unsigned char rbits8(unsigned char w)
>-+static inline unsigned char rbits8(unsigned char w)
>- {
>- 	w = ((w >> 1) & 0x55) | ((w << 1) & 0xaa);
>- 	w = ((w >> 2) & 0x33) | ((w << 2) & 0xcc);
>-@@ -71,7 +71,7 @@
>- 
>- /* ---------------------------------------------------------------------- */
>- 
>--extern inline float avg(float average, float input, int scale)
>-+static inline float avg(float average, float input, int scale)
>- {
>- 	int i;
>- 
>-@@ -82,12 +82,12 @@
>- 	return (average + input);
>- }
>- 
>--extern inline float avg2(float average, float input, float weight)
>-+static inline float avg2(float average, float input, float weight)
>- {
>- 	return input * weight + average * (1.0 - weight);
>- }
>- 
>--extern inline float phaseavg(float *data, int len)
>-+static inline float phaseavg(float *data, int len)
>- {
>- 	float sum = 0.0;
>- 	float min = M_PI;
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-p3dmodem_genp3dtbl.c ./files/patch-p3dmodem_genp3dtbl.c
>--- /usr/ports/comms/soundmodem/files/patch-p3dmodem_genp3dtbl.c	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-p3dmodem_genp3dtbl.c	2016-01-21 07:55:37.000000000 +0000
>@@ -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>
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-pammodem_genpamtbl.c ./files/patch-pammodem_genpamtbl.c
>--- /usr/ports/comms/soundmodem/files/patch-pammodem_genpamtbl.c	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-pammodem_genpamtbl.c	2016-01-21 07:55:37.000000000 +0000
>@@ -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>
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-pskmodem_genpsktbl.c ./files/patch-pskmodem_genpsktbl.c
>--- /usr/ports/comms/soundmodem/files/patch-pskmodem_genpsktbl.c	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-pskmodem_genpsktbl.c	2016-01-21 07:55:37.000000000 +0000
>@@ -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>
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-pskmodem_pskmodem.c ./files/patch-pskmodem_pskmodem.c
>--- /usr/ports/comms/soundmodem/files/patch-pskmodem_pskmodem.c	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-pskmodem_pskmodem.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- pskmodem/pskmodem.c.orig	2013-12-13 20:07:01.214995855 -0500
>-+++ pskmodem/pskmodem.c	2013-12-13 20:07:04.005995698 -0500
>-@@ -262,7 +262,7 @@
>- 	}
>- }
>- 
>--extern inline int calcsync(int *toten, int *corren, cplxshort_t *samples)
>-+inline int calcsync(int *toten, int *corren, cplxshort_t *samples)
>- {
>- 	const cplxshort_t *tr = traincorrrotated;
>- 	unsigned int i;
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-soundcard_main.c ./files/patch-soundcard_main.c
>--- /usr/ports/comms/soundmodem/files/patch-soundcard_main.c	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-soundcard_main.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- soundcard/main.c.orig	2010-10-30 11:49:10.000000000 -0500
>-+++ soundcard/main.c	2012-11-05 17:22:52.000000000 -0500
>-@@ -358,7 +358,7 @@
>- 		{ "daemonize", 0, 0, 'D' },
>- 		{ 0, 0, 0, 0 }
>- 	};
>--	char *configname = NULL, *cfgname, *filename = "/etc/ax25/soundmodem.conf";
>-+	char *configname = NULL, *cfgname, *filename = "%%PREFIX%%/etc/soundmodem.conf";
>- 	unsigned int verblevel = 2, tosyslog = 0, simd = 1, schedrr = 0, lockmem = 0, daemonize = 0;
>-         int c, err = 0;
>- 	xmlDocPtr doc;
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-soundcard_modem.h ./files/patch-soundcard_modem.h
>--- /usr/ports/comms/soundmodem/files/patch-soundcard_modem.h	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-soundcard_modem.h	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- soundcard/modem.h.orig	2003-01-02 13:53:04.000000000 -0500
>-+++ soundcard/modem.h	2013-12-14 17:32:44.000000000 -0500
>-@@ -103,7 +103,7 @@
>- extern void logprintf(unsigned int level, const char *fmt, ...);
>- extern void logerr(unsigned int level, const char *st);
>- extern unsigned int log_verblevel;
>--extern inline int logcheck(unsigned int vl)
>-+static inline int logcheck(unsigned int vl)
>- {
>- 	return vl <= log_verblevel;
>- }
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-soundcard_ptt.c ./files/patch-soundcard_ptt.c
>--- /usr/ports/comms/soundmodem/files/patch-soundcard_ptt.c	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-soundcard_ptt.c	2016-01-21 07:55:37.000000000 +0000
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- soundcard/ptt.c.orig	2012-12-15 00:32:51 UTC
>++++ soundcard/ptt.c
>+@@ -176,7 +176,7 @@ int pttinit(struct pttio *state, const c
>  #endif
>  
>  	logprintf(MLOG_INFO, "Opening PTT device \"%s\"\n", path);
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-soundcard_simd.h ./files/patch-soundcard_simd.h
>--- /usr/ports/comms/soundmodem/files/patch-soundcard_simd.h	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-soundcard_simd.h	1970-01-01 00:00:00.000000000 +0000
>@@ -1,79 +0,0 @@
>---- soundcard/simd.h.orig	2002-08-09 15:01:52.000000000 -0500
>-+++ soundcard/simd.h	2013-12-14 17:34:29.000000000 -0500
>-@@ -54,16 +54,16 @@
>- 
>- #if !defined(USEMMX) && !defined(USEVIS)
>- 
>--extern inline void initsimd(int enable)
>-+static inline void initsimd(int enable)
>- {
>- }
>- 
>--extern inline int checksimd(void)
>-+static inline int checksimd(void)
>- {
>- 	return 0;
>- }
>- 
>--extern inline int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr)
>-+static inline int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr)
>- {
>- 	int s = 0;
>- 
>-@@ -72,7 +72,7 @@
>- 	return s;
>- }
>- 
>--extern inline void simdpreparefpu(void)
>-+static inline void simdpreparefpu(void)
>- {
>- }
>- 
>-@@ -80,9 +80,9 @@
>- 
>- extern unsigned int simd_enabled;
>- 
>--extern void initsimd(int enable);
>-+void initsimd(int enable);
>- 
>--extern inline int checksimd(void)
>-+static inline int checksimd(void)
>- {
>- 	return simd_enabled;
>- }
>-@@ -91,7 +91,7 @@
>- 
>- #define MMXCLOBBER "st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)"
>- 
>--extern inline int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr)
>-+static inline int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr)
>- {
>- 	unsigned int i, j;
>- 	int s = 0;
>-@@ -114,7 +114,7 @@
>- 	return s;
>- }
>- 
>--extern inline void simdpreparefpu(void)
>-+static inline void simdpreparefpu(void)
>- {
>- 	if (checksimd())
>- 		asm volatile("emms");
>-@@ -122,7 +122,7 @@
>- 
>- #elif defined(USEVIS)
>- 
>--/*extern inline*/static int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr)
>-+/*extern static inline*/static int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr)
>- {
>- 	double dsum1, dsum2, dsum3, dsum4, arg1, arg2, arg3, arg4;
>- 	float sum, sum1, sum2;
>-@@ -157,7 +157,7 @@
>- 	return s;
>- }
>- 
>--extern inline void simdpreparefpu(void)
>-+static inline void simdpreparefpu(void)
>- {
>- }
>- 
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-soundcard_soundmodem.8 ./files/patch-soundcard_soundmodem.8
>--- /usr/ports/comms/soundmodem/files/patch-soundcard_soundmodem.8	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-soundcard_soundmodem.8	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- soundcard/soundmodem.8.orig	Fri Aug  9 16:01:52 2002
>-+++ soundcard/soundmodem.8	Sun Nov  5 21:47:40 2006
>-@@ -20,7 +20,7 @@
>- driver (enable CONFIG_MKISS).
>- .B soundmodem
>- is controlled by a configuration file. The default filename is
>--/etc/ax25/soundmodem.conf. Any other name may be specified on the command line.
>-+%%PREFIX%%/etc/soundmodem.conf. Any other name may be specified on the command line.
>- 
>- 
>- 
>diff -dpruN /usr/ports/comms/soundmodem/files/patch-soundcard_winlog.c ./files/patch-soundcard_winlog.c
>--- /usr/ports/comms/soundmodem/files/patch-soundcard_winlog.c	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-soundcard_winlog.c	2016-01-21 07:55:37.000000000 +0000
>@@ -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	2003-01-02 16:22:46 UTC
>++++ soundcard/winlog.c
> @@ -44,7 +44,7 @@
>  
>  /* ---------------------------------------------------------------------- */
>diff -dpruN /usr/ports/comms/soundmodem/files/soundmodem ./files/soundmodem
>--- /usr/ports/comms/soundmodem/files/soundmodem	2014-01-23 19:55:14.000000000 +0000
>+++ ./files/soundmodem	1970-01-01 00:00:00.000000000 +0000
>@@ -1,37 +0,0 @@
>-#! /bin/sh
>-#
>-# PROVIDE: soundmodem
>-# REQUIRE: LOGIN
>-#
>-# Add the following lines to /etc/rc.conf to enable soundmodem:
>-#
>-#soundmodem_enable="YES"
>-
>-. /etc/rc.subr
>-
>-name=soundmodem
>-rcvar=soundmodem_enable
>-load_rc_config $name
>-soundmodem_enable=${soundmodem_enable-"NO"}
>-
>-command=/usr/local/sbin/soundmodem
>-start_cmd=soundmodem_start
>-stop_cmd=soundmodem_stop
>-
>-pidfile=/var/run/soundmodem.pid
>-required_files=/usr/local/etc/soundmodem.conf
>-
>-soundmodem_start()
>-{
>-	echo "Starting Soundmodem: "
>-	/usr/local/sbin/soundmodem --daemonize
>-	return 0
>-}
>-soundmodem_stop()
>-{
>-	echo "Stopping Soundmodem: "
>-	killall soundmodem
>-	return 0
>-}
>-
>-run_rc_command "$1"
>diff -dpruN /usr/ports/comms/soundmodem/files/soundmodem.in ./files/soundmodem.in
>--- /usr/ports/comms/soundmodem/files/soundmodem.in	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/soundmodem.in	2016-01-28 07:58:56.000000000 +0000
>@@ -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"
>diff -dpruN /usr/ports/comms/soundmodem/pkg-descr ./pkg-descr
>--- /usr/ports/comms/soundmodem/pkg-descr	2014-01-22 15:44:51.000000000 +0000
>+++ ./pkg-descr	2016-01-21 08:48:07.000000000 +0000
>@@ -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
>diff -dpruN /usr/ports/comms/soundmodem/pkg-plist ./pkg-plist
>--- /usr/ports/comms/soundmodem/pkg-plist	2014-08-06 16:27:22.000000000 +0000
>+++ ./pkg-plist	2016-01-22 06:28:08.000000000 +0000
>@@ -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

Actions: View | Diff

Attachments on bug 206705: 166227