From dryice@HotPoP.com  Thu Jan  1 18:40:41 2004
Return-Path: <dryice@HotPoP.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 02BCB16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 Jan 2004 18:40:41 -0800 (PST)
Received: from babyruth.hotpop.com (babyruth.hotpop.com [204.57.55.14])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0FB5743D49
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 Jan 2004 18:40:39 -0800 (PST)
	(envelope-from dryice@HotPoP.com)
Received: from hotpop.com (kubrick.hotpop.com [204.57.55.16])
	by babyruth.hotpop.com (Postfix) with SMTP id 6DB9B212276
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  2 Jan 2004 02:21:06 +0000 (UTC)
Received: from hotpop.com (unknown [219.146.252.75])
	by smtp-1.hotpop.com (Postfix) with ESMTP
	id C24421A0319; Fri,  2 Jan 2004 02:11:59 +0000 (UTC)
Received: by hotpop.com (sSMTP sendmail emulation); Fri,  2 Jan 2004 10:24:33 +0800
Message-Id: <20040102021201.C24421A0319@smtp-1.hotpop.com>
Date: Fri,  2 Jan 2004 10:24:33 +0800
From: Dryice Liu <dryice@HotPoP.com>
Reply-To: Dryice Liu <dryice@liu.com.cn>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Dryice Liu <dryice@liu.com.cn>
Subject: [update] chinese/fcitx: take MAINTAINER and upgrade to 1.8.5
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         60808
>Category:       ports
>Synopsis:       [update] chinese/fcitx: take MAINTAINER and upgrade to 1.8.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 01 18:50:08 PST 2004
>Closed-Date:    Fri Jan 02 06:30:48 PST 2004
>Last-Modified:  Fri Jan 02 06:30:48 PST 2004
>Originator:     Dryice Liu
>Release:        FreeBSD 5.1-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD dryice.3322.org 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #5: Wed Nov 26 23:55:53 CST 2003 ddliu@dryice.3322.org:/usr/obj/usr/src/sys/SERVER i386


>Description:
        changes:                                                                                                                            
        - take MAINTAINER, thanks for previous maintainer Statue's great work!                                                      
        - upgrade to 1.8.5                                                                                                          
        - update MASTER_SITES                                                                                                       
        - add to x11 CATAGORIES  

>How-To-Repeat:
	N/A
>Fix:


--- fcitx.diff begins here ---
diff -ruN fcitx.orig/Makefile fcitx/Makefile
--- fcitx.orig/Makefile	Thu Jan  1 20:22:01 2004
+++ fcitx/Makefile	Thu Jan  1 22:20:50 2004
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	fcitx
-PORTVERSION=	1.8.4
-CATEGORIES=	chinese
-MASTER_SITES=	http://www.fcitx.org/ \
-		ftp://freebsd.sinica.edu.tw/pub/statue/fcitx/
+PORTVERSION=	1.8.5
+CATEGORIES=	chinese x11
+MASTER_SITES=	http://www.fcitx.org/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dryice@liu.com.cn
 COMMENT=	A simple and fast GBK Chinese XIM server
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
@@ -22,7 +21,7 @@
 USE_REINPLACE=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's#usr/share#${LOCALBASE}/share#g' ${WRKSRC}/Makefile ${WRKSRC}/ime.h ${WRKSRC}/data/fcitx
+	@${REINPLACE_CMD} -e 's#usr/share#${LOCALBASE}/share#g' ${WRKSRC}/Makefile ${WRKSRC}/ime.h
 	@${REINPLACE_CMD} -e 's#usr/bin#${LOCALBASE}/bin#g' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's#zh_CN.GB2312#zh_CN.EUC#g' ${WRKSRC}/window.c
 	@${REINPLACE_CMD} -e 's#zh_CN.gb2312#zh_CN.EUC#g' ${WRKSRC}/xim.c
diff -ruN fcitx.orig/distinfo fcitx/distinfo
--- fcitx.orig/distinfo	Thu Jan  1 20:22:01 2004
+++ fcitx/distinfo	Thu Jan  1 20:28:23 2004
@@ -1 +1 @@
-MD5 (fcitx-1.8.4.tar.bz2) = 8b7bd99df70b57c4b8ad085ea25d88db
+MD5 (fcitx-1.8.5.tar.bz2) = c2b7c48b906c4812f305fc9f5a605458
diff -ruN fcitx.orig/files/patch-Makefile fcitx/files/patch-Makefile
--- fcitx.orig/files/patch-Makefile	Thu Jan  1 20:22:01 2004
+++ fcitx/files/patch-Makefile	Thu Jan  1 21:21:20 2004
@@ -1,5 +1,5 @@
---- Makefile.orig	Wed Mar 26 02:29:39 2003
-+++ Makefile	Wed Mar 26 02:41:59 2003
+--- Makefile.orig	Thu Jan  1 21:11:24 2004
++++ Makefile	Thu Jan  1 21:14:40 2004
 @@ -1,12 +1,12 @@
  CC = gcc
  
@@ -9,7 +9,7 @@
 -INC =  -I/usr/X11R6/include -I.
 +INC =  -I${LOCALBASE}/include -I${X11BASE}/include -I.
  
- SRC = main.c ime.c AddPhraseWindow.c IC.c InputWindow.c MainWindow.c MyErrorsHandlers.c punc.c py.c PYFA.c pyParser.c pyMapTable.c SetLocale.c tools.c wbx.c window.c xim.c qw.c sp.c py-2.c
+ SRC = main.c ime.c KeyList.c AddPhraseWindow.c IC.c InputWindow.c MainWindow.c MyErrorsHandlers.c punc.c py.c PYFA.c pyParser.c pyMapTable.c SetLocale.c tools.c wbx.c window.c xim.c qw.c sp.c py-2.c
  
 -LIB = -L/usr/X11R6/lib -lX11
 +LIB = -L${LOCALBASE}/lib -L${X11BASE}/lib -lX11 -liconv
diff -ruN fcitx.orig/pkg-plist fcitx/pkg-plist
--- fcitx.orig/pkg-plist	Thu Jan  1 20:22:01 2004
+++ fcitx/pkg-plist	Thu Jan  1 22:31:17 2004
@@ -5,8 +5,4 @@
 share/fcitx/pyphrase.mb
 share/fcitx/sp.dat
 share/fcitx/wbx.mb
-share/fcitx/fcitx
-share/fcitx/fonts/fonts.dir
-share/fcitx/fonts/gbkst16.pcf.gz
-@dirrm share/fcitx/fonts
 @dirrm share/fcitx
--- fcitx.diff ends here ---



>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Fri Jan 2 06:30:39 PST 2004 
State-Changed-Why:  
Committed, thanks! 

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