cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to latest 0.17

Browse Source 
- unbreak amd64 build

Feature safe:	yes
This commit is contained in:
Diane Bruce 2012-11-10 16:56:40 +00:00
parent ada2e37f3b
commit 6ec5eaf60c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=307294
10 changed files with 43 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
comms/soundmodem/Makefile
View File

@ -1,13 +1,7 @@
# ports collection makefile for: soundmodem
# Date created: 4 November 2006
# Whom: db
#
# $FreeBSD$
#
PORTNAME= soundmodem
PORTVERSION= 0.10
PORTREVISION= 3
PORTVERSION= 0.17
CATEGORIES= comms hamradio
MASTER_SITES= http://www.baycom.org/~tom/ham/soundmodem/ \
http://chronos.org.uk/distfiles/
@ -21,23 +15,19 @@ CONFIGURE_ARGS= --disable-alsatest
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_GMAKE= yes
HAS_CONFIGURE= yes
ONLY_FOR_ARCHS= i386
USE_GNOME= gtk12 libxml
USE_GNOME= gtk20 libxml2
MAN8= soundmodem.8 soundmodemconfig.8
PLIST_FILES= bin/soundmodemconfig etc/rc.d/soundmodem \
include/modem.h include/simd.h sbin/soundmodem
pre-patch:
@${CP} ${FILESDIR}/soundmodem ${WRKSRC}
post-patch:
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
@${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 ${PREFIX}/etc/rc.d

4
comms/soundmodem/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (soundmodem-0.10.tar.gz) = e7a42c413a180b873ae76b2c252904a3e34c9807c2604f2315426443d9e28627
SIZE (soundmodem-0.10.tar.gz) = 491112
SHA256 (soundmodem-0.17.tar.gz) = 741cd31b645340e6371a5592452f29aa03991943c467d03d4da9353b8dbb5edb
SIZE (soundmodem-0.17.tar.gz) = 486024

6
comms/soundmodem/files/patch-configapp_src_main.c
View File

@ -1,6 +1,6 @@
--- configapp/src/main.c.orig Sun Nov 5 21:45:29 2006
+++ configapp/src/main.c Sun Nov 5 21:45:50 2006
@@ -358,7 +358,7 @@
--- 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;

26
comms/soundmodem/files/patch-configure
View File

@ -1,22 +1,20 @@
--- configure.orig Tue Sep 12 14:52:56 2006
+++ configure Tue Sep 12 16:48:30 2006
@@ -7912,7 +7912,8 @@
--- configure.orig 2012-11-07 05:55:37.000000000 -0500
+++ configure 2012-11-07 07:02:34.000000000 -0500
@@ -844,7 +844,7 @@
psdir='${docdir}'
libdir='${exec_prefix}/lib'
localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
+mandir='${prefix}/man'
ac_prev=
ac_dashdash=
@@ -7265,7 +7265,7 @@
int
main ()
{
-
+#include <stdio.h>
+printf("RUNNING a conftest!\n");
/* ensure backward compatibility */
#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
@@ -7979,9 +7980,6 @@
echo "$as_me:$LINENO: result: not present." >&5
echo "${ECHO_T}not present." >&6
- { { echo "$as_me:$LINENO: error: Sufficiently new version of libasound not found." >&5
-echo "$as_me: error: Sufficiently new version of libasound not found." >&2;}
- { (exit 1); exit 1; }; }
alsa_found=no
fi

12
comms/soundmodem/files/patch-libmisc_getopt.h
View File

@ -1,12 +0,0 @@
--- libmisc/getopt.h.orig Mon Sep 18 22:42:44 2006
+++ libmisc/getopt.h Tue Sep 19 17:43:44 2006
@@ -101,7 +101,9 @@
errors, only prototype getopt for the GNU C library. */
extern int getopt (int argc, char *const *argv, const char *shortopts);
#else /* not __GNU_LIBRARY__ */
+#if 0
extern int getopt ();
+#endif
#endif /* not __GNU_LIBRARY__ */
extern int getopt_long (int argc, char *const *argv, const char *shortopts,
const struct option *longopts, int *longind);

25
comms/soundmodem/files/patch-pammodem_meas.c
View File

@ -1,25 +0,0 @@
--- pammodem/meas.c.orig Tue Sep 19 17:44:23 2006
+++ pammodem/meas.c Tue Sep 19 17:51:00 2006
@@ -32,6 +32,8 @@
#ifdef HAVE_STROPTS_H
#include <stropts.h>
#endif
+#include <sys/param.h>
+#include <sys/types.h>
#ifdef HAVE_SYS_CONF_H
#include <sys/conf.h>
#endif
@@ -45,12 +47,12 @@
#include <sys/soundcard.h>
#endif
-#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <poll.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <strings.h>
#include <unistd.h>
#include <signal.h>

11
comms/soundmodem/files/patch-pskmodem_measpsk.c
View File

@ -1,11 +0,0 @@
--- pskmodem/measpsk.c.orig Tue Sep 19 17:51:37 2006
+++ pskmodem/measpsk.c Tue Sep 19 17:52:15 2006
@@ -32,6 +32,8 @@
#ifdef HAVE_STROPTS_H
#include <stropts.h>
#endif
+#include <sys/param.h>
+#include <sys/types.h>
#ifdef HAVE_SYS_CONF_H
#include <sys/conf.h>
#endif

6
comms/soundmodem/files/patch-soundcard_main.c
View File

@ -1,6 +1,6 @@
--- soundcard/main.c.orig Sun Nov 5 21:44:34 2006
+++ soundcard/main.c Sun Nov 5 21:44:53 2006
@@ -354,7 +354,7 @@
--- 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 }
};

65
comms/soundmodem/files/patch-soundcard_ptt.c
View File

@ -1,60 +1,11 @@
--- soundcard/ptt.c.orig Sat Nov 9 10:31:53 2002
+++ soundcard/ptt.c Mon Apr 23 10:24:36 2007
@@ -48,6 +48,9 @@
#ifdef HAVE_LINUX_PPDEV_H
#include <linux/ppdev.h>
+#elif defined(__FreeBSD__)
+#include <dev/ppbus/ppi.h>
+#include <dev/ppbus/ppbconf.h>
#else
#include "ppdev.h"
--- 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
@@ -62,7 +65,11 @@
struct modemparams pttparams[] = {
{ "file", "PTT Driver", "Path name of the serial or parallel port driver for outputting PTT", "none", MODEMPAR_COMBO,
+#ifdef __FreeBSD__
+ { c: { { "none", "/dev/ttyd0", "/dev/ttyd1", "/dev/ppi0", "/dev/ppi1" } } } },
+#else
{ c: { { "none", "/dev/ttyS0", "/dev/ttyS1", "/dev/parport0", "/dev/parport1" } } } },
+#endif
{ NULL }
};
@@ -87,7 +94,11 @@
if (!ioctl(fd, TIOCMBIC, &y)) {
state->fd = fd;
state->mode = serport;
+#ifdef __FreeBSD__
+ } else if (!ioctl(fd, PPISDATA, &x)) {
+#else
} else if (!ioctl(fd, PPCLAIM, 0) && !ioctl(fd, PPRDATA, &x)) {
+#endif
state->fd = fd;
state->mode = parport;
} else {
@@ -122,7 +133,11 @@
#endif
} else if (state->mode == parport) {
reg = state->ptt | (state->dcd << 1);
+#ifdef __FreeBSD__
+ ioctl(state->fd, PPISDATA, &reg);
+#else
ioctl(state->fd, PPWDATA, &reg);
+#endif
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) {
logprintf(MLOG_ERROR, "Cannot open PTT device \"%s\"\n", path);
return -1;
}
}
@@ -148,7 +163,11 @@
#endif
} else if (state->mode == parport) {
reg = state->ptt | (state->dcd << 1);
+#ifdef __FreeBSD__
+ ioctl(state->fd, PPISDATA, &reg);
+#else
ioctl(state->fd, PPWDATA, &reg);
+#endif
}
}

12
comms/soundmodem/pkg-plist Normal file
View File

@ -0,0 +1,12 @@
bin/soundmodemconfig
sbin/soundmodem
etc/rc.d/soundmodem
include/modem.h
include/simd.h
share/locale/fr/LC_MESSAGES/soundmodem.mo
share/locale/sv/LC_MESSAGES/soundmodem.mo
@dirrmtry share/locale/fr/LC_MESSAGES
@dirrmtry share/locale/sv/LC_MESSAGES
@dirrmtry share/locale/fr
@dirrmtry share/locale/sv
@dirrmtry share/locale