Date: Sun, 24 Nov 2002 16:51:45 +0100 (CET) From: Volker Stolz <vs@foldr.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: obraun@FreeBSD.org Subject: ports/45677: [patch] misc/tcb: fix console.h/union wait usage on -current Message-ID: <200211241551.gAOFpjoN001262@monster.theater.foldr.org>
next in thread | raw e-mail | index | archive | help
>Number: 45677
>Category: ports
>Synopsis: [patch] misc/tcb: fix console.h/union wait usage on -current
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 24 08:00:03 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Volker Stolz
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD monster.theater.foldr.org 5.0-CURRENT FreeBSD 5.0-CURRENT #1: Sun Nov 24 14:40:01 CET 2002 root@monster.theater.foldr.org:/usr/obj/usr/src/sys/MONSTER i386
>Description:
- console.h is spelled consio.h here.
- Fix union wait
- Remove pointers to no longer existent web page
Tested on: -CURRENT, -STABLE
Fix
>How-To-Repeat:
>Fix:
New files:
- patch-Makefile
- patch-src-tcb.c
diff -urN tcb.orig/Makefile tcb/Makefile
--- tcb.orig/Makefile Sun Nov 24 16:35:37 2002
+++ tcb/Makefile Sun Nov 24 16:36:52 2002
@@ -8,8 +8,7 @@
PORTNAME= tcb
PORTVERSION= 1.4a
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
- http://www.osk.3web.ne.jp/~moody/tcbj/
+MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= utils/file
MAINTAINER= ports@FreeBSD.org
diff -urN tcb.orig/files/patch-Makefile tcb/files/patch-Makefile
--- tcb.orig/files/patch-Makefile Thu Jan 1 01:00:00 1970
+++ tcb/files/patch-Makefile Sun Nov 24 15:49:18 2002
@@ -0,0 +1,11 @@
+--- Makefile.orig Sun Nov 24 15:48:55 2002
++++ Makefile Sun Nov 24 15:49:08 2002
+@@ -6,7 +6,7 @@
+
+ src/tcb: src/config.h
+ @echo 'Making tcb:'
+- @cd src; make; cd ..
++ @cd src; $(MAKE); cd ..
+
+ src/config.h: config.sh
+ @./config.sh $(USR_DIR) # $(USR_DIR): Debian (Linux)
diff -urN tcb.orig/files/patch-src-tcb.c tcb/files/patch-src-tcb.c
--- tcb.orig/files/patch-src-tcb.c Thu Jan 1 01:00:00 1970
+++ tcb/files/patch-src-tcb.c Sun Nov 24 15:39:00 2002
@@ -0,0 +1,20 @@
+--- src/tcb.c.orig Mon Nov 23 15:51:15 1998
++++ src/tcb.c Sun Nov 24 15:38:49 2002
+@@ -12,7 +12,7 @@
+ #include <sys/vt.h>
+ #include <sys/kd.h>
+ #else
+-#include <machine/console.h>
++#include <sys/consio.h>
+ #endif linux
+
+ static struct {
+@@ -574,7 +574,7 @@
+ void sig_child(int dummy)
+ {
+ int pid;
+- union wait status;
++ int status;
+
+ while ((pid = wait3((int*)&status, WNOHANG, (struct rusage *)0)) > 0) ;
+ }
diff -urN tcb.orig/pkg-descr tcb/pkg-descr
--- tcb.orig/pkg-descr Sun Nov 24 16:29:05 2002
+++ tcb/pkg-descr Sun Nov 24 16:35:27 2002
@@ -1,4 +1,2 @@
Tcb is a file viewer that works on a terminal. It allows
view file in ASCII or HEX format.
-
-WWW: http://www.osk.3web.ne.jp/~moody/tcbj/
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211241551.gAOFpjoN001262>