From owner-freebsd-ports Sun Nov 24 8: 0: 7 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B701A37B401 for ; Sun, 24 Nov 2002 08:00:04 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D97A143EA3 for ; Sun, 24 Nov 2002 08:00:03 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gAOG03x3014179 for ; Sun, 24 Nov 2002 08:00:03 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gAOG034G014178; Sun, 24 Nov 2002 08:00:03 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9A3D37B401; Sun, 24 Nov 2002 07:51:52 -0800 (PST) Received: from lambda.foldr.org (lambda.foldr.org [198.78.66.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17AD343E4A; Sun, 24 Nov 2002 07:51:52 -0800 (PST) (envelope-from vs@foldr.org) Received: from theater.foldr.org (pD95099FD.dip.t-dialin.net [217.80.153.253]) by lambda.foldr.org (8.12.3/8.11.6) with ESMTP id gAOFpmjN051053 (using TLSv1/SSLv3 with cipher EDH-RSA-DES-CBC3-SHA (168 bits) verified OK); Sun, 24 Nov 2002 16:51:51 +0100 (CET) (envelope-from vs@foldr.org) Received: from monster.theater.foldr.org (monster.theater.foldr.org [IPv6:3ffe:b80:2de:3:2e0:29ff:fe98:abca]) by theater.foldr.org (8.12.5/8.12.5) with ESMTP id gAOFq4Ba078614 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=OK); Sun, 24 Nov 2002 16:52:05 +0100 (CET) (envelope-from vs@monster.theater.foldr.org) Received: (from vs@localhost) by monster.theater.foldr.org (8.12.6/8.12.6/Submit) id gAOFpjoN001262; Sun, 24 Nov 2002 16:51:45 +0100 (CET) (envelope-from vs) Message-Id: <200211241551.gAOFpjoN001262@monster.theater.foldr.org> Date: Sun, 24 Nov 2002 16:51:45 +0100 (CET) From: Volker Stolz Reply-To: Volker Stolz To: FreeBSD-gnats-submit@FreeBSD.org Cc: obraun@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/45677: [patch] misc/tcb: fix console.h/union wait usage on -current Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >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 + #include + #else +-#include ++#include + #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