Attachment 146285 Details for Bug 192986 – new patch to chinese/cce

[patch] new patch to chinese/cce

cce.diff (text/plain), 17.55 KB, created by TsurutaniNaoki on 2014-08-26 01:31:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: TsurutaniNaoki

Created: 2014-08-26 01:31:25 UTC

Size: 17.55 KB

patch

obsolete

>diff -urN cce.orig/Makefile cce/Makefile
>--- cce.orig/Makefile	2014-07-24 01:44:27.000000000 +0900
>+++ cce/Makefile	2014-08-26 10:13:00.000000000 +0900
>@@ -3,11 +3,12 @@
> 
> PORTNAME=	cce
> PORTVERSION=	0.51
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	chinese
> MASTER_SITES=	SF/${PORTNAME}2k/${PORTNAME}/Ver_${PORTVERSION}_02132004
> DISTNAME=	${PORTNAME}-${PORTVERSION}-02132004-dist
> EXTRACT_SUFX=	.tgz
>+
> PATCH_SITES=	http://www.chinatinco.com/freebsd/cce/ \
> 		http://www.525183.com/freebsd/cce/ \
> 		http://525183.serverbox.org/freebsd/cce/
>@@ -17,12 +18,11 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Console CJK Environment
> 
>+LICENSE=	GPLv2
>+
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> ONLY_FOR_ARCHS=	i386
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--mandir=${PREFIX}/man
> 
>-MAN1=		cce.1 cceconv.1
>-
>-NO_STAGE=	yes
> .include <bsd.port.mk>
>diff -urN cce.orig/files/extra-patch-src::Makefile.am cce/files/extra-patch-src::Makefile.am
>--- cce.orig/files/extra-patch-src::Makefile.am	2014-01-23 02:40:44.000000000 +0900
>+++ cce/files/extra-patch-src::Makefile.am	1970-01-01 09:00:00.000000000 +0900
>@@ -1,15 +0,0 @@
>---- src/Makefile.am.orig	Tue Dec  4 12:39:23 2007
>-+++ src/Makefile.am	Tue Dec  4 12:59:39 2007
>-@@ -60,10 +60,10 @@
>- 
>- install-data-local:
>- 	$(mkinstalldirs) $(DESTDIR)/etc
>--	$(INSTALL_DATA) $(srcdir)/cce.cfg $(DESTDIR)/etc/cce.cfg
>-+	$(INSTALL_DATA) $(srcdir)/cce.cfg $(DESTDIR)$(sysconfdir)/cce.cfg
>- 
>- uninstall-local:
>--	-rm -f $(DESTDIR)/etc/cce.cfg
>-+	-rm -f $(DESTDIR)$(sysconfdir)/cce.cfg
>- 	@list='$(CCE_SYMLINKS)'; for p in $$list; do \
>-     	rm -f $(DESTDIR)$(bindir)/$$p; \
>-     done
>diff -urN cce.orig/files/patch-Makefile.in cce/files/patch-Makefile.in
>--- cce.orig/files/patch-Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ cce/files/patch-Makefile.in	2014-08-25 16:51:51.000000000 +0900
>@@ -0,0 +1,66 @@
>+--- Makefile.in.orig	2004-02-14 13:17:22.000000000 +0900
>++++ Makefile.in	2014-08-25 16:50:15.000000000 +0900
>+@@ -183,35 +183,35 @@
>+ 	@:
>+ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+ 	@for dep in $?; do \
>+-	  case '$(am__configure_deps)' in \
>+-	    *$$dep*) \
>+-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
>+-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
>+-		&& exit 0; \
>+-	      exit 1;; \
>+-	  esac; \
>++#	  case '$(am__configure_deps)' in \
>++#	    *$$dep*) \
>++#	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
>++#	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
>++#		&& exit 0; \
>++#	      exit 1;; \
>++#	  esac; \
>+ 	done; \
>+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
>++#	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
>+ 	cd $(top_srcdir) && \
>+-	  $(AUTOMAKE) --gnu  Makefile
>++#	  $(AUTOMAKE) --gnu  Makefile
>+ .PRECIOUS: Makefile
>+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+ 	@case '$?' in \
>+ 	  *config.status*) \
>+-	    echo ' $(SHELL) ./config.status'; \
>+-	    $(SHELL) ./config.status;; \
>++#	    echo ' $(SHELL) ./config.status'; \
>++#	    $(SHELL) ./config.status;; \
>+ 	  *) \
>+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
>+-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
>++#	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
>++#	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
>+ 	esac;
>+ 
>+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+-	$(SHELL) ./config.status --recheck
>++#	$(SHELL) ./config.status --recheck
>+ 
>+ $(top_srcdir)/configure:  $(am__configure_deps)
>+-	cd $(srcdir) && $(AUTOCONF)
>++#	cd $(srcdir) && $(AUTOCONF)
>+ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
>++#	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
>+ 
>+ include/config.h: include/stamp-h1
>+ 	@if test ! -f $@; then \
>+@@ -221,9 +221,9 @@
>+ 
>+ include/stamp-h1: $(top_srcdir)/include/config.h.in $(top_builddir)/config.status
>+ 	@rm -f include/stamp-h1
>+-	cd $(top_builddir) && $(SHELL) ./config.status include/config.h
>++#	cd $(top_builddir) && $(SHELL) ./config.status include/config.h
>+ $(top_srcdir)/include/config.h.in:  $(am__configure_deps) 
>+-	cd $(top_srcdir) && $(AUTOHEADER)
>++#	cd $(top_srcdir) && $(AUTOHEADER)
>+ 	rm -f include/stamp-h1
>+ 	touch $@
>+ 
>diff -urN cce.orig/files/patch-doc__Makefile.in cce/files/patch-doc__Makefile.in
>--- cce.orig/files/patch-doc__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ cce/files/patch-doc__Makefile.in	2014-08-25 17:28:08.000000000 +0900
>@@ -0,0 +1,21 @@
>+--- doc/Makefile.in.orig	2004-02-14 13:17:23.000000000 +0900
>++++ doc/Makefile.in	2014-08-25 17:07:26.000000000 +0900
>+@@ -348,13 +348,13 @@
>+ 
>+ 
>+ install-data-local:
>+-	$(mkinstalldirs) $(mandir)/man1/
>+-	$(INSTALL_DATA) $(srcdir)/cce.1 $(mandir)/man1/cce.1
>+-	$(INSTALL_DATA) $(srcdir)/cceconv.1 $(mandir)/man1/cceconv.1
>++	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1/
>++	$(INSTALL_DATA) $(srcdir)/cce.1 $(DESTDIR)$(mandir)/man1/cce.1
>++	$(INSTALL_DATA) $(srcdir)/cceconv.1 $(DESTDIR)$(mandir)/man1/cceconv.1
>+ 
>+ uninstall-local:
>+-	-rm -f $(mandir)/man1/cce.1
>+-	-rm -f $(mandir)/man1/cceconv.1
>++	-rm -f $(DESTDIR)$(mandir)/man1/cce.1
>++	-rm -f $(DESTDIR)$(mandir)/man1/cceconv.1
>+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
>+ # Otherwise a system limit (for SysV at least) may be exceeded.
>+ .NOEXPORT:
>diff -urN cce.orig/files/patch-fonts__Makefile.in cce/files/patch-fonts__Makefile.in
>--- cce.orig/files/patch-fonts__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ cce/files/patch-fonts__Makefile.in	2014-08-26 10:11:31.000000000 +0900
>@@ -0,0 +1,22 @@
>+--- fonts/Makefile.in.orig	2004-02-14 13:17:23.000000000 +0900
>++++ fonts/Makefile.in	2014-08-26 10:10:55.000000000 +0900
>+@@ -171,8 +171,8 @@
>+ target_cpu = @target_cpu@
>+ target_os = @target_os@
>+ target_vendor = @target_vendor@
>+-CCE_BDF2BIN := ./bdf2bin$(EXEEXT)
>+-CCE_SHARE_DIR = $(DESTDIR)$(datadir)
>++CCE_BDF2BIN := bdf2bin$(EXEEXT)
>++CCE_SHARE_DIR = $(datadir)
>+ INCLUDES = -I$(top_srcdir)/include
>+ bdf2bin_bindir = $(CCE_SHARE_DIR)/cce
>+ bdf2bin_SOURCES = bdf2bin.c font.c
>+@@ -563,7 +563,7 @@
>+ 
>+ #%.bin: %.bdf $(CCE_BDF2BIN)
>+ .bdf.bin: $(CCE_BDF2BIN)
>+-	$(CCE_BDF2BIN) $< $@
>++	./$(CCE_BDF2BIN) $< $@
>+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
>+ # Otherwise a system limit (for SysV at least) may be exceeded.
>+ .NOEXPORT:
>diff -urN cce.orig/files/patch-inputs__all__Makefile.in cce/files/patch-inputs__all__Makefile.in
>--- cce.orig/files/patch-inputs__all__Makefile.in	2014-07-30 02:12:47.000000000 +0900
>+++ cce/files/patch-inputs__all__Makefile.in	2014-08-25 17:27:17.000000000 +0900
>@@ -1,19 +1,41 @@
>---- inputs/all/Makefile.in.orig	Sat Feb 14 12:17:23 2004
>-+++ inputs/all/Makefile.in	Sun May  1 02:27:37 2005
>-@@ -335,8 +335,6 @@
>+--- inputs/all/Makefile.in.orig	2004-02-14 13:17:23.000000000 +0900
>++++ inputs/all/Makefile.in	2014-08-25 17:17:48.000000000 +0900
>+@@ -145,7 +145,7 @@
>+ target_cpu = @target_cpu@
>+ target_os = @target_os@
>+ target_vendor = @target_vendor@
>+-CCE_SHARE_DIR = $(DESTDIR)$(datadir)
>++CCE_SHARE_DIR = $(datadir)
>+ CIN2TAB = ../utils/cin2tab$(EXEEXT)
>+ INPUT_TABS := intcode.tab zhiyin.tab zhiyin.tab.usr ciyin.tab ciyingb.tab
>+ all_table_bindir = $(CCE_SHARE_DIR)/cce/all
>+@@ -333,10 +333,8 @@
>+ 
>+ # some input method tables need the encoding conversion (table may not be there yet)
>  .check_convtab:
>- 	@if [ ! -f $(CCE_SHARE_DIR)/cce/cceconv.tab ] ; then \
>+-	@if [ ! -f $(CCE_SHARE_DIR)/cce/cceconv.tab ] ; then \
>++	@if [ ! -f $(DESTDIR)$(CCE_SHARE_DIR)/cce/cceconv.tab ] ; then \
>         $(NORMAL_INSTALL) ; \
> -       $(mkinstalldirs) $(CCE_SHARE_DIR)/cce ; \
> -	   $(INSTALL_DATA) $(srcdir)/../utils/cceconv.tab $(CCE_SHARE_DIR)/cce/cceconv.tab ; \
>      fi
>  
>  zhiyin.tab: zhiyin.cin $(CIN2TAB) .check_convtab
>-@@ -361,6 +359,7 @@
>+@@ -360,11 +358,12 @@
>+ 	-rm -f *.tab *.tab.usr
>  
>  allinstall: $(CIN2TAB) 
>- 	$(mkinstalldirs) $(CCE_SHARE_DIR)/cce
>-+	$(INSTALL_DATA) $(srcdir)/../utils/cceconv.tab $(CCE_SHARE_DIR)/cce/cceconv.tab ; \
>- 	$(mkinstalldirs) $(CCE_SHARE_DIR)/cce/all
>- 	$(INSTALL_DATA) $(srcdir)/*.tab $(CCE_SHARE_DIR)/cce/all
>- 	$(INSTALL_DATA) $(srcdir)/*.tab.usr $(CCE_SHARE_DIR)/cce/all
>+-	$(mkinstalldirs) $(CCE_SHARE_DIR)/cce
>+-	$(mkinstalldirs) $(CCE_SHARE_DIR)/cce/all
>+-	$(INSTALL_DATA) $(srcdir)/*.tab $(CCE_SHARE_DIR)/cce/all
>+-	$(INSTALL_DATA) $(srcdir)/*.tab.usr $(CCE_SHARE_DIR)/cce/all
>+-	$(INSTALL_DATA) $(srcdir)/shuangpin.map $(CCE_SHARE_DIR)/cce/all
>++	$(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce
>++	$(INSTALL_DATA) $(srcdir)/../utils/cceconv.tab $(DESTDIR)$(CCE_SHARE_DIR)/cce/cceconv.tab ; \
>++	$(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce/all
>++	$(INSTALL_DATA) $(srcdir)/*.tab $(DESTDIR)$(CCE_SHARE_DIR)/cce/all
>++	$(INSTALL_DATA) $(srcdir)/*.tab.usr $(DESTDIR)$(CCE_SHARE_DIR)/cce/all
>++	$(INSTALL_DATA) $(srcdir)/shuangpin.map $(DESTDIR)$(CCE_SHARE_DIR)/cce/all
>+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
>+ # Otherwise a system limit (for SysV at least) may be exceeded.
>+ .NOEXPORT:
>diff -urN cce.orig/files/patch-inputs__big5__Makefile.in cce/files/patch-inputs__big5__Makefile.in
>--- cce.orig/files/patch-inputs__big5__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ cce/files/patch-inputs__big5__Makefile.in	2014-08-25 17:28:31.000000000 +0900
>@@ -0,0 +1,26 @@
>+--- inputs/big5/Makefile.in.orig	2004-02-14 13:17:23.000000000 +0900
>++++ inputs/big5/Makefile.in	2014-08-25 17:21:21.000000000 +0900
>+@@ -146,7 +146,7 @@
>+ target_os = @target_os@
>+ target_vendor = @target_vendor@
>+ CIN2TAB = ../utils/cin2tab$(EXEEXT)
>+-CCE_SHARE_DIR = $(DESTDIR)$(datadir)
>++CCE_SHARE_DIR = $(datadir)
>+ 
>+ # You may add your favorite input method here
>+ # zhuyin.cin is better than table-based phone.cin?
>+@@ -346,10 +346,10 @@
>+ 	-rm -f core core.* *.lx *.tab
>+ 
>+ allinstall: $(CIN2TAB) $(BIG5LX)
>+-	$(mkinstalldirs) $(CCE_SHARE_DIR)/cce
>+-	$(mkinstalldirs) $(CCE_SHARE_DIR)/cce/big5
>+-	$(INSTALL_DATA) $(srcdir)/*.tab $(CCE_SHARE_DIR)/cce/big5
>+-	$(INSTALL_DATA) $(srcdir)/*.lx $(CCE_SHARE_DIR)/cce/big5
>++	$(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce
>++	$(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce/big5
>++	$(INSTALL_DATA) $(srcdir)/*.tab $(DESTDIR)$(CCE_SHARE_DIR)/cce/big5
>++	$(INSTALL_DATA) $(srcdir)/*.lx $(DESTDIR)$(CCE_SHARE_DIR)/cce/big5
>+ 
>+ # CIN from cxterm, put multiple chars in the same line
>+ 4Corner.tab: 4Corner.cin $(CIN2TAB)
>diff -urN cce.orig/files/patch-inputs__gb__Makefile.in cce/files/patch-inputs__gb__Makefile.in
>--- cce.orig/files/patch-inputs__gb__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ cce/files/patch-inputs__gb__Makefile.in	2014-08-25 17:29:06.000000000 +0900
>@@ -0,0 +1,26 @@
>+--- inputs/gb/Makefile.in.orig	2004-02-14 13:17:23.000000000 +0900
>++++ inputs/gb/Makefile.in	2014-08-25 17:19:01.000000000 +0900
>+@@ -146,7 +146,7 @@
>+ target_os = @target_os@
>+ target_vendor = @target_vendor@
>+ CIN2TAB = ../utils/cin2tab$(EXEEXT)
>+-CCE_SHARE_DIR = $(DESTDIR)$(datadir)
>++CCE_SHARE_DIR = $(datadir)
>+ GBLXSRC = ../all/sysphrase_gbk.py
>+ GBLX = gb.lx
>+ 
>+@@ -344,10 +344,10 @@
>+ 	-rm -f core core.* *.lx *.tab
>+ 
>+ allinstall: $(CIN2TAB) $(GBLX)
>+-	$(mkinstalldirs) $(CCE_SHARE_DIR)/cce
>+-	$(mkinstalldirs) $(CCE_SHARE_DIR)/cce/gb
>+-	$(INSTALL_DATA) $(srcdir)/*.tab $(CCE_SHARE_DIR)/cce/gb
>+-	$(INSTALL_DATA) $(srcdir)/*.lx $(CCE_SHARE_DIR)/cce/gb
>++	$(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce
>++	$(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce/gb
>++	$(INSTALL_DATA) $(srcdir)/*.tab $(DESTDIR)$(CCE_SHARE_DIR)/cce/gb
>++	$(INSTALL_DATA) $(srcdir)/*.lx $(DESTDIR)$(CCE_SHARE_DIR)/cce/gb
>+ 
>+ gb.lx: $(CIN2TAB) $(GBLXSRC)
>+ 	@$(CIN2TAB) -gb -lx1 $(srcdir)/$(GBLXSRC) -o gb.lx
>diff -urN cce.orig/files/patch-inputs__gbk__Makefile.in cce/files/patch-inputs__gbk__Makefile.in
>--- cce.orig/files/patch-inputs__gbk__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ cce/files/patch-inputs__gbk__Makefile.in	2014-08-25 17:29:28.000000000 +0900
>@@ -0,0 +1,24 @@
>+--- inputs/gbk/Makefile.in.orig	2004-02-14 13:17:23.000000000 +0900
>++++ inputs/gbk/Makefile.in	2014-08-25 17:20:25.000000000 +0900
>+@@ -146,7 +146,7 @@
>+ target_os = @target_os@
>+ target_vendor = @target_vendor@
>+ CIN2TAB = ../utils/cin2tab$(EXEEXT)
>+-CCE_SHARE_DIR = $(DESTDIR)$(datadir)
>++CCE_SHARE_DIR = $(datadir)
>+ 
>+ # You may add your favorite input method here
>+ #
>+@@ -337,9 +337,9 @@
>+ 	-rm -f core core.* *.tab *.lx
>+ 
>+ allinstall: $(CIN2TAB) 
>+-	$(mkinstalldirs) $(CCE_SHARE_DIR)/cce
>+-	$(mkinstalldirs) $(CCE_SHARE_DIR)/cce/gbk
>+-	$(INSTALL_DATA) $(srcdir)/*.tab $(CCE_SHARE_DIR)/cce/gbk
>++	$(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce
>++	$(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce/gbk
>++	$(INSTALL_DATA) $(srcdir)/*.tab $(DESTDIR)$(CCE_SHARE_DIR)/cce/gbk
>+ 
>+ gbk-winbxm.tab gbk-winzm.tab: 
>+ 	@echo	
>diff -urN cce.orig/files/patch-inputs__jis__Makefile.in cce/files/patch-inputs__jis__Makefile.in
>--- cce.orig/files/patch-inputs__jis__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ cce/files/patch-inputs__jis__Makefile.in	2014-08-25 17:29:46.000000000 +0900
>@@ -0,0 +1,26 @@
>+--- inputs/jis/Makefile.in.orig	2004-02-14 13:17:24.000000000 +0900
>++++ inputs/jis/Makefile.in	2014-08-25 17:22:23.000000000 +0900
>+@@ -147,7 +147,7 @@
>+ target_vendor = @target_vendor@
>+ CIN2TAB = ../utils/cin2tab$(EXEEXT)
>+ JISLX = jis.lx
>+-CCE_SHARE_DIR = $(DESTDIR)$(datadir)
>++CCE_SHARE_DIR = $(datadir)
>+ 
>+ # You may add your favorite input method here
>+ #
>+@@ -346,10 +346,10 @@
>+ 	-rm -f core core.* *.lx *.tab
>+ 
>+ allinstall: $(CIN2TAB) $(JISLX)
>+-	$(mkinstalldirs) $(CCE_SHARE_DIR)/cce
>+-	$(mkinstalldirs) $(CCE_SHARE_DIR)/cce/jis
>+-	$(INSTALL_DATA) $(srcdir)/*.tab $(CCE_SHARE_DIR)/cce/jis
>+-	$(INSTALL_DATA) $(srcdir)/*.lx $(CCE_SHARE_DIR)/cce/jis
>++	$(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce
>++	$(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce/jis
>++	$(INSTALL_DATA) $(srcdir)/*.tab $(DESTDIR)$(CCE_SHARE_DIR)/cce/jis
>++	$(INSTALL_DATA) $(srcdir)/*.lx $(DESTDIR)$(CCE_SHARE_DIR)/cce/jis
>+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
>+ # Otherwise a system limit (for SysV at least) may be exceeded.
>+ .NOEXPORT:
>diff -urN cce.orig/files/patch-inputs__ksc__Makefile.in cce/files/patch-inputs__ksc__Makefile.in
>--- cce.orig/files/patch-inputs__ksc__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ cce/files/patch-inputs__ksc__Makefile.in	2014-08-25 17:30:06.000000000 +0900
>@@ -0,0 +1,26 @@
>+--- inputs/ksc/Makefile.in.orig	2004-02-14 13:17:24.000000000 +0900
>++++ inputs/ksc/Makefile.in	2014-08-25 17:23:10.000000000 +0900
>+@@ -147,7 +147,7 @@
>+ target_vendor = @target_vendor@
>+ CIN2TAB = ../utils/cin2tab$(EXEEXT)
>+ KSCLX = ksc.lx
>+-CCE_SHARE_DIR = $(DESTDIR)$(datadir)
>++CCE_SHARE_DIR = $(datadir)
>+ 
>+ # You may add your favorite input method here
>+ #
>+@@ -338,10 +338,10 @@
>+ 	-rm -f core core.* *.lx *.tab
>+ 
>+ allinstall: $(CIN2TAB) $(KSCLX)
>+-	$(mkinstalldirs) $(CCE_SHARE_DIR)/cce
>+-	$(mkinstalldirs) $(CCE_SHARE_DIR)/cce/ksc
>+-	$(INSTALL_DATA) $(srcdir)/*.tab $(CCE_SHARE_DIR)/cce/ksc
>+-	$(INSTALL_DATA) $(srcdir)/*.lx $(CCE_SHARE_DIR)/cce/ksc
>++	$(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce
>++	$(mkinstalldirs) $(DESTDIR)$(CCE_SHARE_DIR)/cce/ksc
>++	$(INSTALL_DATA) $(srcdir)/*.tab $(DESTDIR)$(CCE_SHARE_DIR)/cce/ksc
>++	$(INSTALL_DATA) $(srcdir)/*.lx $(DESTDIR)$(CCE_SHARE_DIR)/cce/ksc
>+ 
>+ #%.tab: %.cin $(CIN2TAB)
>+ .cin.tab: $(CIN2TAB)
>diff -urN cce.orig/files/patch-inputs__utils__Makefile.in cce/files/patch-inputs__utils__Makefile.in
>--- cce.orig/files/patch-inputs__utils__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ cce/files/patch-inputs__utils__Makefile.in	2014-08-25 17:30:29.000000000 +0900
>@@ -0,0 +1,11 @@
>+--- inputs/utils/Makefile.in.orig	2004-02-14 13:17:24.000000000 +0900
>++++ inputs/utils/Makefile.in	2014-08-25 17:13:20.000000000 +0900
>+@@ -169,7 +169,7 @@
>+ target_cpu = @target_cpu@
>+ target_os = @target_os@
>+ target_vendor = @target_vendor@
>+-CCE_SHARE_DIR = $(DESTDIR)$(datadir)
>++CCE_SHARE_DIR = $(datadir)
>+ cin2tab_bindir = $(CCE_SHARE_DIR)/cce
>+ cin2tab_SOURCES = cin2tab.c parse_cin.c table_cin.c pinyin_cin.c zhuyin_cin.c \
>+ 	   	  convert.c pyzyutil.c pyzymap.c
>diff -urN cce.orig/files/patch-src__Makefile.in cce/files/patch-src__Makefile.in
>--- cce.orig/files/patch-src__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ cce/files/patch-src__Makefile.in	2014-08-26 10:25:16.000000000 +0900
>@@ -0,0 +1,27 @@
>+--- src/Makefile.in.orig	2004-02-14 13:17:24.000000000 +0900
>++++ src/Makefile.in	2014-08-26 10:22:22.000000000 +0900
>+@@ -564,20 +564,20 @@
>+ 
>+ 
>+ install-exec-local:
>+-	chmod 4755 $(DESTDIR)$(bindir)/$(CCE)
>++#	chmod 4755 $(DESTDIR)$(bindir)/$(CCE)
>+ # make it suid-root
>+ 	@list='$(CCE_SYMLINKS)'; for p in $$list; do \
>+           if [ ! -f $(DESTDIR)$(bindir)/$$p ] ; then \
>+-		      $(LN_S) -f $(DESTDIR)$(bindir)/$(CCE) $(DESTDIR)$(bindir)/$$p ; \
>++		      $(LN_S) -f $(CCE) $(DESTDIR)$(bindir)/$$p ; \
>+           fi ; \
>+     done
>+ 
>+ install-data-local:
>+ 	$(mkinstalldirs) $(CCE_SHARE_DIR)/cce
>+-	$(INSTALL_DATA) $(srcdir)/cce.cfg $(CCE_SHARE_DIR)/cce/cce.cfg
>++	$(INSTALL_DATA) $(srcdir)/cce.cfg $(DESTDIR)$(sysconfdir)/cce.cfg
>+ 
>+ uninstall-local:
>+-	-rm -f $(CCE_SHARE_DIR)/cce/cce.cfg
>++	-rm -f $(DESTDIR)$(sysconfdir)/cce.cfg
>+ 	@list='$(CCE_SYMLINKS)'; for p in $$list; do \
>+     	rm -f $(DESTDIR)$(bindir)/$$p; \
>+     done
>diff -urN cce.orig/pkg-plist cce/pkg-plist
>--- cce.orig/pkg-plist	2014-01-23 00:16:56.000000000 +0900
>+++ cce/pkg-plist	2014-08-26 10:26:15.000000000 +0900
>@@ -1,10 +1,12 @@
>+@mode 4555
> bin/cce
>+@mode
> bin/cceb5
> bin/cceconv
> bin/ccegbk
> bin/ccejis
> bin/cceksc
>-share/cce/cce.cfg
>+etc/cce.cfg
> share/cce/8x16.bin
> share/cce/all/ciyin.tab
> share/cce/all/ciyingb.tab
>@@ -37,6 +39,8 @@
> share/cce/ksc/HANJA.tab
> share/cce/ksc/hanglm16.bin
> share/cce/ksc/ksc.lx
>+man/man1/cce.1.gz
>+man/man1/cceconv.1.gz
> @dirrm share/cce/all
> @dirrm share/cce/big5
> @dirrm share/cce/gb

Actions: View | Diff

Attachments on bug 192986: 146246 | 146285