From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Mar 26 18:20:15 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 997F516A404 for ; Mon, 26 Mar 2007 18:20:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 7E7E513C4D5 for ; Mon, 26 Mar 2007 18:20:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l2QIK5JC015295 for ; Mon, 26 Mar 2007 18:20:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l2QIK51S015294; Mon, 26 Mar 2007 18:20:05 GMT (envelope-from gnats) Resent-Date: Mon, 26 Mar 2007 18:20:05 GMT Resent-Message-Id: <200703261820.l2QIK51S015294@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ed Schouten Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2148F16A405 for ; Mon, 26 Mar 2007 18:12:36 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from palm.hoeg.nl (palm.hoeg.nl [83.98.131.212]) by mx1.freebsd.org (Postfix) with ESMTP id E291C13C45B for ; Mon, 26 Mar 2007 18:12:35 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: by palm.hoeg.nl (Postfix, from userid 1000) id 252DA1CC79; Mon, 26 Mar 2007 20:12:35 +0200 (CEST) Message-Id: <20070326181235.252DA1CC79@palm.hoeg.nl> Date: Mon, 26 Mar 2007 20:12:35 +0200 (CEST) From: Ed Schouten To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/110875: [net/pmf] Use termios.h instead of sgtty.h X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Ed Schouten List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Mar 2007 18:20:15 -0000 >Number: 110875 >Category: ports >Synopsis: [net/pmf] Use termios.h instead of sgtty.h >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Mar 26 18:20:04 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Ed Schouten >Release: FreeBSD 6.2-STABLE i386 >Organization: >Environment: System: FreeBSD palm.hoeg.nl 6.2-STABLE FreeBSD 6.2-STABLE #0: Sun Feb 11 22:32:09 CET 2007 root@palm.hoeg.nl:/usr/obj/usr/src/sys/PALM i386 >Description: The pmf application makes use of sgtty or termio in a very simple way. It isn't hard to port it to use of termios, making it work on systems that use kernels without COMPAT_43/COMPAT_43TTY. >How-To-Repeat: >Fix: Apply the following patch: --- net/pmf/files/patch-ac Fri Aug 25 16:07:32 2000 +++ net/pmf/files/patch-ac Mon Mar 26 20:07:20 2007 @@ -18,7 +18,7 @@ #define SYSTEM_NEWS_FILE "NEWS" #define SYSTEM_HELP_DIR "helpfiles" #define SYSTEM_SOUND_DIR "soundfiles" -@@ -63,7 +65,9 @@ +@@ -63,14 +65,20 @@ #define X_OUTPUT_PROGRAM "cat" /* What system? Define one either BSD or SYSV:*/ @@ -28,7 +28,8 @@ /* #define SYSV */ /* What ioctl do we use for the ttys? */ -@@ -71,6 +75,10 @@ +-#ifdef BSD ++#if defined(BSD) && !defined(__FreeBSD__) # define USE_TIOCGETP #else # define USE_TCGETA --- net/pmf/files/patch-ad Sun Nov 24 00:50:39 2002 +++ net/pmf/files/patch-ad Mon Mar 26 20:07:20 2007 @@ -1,7 +1,10 @@ --- main.c.orig Sun Sep 22 12:13:43 1991 +++ main.c Fri Feb 11 04:14:00 2000 -@@ -15,6 +15,7 @@ - #include +@@ -12,9 +12,9 @@ + #include + #include + #include +-#include #include #include +#include --- net/pmf/files/patch-tty.c Thu Jan 1 01:00:00 1970 +++ net/pmf/files/patch-tty.c Mon Mar 26 20:07:20 2007 @@ -0,0 +1,28 @@ +--- tty.c Fri Oct 29 10:09:06 1993 ++++ tty.c Mon Mar 26 20:02:26 2007 +@@ -18,6 +18,9 @@ + /* Added by dodurham@stimpy.ualr.edu for Linux machines */ + #ifdef SYSV + # include ++#elif defined(__FreeBSD__) ++# include ++# define termio termios + #else + # include + #endif +@@ -161,13 +164,13 @@ + + pmf_save_terminal() + { +- if (ioctl(0, TCGETA, &terminal_state) == -1) ++ if (tcgetattr(0, &terminal_state) == -1) + fatal("ioctl TCGETA failed in pmf_save_terminal."); + } /* pmf_save_terminal */ + + pmf_restore_terminal() + { +- if (ioctl(0, TCSETA, &terminal_state) == -1) ++ if (tcsetattr(0, TCSANOW, &terminal_state) == -1) + fatal("ioctl TCSETA failed in pmf_restore_terminal."); + } /* pmf_restore_terminal */ + >Release-Note: >Audit-Trail: >Unformatted: