Attachment #166227 for bug #206705

View | Details | Raw Unified | Return to bug 206705
Collapse All | Expand All




# $FreeBSD: head/comms/soundmodem/Makefile 386312 2015-05-14 10:15:04Z mat $

PORTNAME=	soundmodem
PORTVERSION=	0.20
CATEGORIES=	comms hamradio
MASTER_SITES=	http://download.gna.org/soundmodem/
		http://soundmodem.vk4msl.yi.org/ \
		http://pv529.ncsrv.de/soundmodem/ \
		LOCAL/shurd

MAINTAINER=	hamradio@FreeBSD.org
COMMENT=	Amateur Radio sound modem

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile


USES=		gmake pkgconfig gettext
HAS_CONFIGURE=	yes
USE_GNOME=	gtk20 libxml2
USE_RC_SUBR=	soundmodem
USE_SUBMAKE=	yes
	@${CP} ${FILESDIR}/soundmodem ${WRKSRC}

post-patch:
	${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
post-install:
	${INSTALL_SCRIPT} ${WRKSRC}/soundmodem ${STAGEDIR}${PREFIX}/etc/rc.d

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (soundmodem-0.18.tar.gz) = f033c1716df1378cda646dbb1c48ea9fb9a068772c6686f2ca411bfa64245c1c	1	SHA256 (soundmodem-0.20.tar.gz) = 3f880349cbe4c8e27f02d276b2d3318e6b721cad6c0ab2ba8e2c1768251fd494
2	SIZE (soundmodem-0.18.tar.gz) = 485475	2	SIZE (soundmodem-0.20.tar.gz) = 507650




--- 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 \

Lines 1-11 Link Here

(-)./files/patch-configapp_src_main.c (-11 lines)
1	--- configapp/src/main.c.orig 2010-10-30 11:49:09.000000000 -0500
2	+++ configapp/src/main.c 2012-11-05 17:20:25.000000000 -0500
3	@@ -359,7 +359,7 @@
4	#else /* WIN32 */
5
6	static xmlDocPtr doc = NULL;
7	-static const char *cfgfile = "/etc/ax25/soundmodem.conf";
8	+static const char *cfgfile = "%%PREFIX%%/etc/soundmodem.conf";
9
10	static xmlNodePtr findconfig(const char *newname)
11	{

Lines 1-11 Link Here

(-)./files/patch-configapp_src_soundmodemconfig.8 (-11 lines)
1	--- configapp/src/soundmodemconfig.8.orig Fri Aug 9 16:01:51 2002
2	+++ configapp/src/soundmodemconfig.8 Sun Nov 5 21:59:09 2006
3	@@ -15,7 +15,7 @@
4	.SH DESCRIPTION
5	.B soundmodemconfig
6	is a GUI tool for creating a configuration file for soundmodem (8).
7	-The default file name is /etc/ax25/soundmodem.conf, though
8	+The default file name is %%PREFIX%%/etc/soundmodem.conf, though
9	any other file name may be specified on the command line.
10
11

Lines 1-6 Link Here

(-)./files/patch-configure (-4 / +4 lines)
1	--- configure.orig 2012-11-07 05:55:37.000000000 -0500	1	--- configure.orig 2012-12-15 00:35:42 UTC
2	+++ configure 2012-11-07 07:02:34.000000000 -0500	2	+++ configure
3	@@ -844,7 +844,7 @@	3	@@ -843,7 +843,7 @@ pdfdir='${docdir}'
4	psdir='${docdir}'	4	psdir='${docdir}'
5	libdir='${exec_prefix}/lib'	5	libdir='${exec_prefix}/lib'
6	localedir='${datarootdir}/locale'	6	localedir='${datarootdir}/locale'
Lines 9-15 Link Here
9		9
10	ac_prev=	10	ac_prev=
11	ac_dashdash=	11	ac_dashdash=
12	@@ -7265,7 +7265,7 @@	12	@@ -7264,7 +7264,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
13	int	13	int
14	main ()	14	main ()
15	{	15	{

Lines 1-6 Link Here

(-)./files/patch-fsk_gendf9icfilt.cc (-4 / +4 lines)
1	--- fsk/gendf9icfilt.cc.orig 2013-12-13 08:19:49.459920041 -0500	1	--- fsk/gendf9icfilt.cc.orig 2003-01-06 22:47:26 UTC
2	+++ fsk/gendf9icfilt.cc 2013-12-13 08:43:50.641820677 -0500	2	+++ fsk/gendf9icfilt.cc
3	@@ -41,6 +41,8 @@	3	@@ -41,6 +41,8 @@ using namespace std;
4		4
5	#include "getopt.h"	5	#include "getopt.h"
6		6
Lines 9-15 Link Here
9	/* --------------------------------------------------------------------- */	9	/* --------------------------------------------------------------------- */
10		10
11	template<typename T> complex<T> rxfilter(T freq)	11	template<typename T> complex<T> rxfilter(T freq)
12	@@ -173,7 +175,8 @@	12	@@ -173,7 +175,8 @@ static void printfcoeff(ostream& os, uns
13	printtransferfunc(os, fftsz, over);	13	printtransferfunc(os, fftsz, over);
14	else	14	else
15	os << "/* this file is automatically generated, do not edit!! */\n\n";	15	os << "/* this file is automatically generated, do not edit!! */\n\n";

Lines 1-6 Link Here

(-)./files/patch-matlib_mat.hh (-4 / +4 lines)
1	--- matlib/mat.hh.orig 2013-12-13 08:25:15.148898287 -0500	1	--- matlib/mat.hh.orig 2003-01-06 22:47:26 UTC
2	+++ matlib/mat.hh 2013-12-13 08:45:23.061999828 -0500	2	+++ matlib/mat.hh
3	@@ -91,36 +91,6 @@	3	@@ -91,36 +91,6 @@ template<typename T> void mmul(T *c, con
4	memcpy(c, r, d1 * d3 * sizeof(c[0]));	4	memcpy(c, r, d1 * d3 * sizeof(c[0]));
5	}	5	}
6		6
Lines 37-43 Link Here
37	/* Transpose a matrix (a el C^{d1 x d2}, b el C^{d2 x d1}) */	37	/* Transpose a matrix (a el C^{d1 x d2}, b el C^{d2 x d1}) */
38	template<typename T> void mtranspose(T b, const T a, unsigned int d1, unsigned int d2)	38	template<typename T> void mtranspose(T b, const T a, unsigned int d1, unsigned int d2)
39	{	39	{
40	@@ -440,23 +410,6 @@	40	@@ -440,23 +410,6 @@ template<typename T> void mlusolve(T *x,
41	}	41	}
42	}	42	}
43		43




--- 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);
 }

Lines 1-20 Link Here

(-)./files/patch-newqpsk_fec.h (-20 lines)
1	--- newqpsk/fec.h.orig 2002-08-09 15:01:52.000000000 -0500
2	+++ newqpsk/fec.h 2013-12-14 17:37:25.000000000 -0500
3	@@ -13,7 +13,7 @@
4
5	/* --------------------------------------------------------------------- */
6
7	-extern inline void init_fec(struct fecstate *f)
8	+static inline void init_fec(struct fecstate *f)
9	{
10	switch (f->feclevel) {
11	case 0:
12	@@ -33,7 +33,7 @@
13
14	/* --------------------------------------------------------------------- */
15
16	-extern inline void init_inlv(struct fecstate *f)
17	+static inline void init_inlv(struct fecstate *f)
18	{
19	int i;
20

Lines 1-5 Link Here

(-)./files/patch-newqpsk_filter-i386.h (-2 / +2 lines)
1	--- newqpsk/filter-i386.h.orig 2012-11-07 05:41:08.000000000 -0500	1	--- newqpsk/filter-i386.h.orig 2012-12-15 00:35:56 UTC
2	+++ newqpsk/filter-i386.h 2013-12-14 17:39:18.000000000 -0500	2	+++ newqpsk/filter-i386.h
3	@@ -1,7 +1,7 @@	3	@@ -1,7 +1,7 @@
4	#ifndef _FILTER_I386_H	4	#ifndef _FILTER_I386_H
5	#define _FILTER_I386_H	5	#define _FILTER_I386_H

Lines 1-11 Link Here

(-)./files/patch-newqpsk_filter.h (-11 lines)
1	--- newqpsk/filter.h.orig 2002-08-09 15:01:52.000000000 -0500
2	+++ newqpsk/filter.h 2013-12-14 17:39:02.000000000 -0500
3	@@ -12,7 +12,7 @@
4	/* ---------------------------------------------------------------------- */
5
6	#ifndef __HAVE_ARCH_MAC
7	-extern inline float mac(const float a, const float b, unsigned int size)
8	+static inline float mac(const float a, const float b, unsigned int size)
9	{
10	float sum = 0;
11	unsigned int i;

Lines 1-6 Link Here

(-)./files/patch-newqpsk_genfilt.c (-3 / +3 lines)
1	--- newqpsk/genfilt.c.orig 2014-12-01 09:43:37.000000000 +0000	1	--- newqpsk/genfilt.c.orig 2002-08-09 20:01:52 UTC
2	+++ newqpsk/genfilt.c 2014-12-01 09:43:45.000000000 +0000	2	+++ newqpsk/genfilt.c
3	@@ -18,7 +18,7 @@	3	@@ -18,7 +18,7 @@ int main(int argc, char **argv)
4	puts("#define _FILTER_I386_H");	4	puts("#define _FILTER_I386_H");
5	puts("#define __HAVE_ARCH_MAC");	5	puts("#define __HAVE_ARCH_MAC");
6		6




--- 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;

Lines 1-5 Link Here

(-)./files/patch-p3dmodem_genp3dtbl.c (-2 / +2 lines)
1	--- p3dmodem/genp3dtbl.c.orig 2002-08-09 15:01:52.000000000 -0500	1	--- p3dmodem/genp3dtbl.c.orig 2002-08-09 20:01:52 UTC
2	+++ p3dmodem/genp3dtbl.c 2013-12-14 17:48:45.000000000 -0500	2	+++ p3dmodem/genp3dtbl.c
3	@@ -39,6 +39,8 @@	3	@@ -39,6 +39,8 @@
4	#include <float.h>	4	#include <float.h>
5	#include <stdio.h>	5	#include <stdio.h>

Lines 1-5 Link Here

(-)./files/patch-pammodem_genpamtbl.c (-2 / +2 lines)
1	--- pammodem/genpamtbl.c.orig 2002-08-09 15:01:52.000000000 -0500	1	--- pammodem/genpamtbl.c.orig 2002-08-09 20:01:52 UTC
2	+++ pammodem/genpamtbl.c 2013-12-14 17:52:08.000000000 -0500	2	+++ pammodem/genpamtbl.c
3	@@ -38,6 +38,8 @@	3	@@ -38,6 +38,8 @@
4	#include <math.h>	4	#include <math.h>
5	#include <stdio.h>	5	#include <stdio.h>

Lines 1-5 Link Here

(-)./files/patch-pskmodem_genpsktbl.c (-2 / +2 lines)
1	--- pskmodem/genpsktbl.c.orig 2013-12-14 14:02:09.000000000 -0500	1	--- pskmodem/genpsktbl.c.orig 2002-08-09 20:01:52 UTC
2	+++ pskmodem/genpsktbl.c 2013-12-14 14:02:34.000000000 -0500	2	+++ pskmodem/genpsktbl.c
3	@@ -40,6 +40,8 @@	3	@@ -40,6 +40,8 @@
4	#include <stdio.h>	4	#include <stdio.h>
5	#include <string.h>	5	#include <string.h>

Lines 1-11 Link Here

(-)./files/patch-pskmodem_pskmodem.c (-11 lines)
1	--- pskmodem/pskmodem.c.orig 2013-12-13 20:07:01.214995855 -0500
2	+++ pskmodem/pskmodem.c 2013-12-13 20:07:04.005995698 -0500
3	@@ -262,7 +262,7 @@
4	}
5	}
6
7	-extern inline int calcsync(int toten, int corren, cplxshort_t *samples)
8	+inline int calcsync(int toten, int corren, cplxshort_t *samples)
9	{
10	const cplxshort_t *tr = traincorrrotated;
11	unsigned int i;

Lines 1-11 Link Here

(-)./files/patch-soundcard_main.c (-11 lines)
1	--- soundcard/main.c.orig 2010-10-30 11:49:10.000000000 -0500
2	+++ soundcard/main.c 2012-11-05 17:22:52.000000000 -0500
3	@@ -358,7 +358,7 @@
4	{ "daemonize", 0, 0, 'D' },
5	{ 0, 0, 0, 0 }
6	};
7	- char configname = NULL, cfgname, *filename = "/etc/ax25/soundmodem.conf";
8	+ char configname = NULL, cfgname, *filename = "%%PREFIX%%/etc/soundmodem.conf";
9	unsigned int verblevel = 2, tosyslog = 0, simd = 1, schedrr = 0, lockmem = 0, daemonize = 0;
10	int c, err = 0;
11	xmlDocPtr doc;

Lines 1-11 Link Here

(-)./files/patch-soundcard_modem.h (-11 lines)
1	--- soundcard/modem.h.orig 2003-01-02 13:53:04.000000000 -0500
2	+++ soundcard/modem.h 2013-12-14 17:32:44.000000000 -0500
3	@@ -103,7 +103,7 @@
4	extern void logprintf(unsigned int level, const char *fmt, ...);
5	extern void logerr(unsigned int level, const char *st);
6	extern unsigned int log_verblevel;
7	-extern inline int logcheck(unsigned int vl)
8	+static inline int logcheck(unsigned int vl)
9	{
10	return vl <= log_verblevel;
11	}

Lines 1-6 Link Here

(-)./files/patch-soundcard_ptt.c (-3 / +3 lines)
1	--- soundcard/ptt.c.orig 2012-11-07 11:05:55.000000000 -0500	1	--- soundcard/ptt.c.orig 2012-12-15 00:32:51 UTC
2	+++ soundcard/ptt.c 2012-11-07 11:06:15.000000000 -0500	2	+++ soundcard/ptt.c
3	@@ -176,7 +176,7 @@	3	@@ -176,7 +176,7 @@ int pttinit(struct pttio *state, const c
4	#endif	4	#endif
5		5
6	logprintf(MLOG_INFO, "Opening PTT device \"%s\"\n", path);	6	logprintf(MLOG_INFO, "Opening PTT device \"%s\"\n", path);




--- 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)
 {
 }
 

Lines 1-11 Link Here

(-)./files/patch-soundcard_soundmodem.8 (-11 lines)
1	--- soundcard/soundmodem.8.orig Fri Aug 9 16:01:52 2002
2	+++ soundcard/soundmodem.8 Sun Nov 5 21:47:40 2006
3	@@ -20,7 +20,7 @@
4	driver (enable CONFIG_MKISS).
5	.B soundmodem
6	is controlled by a configuration file. The default filename is
7	-/etc/ax25/soundmodem.conf. Any other name may be specified on the command line.
8	+%%PREFIX%%/etc/soundmodem.conf. Any other name may be specified on the command line.
9
10
11

Lines 1-5 Link Here

(-)./files/patch-soundcard_winlog.c (-2 / +2 lines)
1	--- soundcard/winlog.c.orig 2013-12-13 08:55:02.797125391 -0500	1	--- soundcard/winlog.c.orig 2003-01-02 16:22:46 UTC
2	+++ soundcard/winlog.c 2013-12-13 08:55:35.636772475 -0500	2	+++ soundcard/winlog.c
3	@@ -44,7 +44,7 @@	3	@@ -44,7 +44,7 @@
4		4
5	/* ---------------------------------------------------------------------- */	5	/* ---------------------------------------------------------------------- */




#! /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"




#!/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"

Lines 1-3 Link Here

(-)./pkg-descr (-1 / +1 lines)
1	soundmodem Tom's userland modem on FreeBSD	1	soundmodem Tom's userland modem on FreeBSD
2		2
3	WWW: http://www.baycom.org/~tom/ham/soundmodem/	3	WWW: http://gna.org/projects/soundmodem

Lines 1-6 Link Here

(-)./pkg-plist (-1 lines)
1	bin/soundmodemconfig	1	bin/soundmodemconfig
2	sbin/soundmodem	2	sbin/soundmodem
3	etc/rc.d/soundmodem
4	include/modem.h	3	include/modem.h
5	include/simd.h	4	include/simd.h
6	share/locale/fr/LC_MESSAGES/soundmodem.mo	5	share/locale/fr/LC_MESSAGES/soundmodem.mo

Return to bug 206705

Lines 1-17 Link Here

(-)./Makefile (-17 / +12 lines)
1	# $FreeBSD: head/comms/soundmodem/Makefile 386312 2015-05-14 10:15:04Z mat $	1	# $FreeBSD: head/comms/soundmodem/Makefile 386312 2015-05-14 10:15:04Z mat $
2		2
3	PORTNAME= soundmodem	3	PORTNAME= soundmodem
4	PORTVERSION= 0.18	4	PORTVERSION= 0.20
5	CATEGORIES= comms hamradio	5	CATEGORIES= comms hamradio
6	MASTER_SITES= http://www.baycom.org/~tom/ham/soundmodem/ \	6	MASTER_SITES= http://download.gna.org/soundmodem/
7	http://soundmodem.vk4msl.yi.org/ \
8	http://pv529.ncsrv.de/soundmodem/ \
9	LOCAL/shurd
10		7
11	MAINTAINER= hamradio@FreeBSD.org	8	MAINTAINER= hamradio@FreeBSD.org
12	COMMENT= Amateur Radio sound modem	9	COMMENT= Amateur Radio sound modem
13		10
14	LICENSE= GPLv1	11	LICENSE= GPLv2
		12	LICENSE_FILE= ${WRKSRC}/COPYING
15		13
16	LIB_DEPENDS= libaudiofile.so:${PORTSDIR}/audio/libaudiofile	14	LIB_DEPENDS= libaudiofile.so:${PORTSDIR}/audio/libaudiofile
17		15
Lines 20-37 WRKSRC= ${WRKDIR}/${DISTNAME} Link Here
20	USES= gmake pkgconfig gettext	18	USES= gmake pkgconfig gettext
21	HAS_CONFIGURE= yes	19	HAS_CONFIGURE= yes
22	USE_GNOME= gtk20 libxml2	20	USE_GNOME= gtk20 libxml2
23		21	USE_RC_SUBR= soundmodem
24	pre-patch:	22	USE_SUBMAKE= yes
25	@${CP} ${FILESDIR}/soundmodem ${WRKSRC}
26		23
27	post-patch:	24	post-patch:
28	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' \	25	${REINPLACE_CMD} -e 's\|/etc/ax25\|${PREFIX}/etc\|g' \
29	${WRKSRC}/soundcard/soundmodem.8 \	26	${WRKSRC}/configapp/src/main.c\
30	${WRKSRC}/soundcard/main.c \	27	${WRKSRC}/configapp/src/soundmodemconfig.8\
31	${WRKSRC}/configapp/src/soundmodemconfig.8 \	28	${WRKSRC}/soundcard/soundmodem.8\
32	${WRKSRC}/configapp/src/main.c \	29	${WRKSRC}/soundcard/main.c\
33	${WRKSRC}/soundmodem	30	${WRKSRC}/soundmodem.spec
34	post-install:
35	${INSTALL_SCRIPT} ${WRKSRC}/soundmodem ${STAGEDIR}${PREFIX}/etc/rc.d
36		31
37	.include <bsd.port.mk>	32	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)./files/patch-configapp_src_Makefile.in (-12 / +12 lines)
1	--- configapp/src/Makefile.in.orig 2012-11-07 05:55:36.000000000 -0500	1	--- configapp/src/Makefile.in.orig 2015-05-04 17:59:05 UTC
2	+++ configapp/src/Makefile.in 2013-12-14 12:09:14.352210905 -0500	2	+++ configapp/src/Makefile.in
3	@@ -87,7 +87,7 @@	3	@@ -106,7 +106,7 @@ soundmodemconfig_DEPENDENCIES = ../../so
4	COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \	4	../../soundcard/libaudioio.a ../../soundcard/libpttio.a \
5	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)	5	$(MODEMLIBS) ../../matlib/libmat.a ../../libmisc/libmisc.a \
6	CCLD = $(CC)	6	../../soundcard/libcommon.a $(am__DEPENDENCIES_1)
7	-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@	7	-soundmodemconfig_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
8	+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(INTLLIBS) $(AM_LDFLAGS) $(LDFLAGS) -o $@	8	+soundmodemconfig_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(INTLLIBS)\
9	SOURCES = $(soundmodemconfig_SOURCES)	9	$(soundmodemconfig_LDFLAGS) $(LDFLAGS) -o $@
10	DIST_SOURCES = $(soundmodemconfig_SOURCES)	10	AM_V_P = $(am__v_P_@AM_V@)
11	am__can_run_installinfo = \	11	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
12	@@ -300,7 +300,7 @@	12	@@ -366,7 +366,7 @@ soundmodemconfig_SOURCES = \
13		13
14	soundmodemconfig_LDADD = ../../soundcard/liblog.a ../../soundcard/libaudioio.a ../../soundcard/libpttio.a \	14	soundmodemconfig_LDADD = ../../soundcard/liblog.a ../../soundcard/libaudioio.a ../../soundcard/libpttio.a \
15	$(MODEMLIBS) ../../matlib/libmat.a ../../libmisc/libmisc.a ../../soundcard/libcommon.a \	15	$(MODEMLIBS) ../../matlib/libmat.a ../../libmisc/libmisc.a ../../soundcard/libcommon.a \

Lines 1-65 Link Here

(-)./files/patch-newqpsk_complex.h (-65 lines)
1	--- newqpsk/complex.h.orig 2008-12-14 09:47:34.000000000 -0500
2	+++ newqpsk/complex.h 2013-12-14 17:54:58.000000000 -0500
3	@@ -13,7 +13,7 @@
4	/*
5	* Complex multiplication.
6	*/
7	-extern __inline__ complex cmul(complex x, complex y)
8	+static __inline__ complex cmul(complex x, complex y)
9	{
10	complex z;
11
12	@@ -27,7 +27,7 @@
13	* Complex ... yeah, what??? Returns a complex number that has the
14	* properties: \|z\| = \|x\| * \|y\| and arg(z) = arg(y) - arg(x)
15	*/
16	-extern __inline__ complex ccor(complex x, complex y)
17	+static __inline__ complex ccor(complex x, complex y)
18	{
19	complex z;
20
21	@@ -40,7 +40,7 @@
22	/*
23	* Real part of the complex ???
24	*/
25	-extern __inline__ float ccorI(complex x, complex y)
26	+static __inline__ float ccorI(complex x, complex y)
27	{
28	return x.re * y.re + x.im * y.im;
29	}
30	@@ -48,7 +48,7 @@
31	/*
32	* Imaginary part of the complex ???
33	*/
34	-extern __inline__ float ccorQ(complex x, complex y)
35	+static __inline__ float ccorQ(complex x, complex y)
36	{
37	return x.re * y.im - x.im * y.re;
38	}
39	@@ -56,7 +56,7 @@
40	/*
41	* Modulo (absolute value) of a complex number.
42	*/
43	-extern __inline__ float cmod(complex x)
44	+static __inline__ float cmod(complex x)
45	{
46	return sqrt(x.re * x.re + x.im * x.im);
47	}
48	@@ -64,7 +64,7 @@
49	/*
50	* Square of the absolute value (power).
51	*/
52	-extern __inline__ float cpwr(complex x)
53	+static __inline__ float cpwr(complex x)
54	{
55	return (x.re * x.re + x.im * x.im);
56	}
57	@@ -72,7 +72,7 @@
58	/*
59	* Argument of a complex number.
60	*/
61	-extern __inline__ float carg(complex x)
62	+static __inline__ float carg(complex x)
63	{
64	return atan2(x.im, x.re);
65	}

Lines 1-80 Link Here

(-)./files/patch-newqpsk_misc.h (-80 lines)
1	--- newqpsk/misc.h.orig 2002-08-09 15:01:52.000000000 -0500
2	+++ newqpsk/misc.h 2013-12-14 17:36:50.000000000 -0500
3	@@ -10,7 +10,7 @@
4	/*
5	* Hamming weight (number of bits that are ones).
6	*/
7	-extern inline unsigned int hweight32(unsigned int w)
8	+static inline unsigned int hweight32(unsigned int w)
9	{
10	w = (w & 0x55555555) + ((w >> 1) & 0x55555555);
11	w = (w & 0x33333333) + ((w >> 2) & 0x33333333);
12	@@ -20,7 +20,7 @@
13	return w;
14	}
15
16	-extern inline unsigned int hweight16(unsigned short w)
17	+static inline unsigned int hweight16(unsigned short w)
18	{
19	w = (w & 0x5555) + ((w >> 1) & 0x5555);
20	w = (w & 0x3333) + ((w >> 2) & 0x3333);
21	@@ -29,7 +29,7 @@
22	return w;
23	}
24
25	-extern inline unsigned int hweight8(unsigned char w)
26	+static inline unsigned int hweight8(unsigned char w)
27	{
28	w = (w & 0x55) + ((w >> 1) & 0x55);
29	w = (w & 0x33) + ((w >> 2) & 0x33);
30	@@ -42,7 +42,7 @@
31	/*
32	* Reverse order of bits.
33	*/
34	-extern inline unsigned int rbits32(unsigned int w)
35	+static inline unsigned int rbits32(unsigned int w)
36	{
37	w = ((w >> 1) & 0x55555555) \| ((w << 1) & 0xaaaaaaaa);
38	w = ((w >> 2) & 0x33333333) \| ((w << 2) & 0xcccccccc);
39	@@ -52,7 +52,7 @@
40	return w;
41	}
42
43	-extern inline unsigned short rbits16(unsigned short w)
44	+static inline unsigned short rbits16(unsigned short w)
45	{
46	w = ((w >> 1) & 0x5555) \| ((w << 1) & 0xaaaa);
47	w = ((w >> 2) & 0x3333) \| ((w << 2) & 0xcccc);
48	@@ -61,7 +61,7 @@
49	return w;
50	}
51
52	-extern inline unsigned char rbits8(unsigned char w)
53	+static inline unsigned char rbits8(unsigned char w)
54	{
55	w = ((w >> 1) & 0x55) \| ((w << 1) & 0xaa);
56	w = ((w >> 2) & 0x33) \| ((w << 2) & 0xcc);
57	@@ -71,7 +71,7 @@
58
59	/* ---------------------------------------------------------------------- */
60
61	-extern inline float avg(float average, float input, int scale)
62	+static inline float avg(float average, float input, int scale)
63	{
64	int i;
65
66	@@ -82,12 +82,12 @@
67	return (average + input);
68	}
69
70	-extern inline float avg2(float average, float input, float weight)
71	+static inline float avg2(float average, float input, float weight)
72	{
73	return input * weight + average * (1.0 - weight);
74	}
75
76	-extern inline float phaseavg(float *data, int len)
77	+static inline float phaseavg(float *data, int len)
78	{
79	float sum = 0.0;
80	float min = M_PI;

Lines 1-79 Link Here

(-)./files/patch-soundcard_simd.h (-79 lines)
1	--- soundcard/simd.h.orig 2002-08-09 15:01:52.000000000 -0500
2	+++ soundcard/simd.h 2013-12-14 17:34:29.000000000 -0500
3	@@ -54,16 +54,16 @@
4
5	#if !defined(USEMMX) && !defined(USEVIS)
6
7	-extern inline void initsimd(int enable)
8	+static inline void initsimd(int enable)
9	{
10	}
11
12	-extern inline int checksimd(void)
13	+static inline int checksimd(void)
14	{
15	return 0;
16	}
17
18	-extern inline int simdfir16(const int16_t p1, const int16_t p2, unsigned int nr)
19	+static inline int simdfir16(const int16_t p1, const int16_t p2, unsigned int nr)
20	{
21	int s = 0;
22
23	@@ -72,7 +72,7 @@
24	return s;
25	}
26
27	-extern inline void simdpreparefpu(void)
28	+static inline void simdpreparefpu(void)
29	{
30	}
31
32	@@ -80,9 +80,9 @@
33
34	extern unsigned int simd_enabled;
35
36	-extern void initsimd(int enable);
37	+void initsimd(int enable);
38
39	-extern inline int checksimd(void)
40	+static inline int checksimd(void)
41	{
42	return simd_enabled;
43	}
44	@@ -91,7 +91,7 @@
45
46	#define MMXCLOBBER "st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)"
47
48	-extern inline int simdfir16(const int16_t p1, const int16_t p2, unsigned int nr)
49	+static inline int simdfir16(const int16_t p1, const int16_t p2, unsigned int nr)
50	{
51	unsigned int i, j;
52	int s = 0;
53	@@ -114,7 +114,7 @@
54	return s;
55	}
56
57	-extern inline void simdpreparefpu(void)
58	+static inline void simdpreparefpu(void)
59	{
60	if (checksimd())
61	asm volatile("emms");
62	@@ -122,7 +122,7 @@
63
64	#elif defined(USEVIS)
65
66	-/extern inline/static int simdfir16(const int16_t p1, const int16_t p2, unsigned int nr)
67	+/extern static inline/static int simdfir16(const int16_t p1, const int16_t p2, unsigned int nr)
68	{
69	double dsum1, dsum2, dsum3, dsum4, arg1, arg2, arg3, arg4;
70	float sum, sum1, sum2;
71	@@ -157,7 +157,7 @@
72	return s;
73	}
74
75	-extern inline void simdpreparefpu(void)
76	+static inline void simdpreparefpu(void)
77	{
78	}
79

Lines 1-37 Link Here

(-)./files/soundmodem (-37 lines)
1	#! /bin/sh
2	#
3	# PROVIDE: soundmodem
4	# REQUIRE: LOGIN
5	#
6	# Add the following lines to /etc/rc.conf to enable soundmodem:
7	#
8	#soundmodem_enable="YES"
9
10	. /etc/rc.subr
11
12	name=soundmodem
13	rcvar=soundmodem_enable
14	load_rc_config $name
15	soundmodem_enable=${soundmodem_enable-"NO"}
16
17	command=/usr/local/sbin/soundmodem
18	start_cmd=soundmodem_start
19	stop_cmd=soundmodem_stop
20
21	pidfile=/var/run/soundmodem.pid
22	required_files=/usr/local/etc/soundmodem.conf
23
24	soundmodem_start()
25	{
26	echo "Starting Soundmodem: "
27	/usr/local/sbin/soundmodem --daemonize
28	return 0
29	}
30	soundmodem_stop()
31	{
32	echo "Stopping Soundmodem: "
33	killall soundmodem
34	return 0
35	}
36
37	run_rc_command "$1"

Line 0 Link Here

(-)./files/soundmodem.in (+39 lines)
	1	#!/bin/sh
	2
	3	# $FreeBSD$
	4	#
	5	# PROVIDE: soundmodem
	6	# REQUIRE: LOGIN
	7	# KEYWORD: shutdown
	8	#
	9	# Add these lines to /etc/rc.conf.local or /etc/rc.conf
	10	# to enable this service:
	11	#
	12	# soundmodem_enable (bool): Set to NO by default.
	13	# Set it to YES to enable soundmodem.
	14	# soundmodem_config (path): Set to %%PREFIX%%/etc/soundmodem.conf
	15	# by default.
	16
	17	. /etc/rc.subr
	18
	19	name=soundmodem
	20	rcvar=soundmodem_enable
	21	load_rc_config $name
	22
	23	: ${soundmodem_enable:="NO"}
	24	: ${soundmodem_config:="%%PREFIX%%/etc/soundmodem.conf"}
	25
	26	command=%%PREFIX%%/sbin/${name}
	27	command_args="$soundmodem_config --daemonize"
	28	stop_cmd=soundmodem_stop
	29
	30	required_files=%%PREFIX%%/etc/soundmodem.conf
	31
	32	soundmodem_stop()
	33	{
	34	echo "Stopping soundmodem."
	35	killall soundmodem
	36	return 0
	37	}
	38
	39	run_rc_command "$1"