Attachment 53861 Details for Bug 81490 – file.diff

[patch] file.diff

file.diff (text/plain), 5.61 KB, created by David Yu on 2005-05-26 04:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Yu

Created: 2005-05-26 04:30:01 UTC

Size: 5.61 KB

patch

obsolete

>diff -ruN iiimf-le-xcin.orig/Makefile iiimf-le-xcin/Makefile
>--- iiimf-le-xcin.orig/Makefile	Wed May 25 20:18:22 2005
>+++ iiimf-le-xcin/Makefile	Wed May 25 20:16:00 2005
>@@ -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 @@
> 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 @@
> 	${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 -ruN iiimf-le-xcin.orig/files/patch-acfiles_im_common.m4 iiimf-le-xcin/files/patch-acfiles_im_common.m4
>--- iiimf-le-xcin.orig/files/patch-acfiles_im_common.m4	Wed Dec 31 16:00:00 1969
>+++ iiimf-le-xcin/files/patch-acfiles_im_common.m4	Wed May 25 19:13:56 2005
>@@ -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 -ruN iiimf-le-xcin.orig/files/patch-src_Makefile.am iiimf-le-xcin/files/patch-src_Makefile.am
>--- iiimf-le-xcin.orig/files/patch-src_Makefile.am	Wed May 25 20:18:22 2005
>+++ iiimf-le-xcin/files/patch-src_Makefile.am	Wed May 25 20:11:43 2005
>@@ -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 -ruN iiimf-le-xcin.orig/files/patch-src_cin2tab_Makefile.am iiimf-le-xcin/files/patch-src_cin2tab_Makefile.am
>--- iiimf-le-xcin.orig/files/patch-src_cin2tab_Makefile.am	Wed Dec 31 16:00:00 1969
>+++ iiimf-le-xcin/files/patch-src_cin2tab_Makefile.am	Wed May 25 20:07:28 2005
>@@ -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 -ruN iiimf-le-xcin.orig/pkg-plist iiimf-le-xcin/pkg-plist
>--- iiimf-le-xcin.orig/pkg-plist	Wed May 25 20:18:22 2005
>+++ iiimf-le-xcin/pkg-plist	Wed May 25 19:13:56 2005
>@@ -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

Actions: View | Diff

Attachments on bug 81490: 53861