5 files changed, 57 insertions, 38 deletions

diff --git a/chinese/iiimf-le-xcin/Makefile b/chinese/iiimf-le-xcin/Makefile
index 15d1c7ac5074..6e37b9ac5e99 100644
--- a/chinese/iiimf-le-xcin/Makefile
+++ b/chinese/iiimf-le-xcin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	iiimf-le-xcin
 PORTVERSION=	0.1.7
+PORTREVISION=	1
 CATEGORIES=	chinese textproc
 MASTER_SITES=	http://people.redhat.com/llch/iiimf-xcin/${PORTVERSION}/
 EXTRACT_SUFX=	-11.src.rpm
@@ -15,7 +16,7 @@ MAINTAINER=	kcwu@csie.org
 COMMENT=	IIIMF xcin language engine, a traditional Chinese input method
 
 EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
-RUN_DEPENDS=	${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
+RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server
 
 WRKSRC=		${WRKDIR}/iiimf-xcin
 USE_BZIP2=	yes
@@ -38,10 +39,9 @@ do-extract:
 	${WRKDIR}/${DISTNAME}.tar.bz2 ${EXTRACT_AFTER_ARGS}
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
+	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/iiim,g" \
 		${WRKSRC}/acfiles/im_common.m4 \
 		${WRKSRC}/src/cin2tab/constant.h \
-		${WRKSRC}/src/xcin.c \
 		${WRKSRC}/src/xmlconf.c \
 		${WRKSRC}/xcin.xml.conf
 
diff --git a/chinese/iiimf-le-xcin/files/patch-acfiles_im_common.m4 b/chinese/iiimf-le-xcin/files/patch-acfiles_im_common.m4
new file mode 100644
index 000000000000..a0bd33b0db87
--- /dev/null
+++ b/chinese/iiimf-le-xcin/files/patch-acfiles_im_common.m4
@@ -0,0 +1,11 @@
+--- acfiles/im_common.m4.orig	Wed May 25 18:14:16 2005
++++ acfiles/im_common.m4	Wed May 25 18:14:23 2005
+@@ -11,7 +11,7 @@
+ 
+ 	IMDIR="/usr/lib/im"
+ 	IMBINDIR=${IMDIR}
+-	IM_LEIFDIR="${IMDIR}/leif"
++	IM_LEIFDIR="${IMDIR}/le/xcin"
+ 	IM_LOCALEDIR="${IMDIR}/locale"
+ 	IM_TOPDIR='$(top_srcdir)'/${TOPDIR}
+ 	IM_INCLUDEDIR="${IM_TOPDIR}/include"
diff --git a/chinese/iiimf-le-xcin/files/patch-src_Makefile.am b/chinese/iiimf-le-xcin/files/patch-src_Makefile.am
index de71377c86d1..0e5c6a2f19b3 100644
--- a/chinese/iiimf-le-xcin/files/patch-src_Makefile.am
+++ b/chinese/iiimf-le-xcin/files/patch-src_Makefile.am
@@ -1,19 +1,17 @@
---- src/Makefile.am.orig	Thu Sep  9 18:51:35 2004
-+++ src/Makefile.am	Thu Sep  9 18:52:22 2004
-@@ -5,6 +5,7 @@
- libdir = $(prefix)/lib/im/leif
+--- src/Makefile.am.orig	Wed May 25 20:10:15 2005
++++ src/Makefile.am	Wed May 25 20:11:40 2005
+@@ -2,12 +2,12 @@
+ 
+ LE_FILES = xcin.so
+ 
+-libdir = $(prefix)/lib/im/leif
++libdir = $(prefix)/lib/iiim/le/xcin
  
  xcin_la_CFLAGS = $(SHLIBCFLAGS) \
-+	$(X_CFLAGS) \
  	$(THREAD_CXX_CFLAGS) \
  	-DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
- 	-I$(IM_INCLUDEDIR)/iml -I$(XML_CFLAGS)
-@@ -13,7 +14,7 @@
- 	-shared -module -rpath \
- 	$(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
- 
--xcin_la_LIBADD = $(THREAD_LIBS) $(XML_LIBS)
-+xcin_la_LIBADD = $(THREAD_LIBS) $(XML_LIBS) $(X_LIBS)
- 
- xcin_la_SOURCES = xcin.c gen_inp.c charcode.c debugInfo.c keymap.c le_proc.c key_event.c define.c xmlconf.c
+-	-I$(IM_INCLUDEDIR)/iml -I$(XML_CFLAGS)
++	-I$(IM_INCLUDEDIR)/iml $(XML_CFLAGS) $(X_CFLAGS)
  
+ xcin_la_LDFLAGS = \
+ 	-shared -module -rpath \
diff --git a/chinese/iiimf-le-xcin/files/patch-src_cin2tab_Makefile.am b/chinese/iiimf-le-xcin/files/patch-src_cin2tab_Makefile.am
new file mode 100644
index 000000000000..069ee444c71d
--- /dev/null
+++ b/chinese/iiimf-le-xcin/files/patch-src_cin2tab_Makefile.am
@@ -0,0 +1,9 @@
+--- src/cin2tab/Makefile.am.orig	Wed May 25 19:57:29 2005
++++ src/cin2tab/Makefile.am	Wed May 25 19:57:06 2005
+@@ -1,5 +1,6 @@
+ bin_PROGRAMS = cin2tab
+ 
++cin2tab_CPPFLAGS = $(X_CFLAGS)
+ cin2tab_SOURCES = charcode.c cin2tab.c gencin.c keymap.c syscin.c xcin_rc.c xcintool/check_file.c xcintool/open_data.c xcintool/snprintf.c xcintool/check_version.c xcintool/open_file.c xcintool/stable_sort.c xcintool/get_line.c xcintool/perr.c xcintool/xcin_malloc.c xcintool/get_word.c xcintool/set_locale.c
+ 
+ install-binPROGRAMS:
diff --git a/chinese/iiimf-le-xcin/pkg-plist b/chinese/iiimf-le-xcin/pkg-plist
index cfea361580ec..c612b08a9db5 100644
--- a/chinese/iiimf-le-xcin/pkg-plist
+++ b/chinese/iiimf-le-xcin/pkg-plist
@@ -1,21 +1,22 @@
-lib/im/leif/xcin.so
-lib/im/leif/xcin.so.0
-lib/im/locale/zh_TW/xcin/cin2tab
-lib/im/locale/zh_TW/xcin/xcin.xml.conf
-lib/im/locale/zh_TW/xcin/tab/array30.tab
-lib/im/locale/zh_TW/xcin/tab/cj.tab
-lib/im/locale/zh_TW/xcin/tab/cj5.tab
-lib/im/locale/zh_TW/xcin/tab/ez.tab
-lib/im/locale/zh_TW/xcin/tab/jyutping0.tab
-lib/im/locale/zh_TW/xcin/tab/phone.tab
-lib/im/locale/zh_TW/xcin/tab/pinyin.tab
-lib/im/locale/zh_TW/xcin/tab/pinyin0.tab
-lib/im/locale/zh_TW/xcin/tab/simplex.tab
-lib/im/locale/zh_TW/xcin/tab/simplex5.tab
-lib/im/locale/zh_TW/xcin/tab/sys.tab
-lib/im/locale/zh_TW/xcin/tab/telecode.tab
-@dirrm lib/im/locale/zh_TW/xcin/tab
-@dirrm lib/im/locale/zh_TW/xcin
-@unexec rmdir %D/lib/im/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/lib/im/locale 2>/dev/null || true
-@unexec rmdir %D/lib/im/leif 2>/dev/null || true
+lib/iiim/le/xcin/xcin.so
+lib/iiim/le/xcin/xcin.so.0
+lib/iiim/locale/zh_TW/xcin/cin2tab
+lib/iiim/locale/zh_TW/xcin/xcin.xml.conf
+lib/iiim/locale/zh_TW/xcin/tab/array30.tab
+lib/iiim/locale/zh_TW/xcin/tab/cj.tab
+lib/iiim/locale/zh_TW/xcin/tab/cj5.tab
+lib/iiim/locale/zh_TW/xcin/tab/ez.tab
+lib/iiim/locale/zh_TW/xcin/tab/jyutping0.tab
+lib/iiim/locale/zh_TW/xcin/tab/phone.tab
+lib/iiim/locale/zh_TW/xcin/tab/pinyin.tab
+lib/iiim/locale/zh_TW/xcin/tab/pinyin0.tab
+lib/iiim/locale/zh_TW/xcin/tab/simplex.tab
+lib/iiim/locale/zh_TW/xcin/tab/simplex5.tab
+lib/iiim/locale/zh_TW/xcin/tab/sys.tab
+lib/iiim/locale/zh_TW/xcin/tab/telecode.tab
+@dirrm lib/iiim/locale/zh_TW/xcin/tab
+@dirrm lib/iiim/locale/zh_TW/xcin
+@unexec rmdir %D/lib/iiim/locale/zh_TW 2>/dev/null || true
+@unexec rmdir %D/lib/iiim/locale 2>/dev/null || true
+@unexec rmdir %D/lib/iiim/le/xcin 2>/dev/null || true
+@unexec rmdir %D/lib/iiim/le 2>/dev/null || true