Bug 25716

Summary: Change of XFree86-4.0.1 ---> no xmkmf in XFree86-4.0.1,fix this for /usr/ports/chinese/chinput/work/chinput/r_xmkmf.
Product: Ports & Packages Reporter: phj <phj>
Component: Individual Port(s)Assignee: freebsd-ports (Nobody) <ports>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description phj 2001-03-12 00:30:02 UTC 
Can't be build in XFree86-4.0.1,because there is no 
xmkmf in XFree86-4.x.
This patch fixes this bug.

Fix: Patch of /usr/ports/chinese/chinput/work/chinput/r_xmkmf
diff -u output:
Comment 1 clive 2001-03-12 10:47:04 UTC 
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
Comment 2 FUJISHIMA Satsuki freebsd_committer freebsd_triage 2001-03-12 15:15:16 UTC 
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
Comment 3 Clive Lin freebsd_committer freebsd_triage 2001-03-13 16:58:47 UTC 
State Changed
From-To: open->closed

Problem fixed by adding 2 more BUILD_DEPENDS when build with 
XFree86-4-* (bento's way).