- As described by Mamoru Iwaki <1wkmmr@gmail.com> in email

> I have just looked around audio/xoscope, not compiling it yet.  Then, I
> found a strange line in files/patch-ser_unix.c, as follows:
>
> 34   +#ifdef BSD
> 35   +    if (tcgetattr(fd, &svbuf) < 0 ) {
> 36   +#else
> 37        if (ioctl(fd, TCSETA, &svbuf) < 0) {
> 38   +#endif
>
> I wonder tcgetattr(...) in line 35 should be tcsetattr(...).

It should be, but the fd involved was for hardware that is no longer
made but it is a trivial fix so fixed anyway.

- Convert to stagedir while in here.

Submitted by:	1wkmmr@gmail.com (for tcsetattr note)
This commit is contained in:
Diane Bruce 2013-11-05 23:28:09 +00:00
parent ef25aae5a4
commit b9c7e063d6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=332930
3 changed files with 4 additions and 4 deletions

View file

@ -10,9 +10,8 @@ MAINTAINER= db@FreeBSD.org
COMMENT= Sound card oscilloscope
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX}
CONFIGURE_ARGS= --prefix=${STAGEDIR}${PREFIX} --sysconfdir=${STAGEDIR}${PREFIX}
USES= gmake pkgconfig
NO_STAGE= yes
USE_GNOME= gtk20
USE_XORG= x11

View file

@ -1,5 +1,5 @@
--- ser_unix.c.orig 2008-12-17 12:46:15.000000000 -0500
+++ ser_unix.c 2012-11-04 09:22:00.000000000 -0500
+++ ser_unix.c 2013-11-05 18:03:15.000000000 -0500
@@ -14,7 +14,14 @@
#include <errno.h>
#include <unistd.h>
@ -32,7 +32,7 @@
{
if (fd > 0) {
+#ifdef BSD
+ if (tcgetattr(fd, &svbuf) < 0 ) {
+ if (tcsetattr(fd, TCSANOW, &svbuf) < 0 ) {
+#else
if (ioctl(fd, TCSETA, &svbuf) < 0) {
+#endif

View file

@ -1 +1,2 @@
bin/xoscope
man/man1/xoscope.1.gz