From 0b5592f9712f7d57801b60c8dd381e9dbbd2b6f2 Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Fri, 2 Jan 2004 14:30:35 +0000
Subject: - Update to 1.8.5 - Take maintainership - Add to x11 category

PR:		ports/60808
Submitted by:	Dryice Liu <dryice@liu.com.cn>
---
 chinese/fcitx/Makefile             | 11 +++++------
 chinese/fcitx/distinfo             |  2 +-
 chinese/fcitx/files/patch-Makefile |  6 +++---
 chinese/fcitx/pkg-plist            |  4 ----
 4 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'chinese/fcitx')

diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index bcebda6659e4..01191e686ad4 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -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_XLIB=	yes
 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 --git a/chinese/fcitx/distinfo b/chinese/fcitx/distinfo
index 3e741a1821b2..5fde9feeafe7 100644
--- a/chinese/fcitx/distinfo
+++ b/chinese/fcitx/distinfo
@@ -1 +1 @@
-MD5 (fcitx-1.8.4.tar.bz2) = 8b7bd99df70b57c4b8ad085ea25d88db
+MD5 (fcitx-1.8.5.tar.bz2) = c2b7c48b906c4812f305fc9f5a605458
diff --git a/chinese/fcitx/files/patch-Makefile b/chinese/fcitx/files/patch-Makefile
index 809ba9f7b16b..759a32fd0ab2 100644
--- a/chinese/fcitx/files/patch-Makefile
+++ b/chinese/fcitx/files/patch-Makefile
@@ -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 --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist
index a1ffd76ca34e..ccecd328acc9 100644
--- a/chinese/fcitx/pkg-plist
+++ b/chinese/fcitx/pkg-plist
@@ -5,8 +5,4 @@ share/fcitx/pybase.mb
 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
-- 
cgit v1.2.3