From 89e6d0e57513d5ea8f68ed55ea3a513c8c96df48 Mon Sep 17 00:00:00 2001 From: John Marino Date: Tue, 26 Aug 2014 21:04:26 +0000 Subject: Stage chinese/cce PR: 192986 Submitted by: turutani --- chinese/cce/Makefile | 10 ++-- chinese/cce/files/extra-patch-src::Makefile.am | 15 ----- chinese/cce/files/patch-Makefile.in | 66 ++++++++++++++++++++++ chinese/cce/files/patch-doc__Makefile.in | 21 +++++++ chinese/cce/files/patch-fonts__Makefile.in | 22 ++++++++ chinese/cce/files/patch-inputs__all__Makefile.in | 42 ++++++++++---- chinese/cce/files/patch-inputs__big5__Makefile.in | 26 +++++++++ chinese/cce/files/patch-inputs__gb__Makefile.in | 26 +++++++++ chinese/cce/files/patch-inputs__gbk__Makefile.in | 24 ++++++++ chinese/cce/files/patch-inputs__jis__Makefile.in | 26 +++++++++ chinese/cce/files/patch-inputs__ksc__Makefile.in | 26 +++++++++ chinese/cce/files/patch-inputs__utils__Makefile.in | 11 ++++ chinese/cce/files/patch-src__Makefile.in | 27 +++++++++ chinese/cce/pkg-plist | 6 +- 14 files changed, 317 insertions(+), 31 deletions(-) delete mode 100644 chinese/cce/files/extra-patch-src::Makefile.am create mode 100644 chinese/cce/files/patch-Makefile.in create mode 100644 chinese/cce/files/patch-doc__Makefile.in create mode 100644 chinese/cce/files/patch-fonts__Makefile.in create mode 100644 chinese/cce/files/patch-inputs__big5__Makefile.in create mode 100644 chinese/cce/files/patch-inputs__gb__Makefile.in create mode 100644 chinese/cce/files/patch-inputs__gbk__Makefile.in create mode 100644 chinese/cce/files/patch-inputs__jis__Makefile.in create mode 100644 chinese/cce/files/patch-inputs__ksc__Makefile.in create mode 100644 chinese/cce/files/patch-inputs__utils__Makefile.in create mode 100644 chinese/cce/files/patch-src__Makefile.in (limited to 'chinese') diff --git a/chinese/cce/Makefile b/chinese/cce/Makefile index 01e826958dfe..232de57bdb70 100644 --- a/chinese/cce/Makefile +++ b/chinese/cce/Makefile @@ -3,11 +3,11 @@ 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 +17,12 @@ PATCH_DIST_STRIP=-p1 MAINTAINER= ports@FreeBSD.org COMMENT= Console CJK Environment +LICENSE= GPLv2 + +USES= tar:tgz 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 diff --git a/chinese/cce/files/extra-patch-src::Makefile.am b/chinese/cce/files/extra-patch-src::Makefile.am deleted file mode 100644 index ad1678aaf6c0..000000000000 --- a/chinese/cce/files/extra-patch-src::Makefile.am +++ /dev/null @@ -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 --git a/chinese/cce/files/patch-Makefile.in b/chinese/cce/files/patch-Makefile.in new file mode 100644 index 000000000000..d755b1b869b7 --- /dev/null +++ b/chinese/cce/files/patch-Makefile.in @@ -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 --git a/chinese/cce/files/patch-doc__Makefile.in b/chinese/cce/files/patch-doc__Makefile.in new file mode 100644 index 000000000000..a2bbde393c0c --- /dev/null +++ b/chinese/cce/files/patch-doc__Makefile.in @@ -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 --git a/chinese/cce/files/patch-fonts__Makefile.in b/chinese/cce/files/patch-fonts__Makefile.in new file mode 100644 index 000000000000..29327f5d9925 --- /dev/null +++ b/chinese/cce/files/patch-fonts__Makefile.in @@ -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 --git a/chinese/cce/files/patch-inputs__all__Makefile.in b/chinese/cce/files/patch-inputs__all__Makefile.in index e7386ec3195f..3ec82074d440 100644 --- a/chinese/cce/files/patch-inputs__all__Makefile.in +++ b/chinese/cce/files/patch-inputs__all__Makefile.in @@ -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 --git a/chinese/cce/files/patch-inputs__big5__Makefile.in b/chinese/cce/files/patch-inputs__big5__Makefile.in new file mode 100644 index 000000000000..1f586f8a11e2 --- /dev/null +++ b/chinese/cce/files/patch-inputs__big5__Makefile.in @@ -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 --git a/chinese/cce/files/patch-inputs__gb__Makefile.in b/chinese/cce/files/patch-inputs__gb__Makefile.in new file mode 100644 index 000000000000..b5bd99334921 --- /dev/null +++ b/chinese/cce/files/patch-inputs__gb__Makefile.in @@ -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 --git a/chinese/cce/files/patch-inputs__gbk__Makefile.in b/chinese/cce/files/patch-inputs__gbk__Makefile.in new file mode 100644 index 000000000000..13f1773b489e --- /dev/null +++ b/chinese/cce/files/patch-inputs__gbk__Makefile.in @@ -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 --git a/chinese/cce/files/patch-inputs__jis__Makefile.in b/chinese/cce/files/patch-inputs__jis__Makefile.in new file mode 100644 index 000000000000..dcf0ea3f43f8 --- /dev/null +++ b/chinese/cce/files/patch-inputs__jis__Makefile.in @@ -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 --git a/chinese/cce/files/patch-inputs__ksc__Makefile.in b/chinese/cce/files/patch-inputs__ksc__Makefile.in new file mode 100644 index 000000000000..91189dd191e5 --- /dev/null +++ b/chinese/cce/files/patch-inputs__ksc__Makefile.in @@ -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 --git a/chinese/cce/files/patch-inputs__utils__Makefile.in b/chinese/cce/files/patch-inputs__utils__Makefile.in new file mode 100644 index 000000000000..2223ee9d5818 --- /dev/null +++ b/chinese/cce/files/patch-inputs__utils__Makefile.in @@ -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 --git a/chinese/cce/files/patch-src__Makefile.in b/chinese/cce/files/patch-src__Makefile.in new file mode 100644 index 000000000000..ebef26c2d767 --- /dev/null +++ b/chinese/cce/files/patch-src__Makefile.in @@ -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 --git a/chinese/cce/pkg-plist b/chinese/cce/pkg-plist index e06ff612fdc8..1010b39b9556 100644 --- a/chinese/cce/pkg-plist +++ b/chinese/cce/pkg-plist @@ -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/HANGUL.tab 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 -- cgit v1.2.3