ports/78267: [maintainer] chinese/fcitx: update to 3.1

[Dryice Liu]

>Number:         78267
>Category:       ports
>Synopsis:       [maintainer] chinese/fcitx: update to 3.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 02 03:00:40 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Dryice Liu
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD dryice.3322.org 5.3-STABLE FreeBSD 5.3-STABLE #1: Tue Feb 1 21:29:03 CST 2005

>Description:
Changes:
- update to 3.1
- new file: files/patch-xpm-Makefile.in

Please close ports/77948. It's obsoleted by this PR.

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


--- fcitx.diff begins here ---
diff -ruN fcitx.old/Makefile fcitx/Makefile
--- fcitx.old/Makefile	Mon Jan  3 18:20:06 2005
+++ fcitx/Makefile	Wed Mar  2 09:33:18 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fcitx
-PORTVERSION=	3.0.3
+PORTVERSION=	3.1
 CATEGORIES=	chinese x11
 MASTER_SITES=	http://www.fcitx.org/download/ \
 		http://bsdchat.com/dist/dryice/
diff -ruN fcitx.old/distinfo fcitx/distinfo
--- fcitx.old/distinfo	Wed Dec 15 14:30:23 2004
+++ fcitx/distinfo	Wed Mar  2 09:33:45 2005
@@ -1,2 +1,2 @@
-MD5 (fcitx-3.0.3.tar.bz2) = 7c807617d36764e3c049dd500dc46a75
-SIZE (fcitx-3.0.3.tar.bz2) = 2567530
+MD5 (fcitx-3.1.tar.bz2) = 0b2f3908a1d7bcd0b12266da98bb42e0
+SIZE (fcitx-3.1.tar.bz2) = 2123900
diff -ruN fcitx.old/files/patch-src-ui.c fcitx/files/patch-src-ui.c
--- fcitx.old/files/patch-src-ui.c	Wed Oct 27 23:25:11 2004
+++ fcitx/files/patch-src-ui.c	Wed Mar  2 09:54:34 2005
@@ -1,29 +1,29 @@
---- src/ui.c.orig	Wed Oct 27 23:19:07 2004
-+++ src/ui.c	Wed Oct 27 23:20:59 2004
-@@ -339,7 +339,7 @@
+--- src/ui.c.orig	Wed Feb 23 03:34:39 2005
++++ src/ui.c	Wed Mar  2 09:53:26 2005
+@@ -361,7 +361,7 @@
      l2 = 99;
      ps = str1;
  
 -    l1 = iconv (convUTF8, &str, &l1, &ps, &l2);
 +    l1 = iconv (convUTF8, (const char**) &str, &l1, &ps, &l2);
      *ps = '\0';
-     XftTextExtentsUtf8 (dpy, font, (FcChar8*)str1, strlen (str1), &extents);
-     if ( font!=xftFont)
-@@ -364,7 +364,7 @@
+     XftTextExtentsUtf8 (dpy, font, (FcChar8 *) str1, strlen (str1), &extents);
+     if (font == xftMainWindowFont)
+@@ -386,7 +386,7 @@
      ps2 = str2;
      ps1 = str1;
  
 -    l1 = iconv (convUTF8, &ps1, &l1, &ps2, &l2);
-+    l1 = iconv (convUTF8, (const char**)&ps1, &l1, &ps2, &l2);
-     *ps2='\0';
++    l1 = iconv (convUTF8, (const char**) &ps1, &l1, &ps2, &l2);
+     *ps2 = '\0';
  
-     XftTextExtentsUtf8 (dpy, font, (FcChar8 *)str2, strlen (str2), &extents);
-@@ -418,7 +418,7 @@
+     XftTextExtentsUtf8 (dpy, font, (FcChar8 *) str2, strlen (str2), &extents);
+@@ -439,7 +439,7 @@
+     l1 = strlen (str);
      l2 = 99;
      ps = strOutput;
- 
--    l1 = iconv (convUTF8, (char **) (&str), &l1, &ps, &l2);
-+    l1 = iconv (convUTF8, (const char **) (&str), &l1, &ps, &l2);
-     *ps='\0';
+-    l1 = iconv (convUTF8, &str, &l1, &ps, &l2);
++    l1 = iconv (convUTF8, (const char**) &str, &l1, &ps, &l2);
+     *ps = '\0';
  
      renderColor.red = color.red;
diff -ruN fcitx.old/files/patch-xpm-Makefile.in fcitx/files/patch-xpm-Makefile.in
--- fcitx.old/files/patch-xpm-Makefile.in	Thu Jan  1 08:00:00 1970
+++ fcitx/files/patch-xpm-Makefile.in	Wed Feb 23 12:31:26 2005
@@ -0,0 +1,11 @@
+--- xpm/Makefile.in.orig	Mon Jan 17 20:56:42 2005
++++ xpm/Makefile.in	Wed Feb 23 12:25:47 2005
+@@ -147,7 +147,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-xpmdir = $(pkgdatadir)/xpm
++xpmdir =
+ xpm_DATA = 
+ EXTRA_DIST = $(xpm_DATA)
+ all: all-am
diff -ruN fcitx.old/pkg-plist fcitx/pkg-plist
--- fcitx.old/pkg-plist	Wed Feb 23 12:24:10 2005
+++ fcitx/pkg-plist	Wed Mar  2 10:42:11 2005
@@ -5,7 +5,6 @@
 %%DATADIR%%/data/cj.mb
 %%DATADIR%%/data/erbi.mb
 %%DATADIR%%/data/punc.mb
-%%DATADIR%%/data/py.mb
 %%DATADIR%%/data/pySym.mb
 %%DATADIR%%/data/pybase.mb
 %%DATADIR%%/data/pyphrase.mb
--- fcitx.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: