From nobody@FreeBSD.org  Sat Oct 17 00:41:54 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ABD991065670
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 17 Oct 2009 00:41:54 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 9ADF48FC1A
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 17 Oct 2009 00:41:54 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n9H0fqGs089165
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 17 Oct 2009 00:41:53 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n9H0fqM0089147;
	Sat, 17 Oct 2009 00:41:52 GMT
	(envelope-from nobody)
Message-Id: <200910170041.n9H0fqM0089147@www.freebsd.org>
Date: Sat, 17 Oct 2009 00:41:52 GMT
From: "Denise H. G." <darcsis@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: fcitx update to 3.6.2
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         139692
>Category:       ports
>Synopsis:       chinese/fcitx update to 3.6.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 17 00:50:01 UTC 2009
>Closed-Date:    Sun Oct 18 06:41:50 UTC 2009
>Last-Modified:  Sun Oct 18 06:50:02 UTC 2009
>Originator:     Denise H. G.
>Release:        FreeBSD 8.0-RC1
>Organization:
>Environment:
FreeBSD pluton.xbsd.name 8.0-RC1 FreeBSD 8.0-RC1 #0: Wed Oct 14 04:48:20 CST 2009     dhg@pluton.xbsd.name:/opt/obj/sysbld/usr/src/sys/pluton-amd64  amd64
>Description:
update fcitx to 3.6.2
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN fcitx.old/Makefile fcitx/Makefile
--- fcitx.old/Makefile	2008-12-18 10:23:59.000000000 +0800
+++ fcitx/Makefile	2009-10-16 20:33:00.624307000 +0800
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	fcitx
-PORTVERSION=	3.5
-PORTREVISION=	1
+PORTVERSION=	3.6.2
 CATEGORIES=	chinese x11
 MASTER_SITES=	http://www.fcitx.org/download/ \
 		ftp://mirrors.redv.com/pub/fcitx/ \
 		${MASTER_SITE_LOCAL} \
 		http://dryice.name/computer/FreeBSD/distfiles/
 MASTER_SITE_SUBDIR=	dryice
-DISTNAME= fcitx-3.5-BlackFri
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple and fast GBK Chinese XIM server
@@ -32,6 +30,9 @@
 	@${REINPLACE_CMD} -e 's#zh_CN.GB2312#zh_CN.eucCN#g' ${WRKSRC}/src/xim.c
 	@${REINPLACE_CMD} -e 's#zh_CN.gb2312#zh_CN.eucCN#g' ${WRKSRC}/src/ui.c ${WRKSRC}/src/tools.c
 
+pre-install:
+	@${CHMOD} 0755 ${WRKSRC}/install-sh
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff -ruN fcitx.old/distinfo fcitx/distinfo
--- fcitx.old/distinfo	2007-12-25 17:14:42.000000000 +0800
+++ fcitx/distinfo	2009-10-16 20:20:55.489357000 +0800
@@ -1,3 +1,3 @@
-MD5 (fcitx-3.5-BlackFri.tar.bz2) = a04233de3fb56fee6e583c2765616032
-SHA256 (fcitx-3.5-BlackFri.tar.bz2) = 07dfb11655097a15be57f38d33ef04c5db98adb7eb5c3326d9ed1acdf3bc80be
-SIZE (fcitx-3.5-BlackFri.tar.bz2) = 5719492
+MD5 (fcitx-3.6.2.tar.bz2) = 6a66cda4a8221f1d6685e5a400d8763e
+SHA256 (fcitx-3.6.2.tar.bz2) = 8f757cfb7e1611546f6e736424826c45c5811492d5fc1920ec9cbc6735210e08
+SIZE (fcitx-3.6.2.tar.bz2) = 6347362
diff -ruN fcitx.old/files/patch-doc-Makefile.in fcitx/files/patch-doc-Makefile.in
--- fcitx.old/files/patch-doc-Makefile.in	2006-08-23 14:39:51.000000000 +0800
+++ fcitx/files/patch-doc-Makefile.in	2009-10-16 20:25:25.000000000 +0800
@@ -1,11 +1,11 @@
---- doc/Makefile.in.orig	Fri Aug 11 00:40:27 2006
-+++ doc/Makefile.in	Wed Aug 23 12:44:19 2006
-@@ -148,7 +148,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- doc/Makefile.in.orig	2009-10-16 20:23:38.303051048 +0800
++++ doc/Makefile.in	2009-10-16 20:24:51.132275852 +0800
+@@ -141,7 +141,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
 -docdir = $(pkgdatadir)/doc
 +docdir = $(datadir)/doc/@PACKAGE@
- doc_DATA = \
-         cjkvinput.txt wb_fh.htm fcitx3.pdf pinyin.txt
- 
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
diff -ruN fcitx.old/files/patch-xpm-Makefile.in fcitx/files/patch-xpm-Makefile.in
--- fcitx.old/files/patch-xpm-Makefile.in	2006-08-23 14:39:51.000000000 +0800
+++ fcitx/files/patch-xpm-Makefile.in	2009-10-16 20:27:08.000000000 +0800
@@ -1,11 +1,11 @@
---- xpm/Makefile.in.orig	Wed Aug 23 12:45:40 2006
-+++ xpm/Makefile.in	Wed Aug 23 12:45:08 2006
-@@ -148,7 +148,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- xpm/Makefile.in.orig	2009-10-08 22:08:06.000000000 +0800
++++ xpm/Makefile.in	2009-10-16 20:26:46.697277419 +0800
+@@ -172,7 +172,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -xpmdir = $(pkgdatadir)/xpm
-+xpmdir = 
- xpm_DATA = 
- EXTRA_DIST = $(xpm_DATA)
- all: all-am
++xpmdir =
+ xpm_DATA = about_icon.xpm chnPunc.xpm engPunc.xpm ft-0.xpm ft-1.xpm \
+ 	fullcorner.xpm gbk-0.xpm gbk-1.xpm halfcorner.xpm lock-0.xpm \
+ 	lock-1.xpm logo.xpm lx-0.xpm lx-1.xpm next.xpm prev.xpm vk-1.xpm vk.xpm
diff -ruN fcitx.old/pkg-plist fcitx/pkg-plist
--- fcitx.old/pkg-plist	2007-12-25 17:14:42.000000000 +0800
+++ fcitx/pkg-plist	2009-10-16 20:42:30.561950000 +0800
@@ -8,26 +8,44 @@
 bin/readPYMB
 bin/txt2mb
 bin/win2fcitx
-%%DATADIR%%/data/AutoEng.dat
-%%DATADIR%%/data/cj.mb
-%%DATADIR%%/data/config
-%%DATADIR%%/data/erbi.mb
-%%DATADIR%%/data/gbks2t.tab
-%%DATADIR%%/data/punc.mb
-%%DATADIR%%/data/pySym.mb
-%%DATADIR%%/data/pybase.mb
-%%DATADIR%%/data/pyphrase.mb
-%%DATADIR%%/data/qxm.mb
 %%DATADIR%%/data/sp.dat
+%%DATADIR%%/data/erbi.mb
 %%DATADIR%%/data/tables.conf
+%%DATADIR%%/data/zrm.mb
+%%DATADIR%%/data/pySym.mb
 %%DATADIR%%/data/vk.conf
+%%DATADIR%%/data/db.txt
+%%DATADIR%%/data/config
+%%DATADIR%%/data/qxm.mb
+%%DATADIR%%/data/pybase.mb
+%%DATADIR%%/data/cj.mb
+%%DATADIR%%/data/gbkpy.org
+%%DATADIR%%/data/db.mb
+%%DATADIR%%/data/qxm.txt
 %%DATADIR%%/data/wanfeng.mb
+%%DATADIR%%/data/zrm.txt
+%%DATADIR%%/data/wanfeng.txt
+%%DATADIR%%/data/cj.txt
+%%DATADIR%%/data/gbks2t.tab
+%%DATADIR%%/data/AutoEng.dat
+%%DATADIR%%/data/pyPhrase.org
+%%DATADIR%%/data/wbx.txt
+%%DATADIR%%/data/erbi.txt
 %%DATADIR%%/data/wbpy.mb
+%%DATADIR%%/data/pyphrase.mb
 %%DATADIR%%/data/wbx.mb
+%%DATADIR%%/data/punc.mb
+%%DATADIR%%/data/wbpy.txt
+%%DATADIR%%/tools/winmb2fcitx.py
 @dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%/tools
 @dirrm %%DATADIR%%
+%%DOCSDIR%%/API.txt
+%%DOCSDIR%%/Develop_Readme.GBK
 %%DOCSDIR%%/cjkvinput.txt
+%%DOCSDIR%%/fcitx3.odt
 %%DOCSDIR%%/fcitx3.pdf
+%%DOCSDIR%%/fcitx_trunk.doxyfile
 %%DOCSDIR%%/pinyin.txt
 %%DOCSDIR%%/wb_fh.htm
 @dirrm %%DOCSDIR%%


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: lwhsu 
State-Changed-When: Sat Oct 17 04:08:08 UTC 2009 
State-Changed-Why:  
Please have a look at this message and fix it: 
http://people.freebsd.org/~lwhsu/zh-fcitx-3.6.2.log .  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139692 
State-Changed-From-To: feedback->closed 
State-Changed-By: lwhsu 
State-Changed-When: Sun Oct 18 06:41:49 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139692 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/139692: commit references a PR
Date: Sun, 18 Oct 2009 06:41:32 +0000 (UTC)

 lwhsu       2009-10-18 06:41:22 UTC
 
   FreeBSD ports repository
 
   Modified files:
     chinese/fcitx        Makefile distinfo pkg-plist 
     chinese/fcitx/files  patch-doc-Makefile.in 
                          patch-xpm-Makefile.in 
   Log:
   - Update to 3.6.2
   - Pass maintainership to submitter
   
   PR:             ports/139692
   Submitted by:   "Denise H. G." <darcsis@gmail.com>
   
   Revision  Changes    Path
   1.33      +7 -6      ports/chinese/fcitx/Makefile
   1.20      +3 -3      ports/chinese/fcitx/distinfo
   1.4       +9 -9      ports/chinese/fcitx/files/patch-doc-Makefile.in
   1.4       +10 -10    ports/chinese/fcitx/files/patch-xpm-Makefile.in
   1.12      +18 -0     ports/chinese/fcitx/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
