svn commit: r332930 - in head/audio/xoscope: . files

[Diane Bruce]

Author: db
Date: Tue Nov  5 23:28:09 2013
New Revision: 332930
URL: http://svnweb.freebsd.org/changeset/ports/332930

Log:
  - As described by Mamoru Iwaki <1wkmmr at 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 at gmail.com (for tcsetattr note)

Modified:
  head/audio/xoscope/Makefile
  head/audio/xoscope/files/patch-ser_unix.c
  head/audio/xoscope/pkg-plist   (contents, props changed)

Modified: head/audio/xoscope/Makefile
==============================================================================
--- head/audio/xoscope/Makefile	Tue Nov  5 23:19:56 2013	(r332929)
+++ head/audio/xoscope/Makefile	Tue Nov  5 23:28:09 2013	(r332930)
@@ -10,9 +10,8 @@ MAINTAINER=	db at 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
 

Modified: head/audio/xoscope/files/patch-ser_unix.c
==============================================================================
--- head/audio/xoscope/files/patch-ser_unix.c	Tue Nov  5 23:19:56 2013	(r332929)
+++ head/audio/xoscope/files/patch-ser_unix.c	Tue Nov  5 23:28:09 2013	(r332930)
@@ -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

Modified: head/audio/xoscope/pkg-plist
==============================================================================
--- head/audio/xoscope/pkg-plist	Tue Nov  5 23:19:56 2013	(r332929)
+++ head/audio/xoscope/pkg-plist	Tue Nov  5 23:28:09 2013	(r332930)
@@ -1 +1,2 @@
 bin/xoscope
+man/man1/xoscope.1.gz