From phj@cn.FreeBSD.org  Sun Mar 11 16:26:56 2001
Return-Path: <phj@cn.FreeBSD.org>
Received: from cn.FreeBSD.org (cn.freebsd.org [202.103.100.254])
	by hub.freebsd.org (Postfix) with ESMTP id E449137B718
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 11 Mar 2001 16:26:54 -0800 (PST)
	(envelope-from phj@cn.FreeBSD.org)
Received: (from phj@localhost)
	by cn.FreeBSD.org (8.9.3/8.9.3) id IAA16023;
	Mon, 12 Mar 2001 08:26:47 +0800 (CST)
	(envelope-from phj)
Message-Id: <200103120026.IAA16023@cn.FreeBSD.org>
Date: Mon, 12 Mar 2001 08:26:47 +0800 (CST)
From: phj@cn.freebsd.org
Reply-To: phj@cn.freebsd.org
To: FreeBSD-gnats-submit@freebsd.org
Subject: Patch of chinput-2.1
X-Send-Pr-Version: 3.2

>Number:         25716
>Category:       ports
>Synopsis:       Change of XFree86-4.0.1 ---> no xmkmf in XFree86-4.0.1,fix this for /usr/ports/chinese/chinput/work/chinput/r_xmkmf.
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 11 16:30:02 PST 2001
>Closed-Date:    Tue Mar 13 08:58:47 PST 2001
>Last-Modified:  Tue Mar 13 09:00:13 PST 2001
>Originator:     Peng HaiJie
>Release:        FreeBSD 3.5-STABLE i386
>Organization:
cn.FreeBSD.org
>Environment:

	

>Description:
Can't be build in XFree86-4.0.1,because there is no 
xmkmf in XFree86-4.x.
This patch fixes this bug.

	

>How-To-Repeat:

	

>Fix:
Patch of /usr/ports/chinese/chinput/work/chinput/r_xmkmf
diff -u output:

--- r_xmkmf.orig        Mon Mar 12 08:17:49 2001
+++ r_xmkmf     Mon Mar 12 08:17:55 2001
@@ -1,6 +1,8 @@
 #!/bin/sh
 ALL_IMAKEFILE_PATH=`find . -name Imakefile -print`
 CWD=`pwd`
+FLAG="-DUseInstalled -I/usr/X11R6/lib/X11/config"
+
 for item in ${ALL_IMAKEFILE_PATH};do
        tmp_dir=`dirname ${item}`
        cd ${tmp_dir}
@@ -8,6 +10,8 @@
 #              rm Makefile
 #              cvs remove Makefile
 #      fi
-       xmkmf
+#      xmkmf
+       echo ${tmp_dir}
+       imake ${FLAG}   
        cd ${CWD}
 done

	

>Release-Note:
>Audit-Trail:

From: Clive Lin <clive@CirX.ORG>
To: phj@cn.freebsd.org
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/25716: Patch of chinput-2.1
Date: Mon, 12 Mar 2001 18:47:04 +0800

 Hi,
 
 On Mon, Mar 12, 2001 at 08:26:47AM +0800, phj@cn.freebsd.org wrote:
 > >Description:
 > Can't be build in XFree86-4.0.1,because there is no 
 > xmkmf in XFree86-4.x.
 > This patch fixes this bug.
 
 Besides the r_xmkmf diff below, can we add something more specific to
 narrow down in which XFree86 version we should apply this diff ?
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/chinese/chinput/Makefile,v
 retrieving revision 1.6
 diff -u -r1.6 Makefile
 --- Makefile	2000/11/16 15:36:06	1.6
 +++ Makefile	2001/03/12 10:28:50
 @@ -19,7 +19,13 @@
  
  WRKSRC=		${WRKDIR}/${PORTNAME}
  
 +.include <bsd.port.pre.mk>
 +
 +.if (${XFREE86_VERSION} == 4)
 +EXTRA_PATCHES=	${FILESDIR}/extra-patch-r_xmkmf
 +.endif
 +
  post-extract:
  	find ${WRKSRC} -name CVS | xargs ${RM} -rf
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 
 > >How-To-Repeat:
 > 
 > 	
 > 
 > >Fix:
 > Patch of /usr/ports/chinese/chinput/work/chinput/r_xmkmf
 > diff -u output:
 
 -- 
 pub  1024D/F8D2B472 2000-08-05 Clive Lin <clive@CirX.ORG>
      Key fingerprint = 7F9D 57A8 55C7 AA18 49B5  3820 570B 27F6 F8D2 B472

From: FUJISHIMA Satsuki <sf@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/25716: Patch of chinput-2.1
Date: Tue, 13 Mar 2001 00:15:16 +0900

 Correct fix is here.
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/chinese/chinput/Makefile,v
 retrieving revision 1.6
 diff -u -u -2 -r1.6 Makefile
 --- Makefile	2000/11/16 15:36:06	1.6
 +++ Makefile	2001/03/12 15:11:39
 @@ -16,4 +16,8 @@
  MAINTAINER=	phj@cn.FreeBSD.org
  
 +.if defined(XFREE86_VERSION) && ${XFREE86_VERSION} == 4
 +BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake-4
 +.endif
 +
  USE_XLIB=	yes
  
State-Changed-From-To: open->closed 
State-Changed-By: clive 
State-Changed-When: Tue Mar 13 08:58:47 PST 2001 
State-Changed-Why:  
Problem fixed by adding 2 more BUILD_DEPENDS when build with 
XFree86-4-* (bento's way). 

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