From owner-freebsd-ports  Thu Nov 30 11:40: 7 2000
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id E2D1F37B401
	for <freebsd-ports@hub.freebsd.org>; Thu, 30 Nov 2000 11:40:01 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id eAUJe1P64314;
	Thu, 30 Nov 2000 11:40:01 -0800 (PST)
	(envelope-from gnats)
Received: from cartier.cirx.org (cartier.cirx.org [211.72.15.243])
	by hub.freebsd.org (Postfix) with ESMTP id 62D0C37B402
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 30 Nov 2000 11:33:39 -0800 (PST)
Received: (from clive@localhost)
	by cartier.cirx.org (8.11.1/8.11.1) id eAUJXbe24760;
	Fri, 1 Dec 2000 03:33:37 +0800 (CST)
	(envelope-from clive)
Message-Id: <200011301933.eAUJXbe24760@cartier.cirx.org>
Date: Fri, 1 Dec 2000 03:33:37 +0800 (CST)
From: Clive Lin <clive@CirX.ORG>
Reply-To: Clive Lin <clive@CirX.ORG>
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.113
Subject: ports/23197: Makes bento happy after machine/console.h split
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         23197
>Category:       ports
>Synopsis:       Makes bento happy after machine/console.h split
>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:   Thu Nov 30 11:40:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Clive Lin <clive@CirX.ORG>
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
This site doesnt' exist
>Environment:
System: FreeBSD cartier.cirx.org 5.0-CURRENT FreeBSD 5.0-CURRENT #1: Tue Nov 28 02:07:36 CST 2000 root@cartier.cirx.org:/home/nexus/obj/home/nexus/src/sys/GENE i386

>Description:
	After the machine/console.h split, this port won't build.
	Some tunning to makes build possible on both CURRENT and RELENG_4.

>How-To-Repeat:
	Apply the patch
>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/chinese/big5con/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	2000/07/19 15:35:27	1.14
+++ Makefile	2000/11/30 19:29:11
@@ -28,6 +28,12 @@
 # Fix some bugs
 # ftp://bsd.sinica.edu.tw/pub/FreeBSD/taiwan/users/woju/source/b5c-d2e.patch
 
+.include <bsd.port.pre.mk>
+post-patch:
+.if ${OSVERSION} > 500013
+	@perl -pi -e 's,machine/console.h>,sys/consio.h>\n#include\t<sys/kbio.h>\n,' ${WRKSRC}/include/*
+	@perl -pi -e 's,machine/console.h>,sys/consio.h>\n#include\t<sys/kbio.h>\n,' ${WRKSRC}/src/*
+.endif
 pre-install:
 	@if [ ! -f ${PREFIX}/lib/fonts/kc16.smf ]; then \
 		tar xvfzp ${DISTDIR}/b5cbin-pa.tgz -C ${PREFIX}; \
@@ -36,4 +42,4 @@
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message