From owner-svn-ports-head@FreeBSD.ORG Tue Nov 5 23:28:11 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F12F4925; Tue, 5 Nov 2013 23:28:10 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C46E22F31; Tue, 5 Nov 2013 23:28:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA5NSAcL089500; Tue, 5 Nov 2013 23:28:10 GMT (envelope-from db@svn.freebsd.org) Received: (from db@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA5NSAdA089497; Tue, 5 Nov 2013 23:28:10 GMT (envelope-from db@svn.freebsd.org) Message-Id: <201311052328.rA5NSAdA089497@svn.freebsd.org> From: Diane Bruce Date: Tue, 5 Nov 2013 23:28:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332930 - in head/audio/xoscope: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2013 23:28:11 -0000 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@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) 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@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 #include @@ -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