From statue@freebsd.sinica.edu.tw  Mon Nov 25 02:25:37 2002
Return-Path: <statue@freebsd.sinica.edu.tw>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C32FB37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 25 Nov 2002 02:25:37 -0800 (PST)
Received: from freebsd.sinica.edu.tw (freebsd.sinica.edu.tw [140.109.13.51])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5FFD643ED8
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 25 Nov 2002 02:25:37 -0800 (PST)
	(envelope-from statue@freebsd.sinica.edu.tw)
Received: by freebsd.sinica.edu.tw (Postfix, from userid 1014)
	id 2F9CBDE; Mon, 25 Nov 2002 18:25:30 +0800 (CST)
Message-Id: <20021125102530.2F9CBDE@freebsd.sinica.edu.tw>
Date: Mon, 25 Nov 2002 18:25:30 +0800 (CST)
From: Statue <statue@freebsd.sinica.edu.tw>
Reply-To: Statue <statue@freebsd.sinica.edu.tw>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: chinese/zhcon
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         45708
>Category:       ports
>Synopsis:       Update port: chinese/zhcon
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 25 02:30:01 PST 2002
>Closed-Date:    Wed Nov 27 18:31:52 PST 2002
>Last-Modified:  Wed Nov 27 18:31:52 PST 2002
>Originator:     Statue
>Release:        FreeBSD 4.7-PRERELEASE i386
>Organization:
[MAINTAINER]
>Environment:
System: FreeBSD freebsd.sinica.edu.tw 4.7-PRERELEASE FreeBSD 4.7-PRERELEASE #2: Mon Sep 9 10:45:46 CST 2002 ycheng@freebsd.sinica.edu.tw:/usr/src/sys/compile/GENERIC i386


	
>Description:
fix -current build error
	
>How-To-Repeat:
	
>Fix:

diff -ruN zhcon.orig/Makefile zhcon/Makefile
--- zhcon.orig/Makefile	Mon Nov 25 17:19:29 2002
+++ zhcon/Makefile	Mon Nov 25 17:23:13 2002
@@ -20,6 +20,7 @@
 CONFIGURE_ARGS=	--with-included-gettext=${LOCALBASE}
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
+REINPLACE_ARGS=	# empty
 
 MAN1=		zhcon.1
 
@@ -27,7 +28,10 @@
 
 post-patch:
 .if ${OSVERSION} > 500012
-	@${FIND} ${WRKSRC}/src/ -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e 's,machine/console.h>,sys/consio.h>\n#include <sys/fbio.h>\n#include <sys/kbio.h>\n,'
+.for i in src/main.cpp src/zhcon.cpp src/inputmanager.cpp src/display/fbdev.cpp
+	${REINPLACE_CMD} -e 's,machine/console.h>,sys/consio.h>@#include <sys/fbio.h>@#include <sys/kbio.h>@,' ${WRKSRC}/${i} | tr '@' '\n' > ${WRKSRC}/${i}.bak && \
+	${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i}
+.endfor
 .endif
 
 .include <bsd.port.post.mk>
diff -ruN zhcon.orig/files/patch-src::inputserver.cpp zhcon/files/patch-src::inputserver.cpp
--- zhcon.orig/files/patch-src::inputserver.cpp	Thu Jan  1 08:00:00 1970
+++ zhcon/files/patch-src::inputserver.cpp	Mon Nov 25 18:20:22 2002
@@ -0,0 +1,16 @@
+--- src/inputserver.cpp.orig	Sat Dec 29 10:59:56 2001
++++ src/inputserver.cpp	Mon Nov 25 18:17:08 2002
+@@ -29,11 +29,11 @@
+     return mImmInfo;
+ }
+ 
+-inline bool InputServer::IsFullChar() {
++bool InputServer::IsFullChar() {
+     return mIsFullChar;
+ }
+ 
+-inline bool InputServer::IsFullComma() {
++bool InputServer::IsFullComma() {
+      return mIsFullComma;
+ }
+ void InputServer::SetClientBufLen(int len){
diff -ruN zhcon.orig/files/patch-src::window.cpp zhcon/files/patch-src::window.cpp
--- zhcon.orig/files/patch-src::window.cpp	Thu Jan  1 08:00:00 1970
+++ zhcon/files/patch-src::window.cpp	Mon Nov 25 18:20:03 2002
@@ -0,0 +1,19 @@
+--- src/window.cpp.orig	Sat Dec 29 10:59:55 2001
++++ src/window.cpp	Mon Nov 25 18:19:08 2002
+@@ -127,14 +127,14 @@
+     }
+ }
+ 
+-inline int Window::ColsOvered() {
++int Window::ColsOvered() {
+     int cols = Width() / gpScreen->BlockWidth();
+     if (Width() % gpScreen->BlockWidth())
+         cols++;
+     return cols;
+ }
+ 
+-inline int Window::RowsOvered() {
++int Window::RowsOvered() {
+     int rows = Height() / gpScreen->BlockHeight();
+     if (Height() % gpScreen->BlockHeight())
+         rows++;
	


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: vanilla 
State-Changed-When: Wed Nov 27 18:31:25 PST 2002 
State-Changed-Why:  
Duplicate of ports/45797. 

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