From trevor@jpj.net  Sun Feb 11 04:47:51 2001
Return-Path: <trevor@jpj.net>
Received: from blues.jpj.net (blues.jpj.net [204.97.17.146])
	by hub.freebsd.org (Postfix) with ESMTP id 7395737B491
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 11 Feb 2001 04:47:51 -0800 (PST)
Received: from localhost (trevor@localhost)
	by blues.jpj.net (8.11.1/8.11.1) with ESMTP id f1BCloa07942
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 11 Feb 2001 07:47:50 -0500 (EST)
Message-Id: <200102110733100.6546-100000@blues.jpj.net>
Date: Sun, 11 Feb 2001 07:47:50 -0500 (EST)
From: Trevor Johnson <trevor@jpj.net>
To: <FreeBSD-gnats-submit@freebsd.org>
Subject: forgotten MFC on mkscrfil.c

>Number:         25002
>Category:       bin
>Synopsis:       forgotten MFC on mkscrfil.c
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    phk
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 11 04:50:01 PST 2001
>Closed-Date:    Sun Feb 18 17:32:55 PST 2001
>Last-Modified:  Sun Feb 18 17:35:54 PST 2001
>Originator:     Trevor Johnson (trevor@freebsd.org)
>Release:        4.2-STABLE
>Organization:
myself
>Environment:

N/A

>Description:

In RELENG_4, <machine/console.h> was removed 2001-01-16.  The
share/syscons/scrnmaps/mkscrfil.c needs to be changed to reflect this.
The HEAD branch was changed but the MFC has not been done. I marked this
as serious because it breaks "make buildworld".

>How-To-Repeat:

# cd /usr/src/share/syscons/scrnmaps; make build-tools
cc -static -O -pipe   -I/usr/src/share/syscons/scrnmaps
-DFIL=\"koi8-r2cp866\"
 -o koi8-r2cp866.mk /usr/src/share/syscons/scrnmaps/mkscrfil.c
In file included from /usr/src/share/syscons/scrnmaps/mkscrfil.c:28:
/usr/include/machine/console.h:3: #error "this file includes
<machine/console.h>
 which is deprecated, use <sys/{kb,cons,fb}io.h> instead"
In file included from /usr/src/share/syscons/scrnmaps/mkscrfil.c:31:
/usr/src/share/syscons/scrnmaps/koi8-r2cp866:27: syntax error before
`scrmap'
/usr/src/share/syscons/scrnmaps/koi8-r2cp866:28: warning: excess elements
in scalar initializer

>Fix:

Index: mkscrfil.c
===================================================================
RCS file: /home/ncvs/src/share/syscons/scrnmaps/mkscrfil.c,v
retrieving revision 1.1
diff -u -r1.1 mkscrfil.c
--- mkscrfil.c	1994/09/25 03:41:43	1.1
+++ mkscrfil.c	2001/02/11 12:18:34
@@ -25,7 +25,7 @@
  */

 #include <sys/ioctl.h>
-#include <machine/console.h>
+#include <sys/consio.h>
 #include <stdio.h>

 #include FIL


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: phk 
State-Changed-When: Sat Feb 17 12:15:28 PST 2001 
State-Changed-Why:  
I have a hard time making sense of this PR.  RELENG_4 still 
has the file, it was only removed in -current ? 



http://www.freebsd.org/cgi/query-pr.cgi?pr=25002 
State-Changed-From-To: feedback->closed 
State-Changed-By: trevor 
State-Changed-When: Sun Feb 18 17:32:55 PST 2001 
State-Changed-Why:  
I was mistaken.  The header file is there. It just wasn't found 
because I was trying to compile under -CURRENT. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=25002 
>Unformatted:
