ports/61135: [maintainer update]chinese/fcitx: upgrade to 2.0.1
Dryice Liu
dryice at HotPoP.com
Fri Jan 9 17:50:23 UTC 2004
>Number: 61135
>Category: ports
>Synopsis: [maintainer update]chinese/fcitx: upgrade to 2.0.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: Fri Jan 09 09:50:16 PST 2004
>Closed-Date:
>Last-Modified:
>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 at dryice.3322.org:/usr/obj/usr/src/sys/SERVER i386
>Description:
Changes:
- Upgrade to 2.0.1, many new features and bug fixes
- new file: files/patch-MyErrorsHandlers.c, this is also shown in the diff -ruN output
- delete file: files/patch-IMdkit::lib::Makefile, this is also shown in the diff -ruN output
>How-To-Repeat:
N/A
>Fix:
--- fcitx.diff begins here ---
diff -ruN fcitx.orig/Makefile fcitx/Makefile
--- fcitx.orig/Makefile Sat Jan 3 04:30:52 2004
+++ fcitx/Makefile Sat Jan 10 00:42:07 2004
@@ -6,9 +6,9 @@
#
PORTNAME= fcitx
-PORTVERSION= 1.8.5
+PORTVERSION= 2.0.1
CATEGORIES= chinese x11
-MASTER_SITES= http://www.fcitx.org/
+MASTER_SITES= http://www.fcitx.org/download/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= dryice at liu.com.cn
@@ -20,13 +20,15 @@
USE_XLIB= yes
USE_REINPLACE= yes
+post-extract:
+ cd ${BUILD_WRKSRC}; ${MAKE} clean
+
post-patch:
@${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}/ui.c
@${REINPLACE_CMD} -e 's#zh_CN.gb2312#zh_CN.EUC#g' ${WRKSRC}/xim.c
- @${REINPLACE_CMD} -e 's#zh_CN.GBK#zh_CN.EUC#g' ${WRKSRC}/tools.c
- @${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/IMdkit/lib/IMConn.c
+ @${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/IMdkit/lib/IMConn.c ${WRKSRC}/ui.c
post-install:
@${CAT} ${PKGMESSAGE}
diff -ruN fcitx.orig/distinfo fcitx/distinfo
--- fcitx.orig/distinfo Sat Jan 3 04:30:52 2004
+++ fcitx/distinfo Fri Jan 9 23:58:19 2004
@@ -1 +1 @@
-MD5 (fcitx-1.8.5.tar.bz2) = c2b7c48b906c4812f305fc9f5a605458
+MD5 (fcitx-2.0.1.tar.bz2) = 2f1c710d60e25364ed36223adfc9e7d2
diff -ruN fcitx.orig/files/patch-IMdkit::lib::Makefile fcitx/files/patch-IMdkit::lib::Makefile
--- fcitx.orig/files/patch-IMdkit::lib::Makefile Sun Apr 13 18:56:30 2003
+++ fcitx/files/patch-IMdkit::lib::Makefile Thu Jan 1 08:00:00 1970
@@ -1,11 +0,0 @@
---- IMdkit/lib/Makefile.orig Sun Apr 13 03:49:17 2003
-+++ IMdkit/lib/Makefile Sun Apr 13 03:49:28 2003
-@@ -2,7 +2,7 @@
- CC = gcc
- #CFLAGS = -c -O2 -fno-strength-reduce -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE=500L -D_BSD_SOURCE -D_SVID_SOURCE -DFUNCPROTO=15 -DNARROWPROTO -DUNIXCONN -DTCPCONN -DXIM_t -DTRANS_SERVER
- CFLAGS = -c -O2 -fno-strength-reduce -DXIM_t -DTRANS_SERVER
--INC = -I../include -I/usr/X11R6/include
-+INC = -I../include -I${X11BASE}/include
-
-
- SRC = IMConn.c IMValues.c IMMethod.c FrameMgr.c i18nIMProto.c i18nAttr.c i18nMethod.c i18nUtil.c i18nPtHdr.c i18nIc.c i18nClbk.c i18nX.c
diff -ruN fcitx.orig/files/patch-Makefile fcitx/files/patch-Makefile
--- fcitx.orig/files/patch-Makefile Sat Jan 3 04:30:52 2004
+++ fcitx/files/patch-Makefile Thu Jan 8 23:50:55 2004
@@ -1,18 +1,17 @@
---- Makefile.orig Thu Jan 1 21:11:24 2004
-+++ Makefile Thu Jan 1 21:14:40 2004
+--- Makefile.orig Mon Dec 29 09:10:25 2003
++++ Makefile Thu Jan 8 23:49:23 2004
@@ -1,12 +1,12 @@
CC = gcc
--CFLAGS= -O2 -fno-strength-reduce
-+CFLAGS= -O2 -fno-strength-reduce -DSIGUNUSED=32
+-CFLAGS= -O2 -fno-strength-reduce -Wall -D_USE_XFT
++CFLAGS= -O2 -fno-strength-reduce -DSIGUNUSED=32 -Wall -D_USE_XFT
--INC = -I/usr/X11R6/include -I.
-+INC = -I${LOCALBASE}/include -I${X11BASE}/include -I.
+ INC = `xft-config --cflags`
- 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
+ SRC = IC.c py.c ime.c InputWindow.c KeyList.c main.c MainWindow.c MyErrorsHandlers.c punc.c pyMapTable.c pyParser.c PYFA.c sp.c SetLocale.c tools.c ui.c wbx.c xim.c
--LIB = -L/usr/X11R6/lib -lX11
-+LIB = -L${LOCALBASE}/lib -L${X11BASE}/lib -lX11 -liconv
+-LIB = `xft-config --libs`
++LIB = `xft-config --libs` -liconv
OBJ = $(SRC:.c=.o)
diff -ruN fcitx.orig/files/patch-MyErrorsHandlers.c fcitx/files/patch-MyErrorsHandlers.c
--- fcitx.orig/files/patch-MyErrorsHandlers.c Thu Jan 1 08:00:00 1970
+++ fcitx/files/patch-MyErrorsHandlers.c Thu Jan 8 23:42:39 2004
@@ -0,0 +1,11 @@
+--- MyErrorsHandlers.c.orig Wed Jan 7 11:29:34 2004
++++ MyErrorsHandlers.c Thu Jan 8 23:36:16 2004
+@@ -3,7 +3,7 @@
+ #include <stdio.h>
+ #include <signal.h>
+ #include <stdlib.h>
+-#include <wait.h>
++#include <sys/wait.h>
+
+ #include "wbx.h"
+ #include "py.h"
diff -ruN fcitx.orig/pkg-plist fcitx/pkg-plist
--- fcitx.orig/pkg-plist Sat Jan 3 04:30:52 2004
+++ fcitx/pkg-plist Fri Jan 9 00:51:25 2004
@@ -1,8 +1,6 @@
bin/fcitx
share/fcitx/punc.mb
-share/fcitx/pySym.mb
share/fcitx/pybase.mb
share/fcitx/pyphrase.mb
-share/fcitx/sp.dat
share/fcitx/wbx.mb
@dirrm share/fcitx
--- fcitx.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list