pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/inputmethod/xcin Added chewing module support.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fabe9c58dc10
branches:  trunk
changeset: 507178:fabe9c58dc10
user:      rxg <rxg%pkgsrc.org@localhost>
date:      Sat Jan 28 03:03:11 2006 +0000

description:
Added chewing module support.
Taken the patches form -
        http://chewing.csie.net/download/xcin/xcin-chewing-20041004.diff
Used PKG_SYSCONFDIR schema.
Used ${PAX} to do post-install.
Bump PKGREVISION.

diffstat:

 inputmethod/xcin/Makefile         |   20 +-
 inputmethod/xcin/PLIST            |    6 +-
 inputmethod/xcin/distinfo         |   13 +-
 inputmethod/xcin/patches/patch-aa |   14 +-
 inputmethod/xcin/patches/patch-ab |   13 -
 inputmethod/xcin/patches/patch-ac |   25 +-
 inputmethod/xcin/patches/patch-ad |   30 +-
 inputmethod/xcin/patches/patch-ae |   14 +
 inputmethod/xcin/patches/patch-af |   36 ++
 inputmethod/xcin/patches/patch-ag |  520 ++++++++++++++++++++++++++++++++++++++
 inputmethod/xcin/patches/patch-ah |   10 +
 11 files changed, 651 insertions(+), 50 deletions(-)

diffs (truncated from 829 to 300 lines):

diff -r 26ad4434d9f5 -r fabe9c58dc10 inputmethod/xcin/Makefile
--- a/inputmethod/xcin/Makefile Sat Jan 28 02:54:32 2006 +0000
+++ b/inputmethod/xcin/Makefile Sat Jan 28 03:03:11 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2005/07/16 19:10:39 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/01/28 03:03:11 rxg Exp $
 #
 
 DISTNAME=      xcin-2.5.3.pre2
 PKGNAME=       xcin-2.5.3rc2
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    chinese x11
 MASTER_SITES=  ftp://xcin.linux.org.tw/pub/xcin/xcin/devel/
 
@@ -18,21 +18,27 @@
 USE_TOOLS+=            perl:run
 
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=       --with-db-lib=${BUILDLINK_PREFIX.db3}/lib
 CONFIGURE_ARGS+=       --with-db-inc=${BUILDLINK_PREFIX.db3}/include/db3
 
-post-extract:
-       ${MV} ${WRKSRC}/doc/man ${WRKSRC}
+.include "../../mk/bsd.prefs.mk"
+
+INSTALLATION_DIRS=     share/doc/xcin
+
+EGDIR=                 ${PREFIX}/share/examples/xcin
+CONF_FILES=            ${EGDIR}/xcinrc ${PKG_SYSCONFDIR}/xcinrc
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xcin
-       cd ${WRKSRC}/doc && ${PAX} -rw * ${PREFIX}/share/doc/xcin
+       cd ${WRKSRC}/doc && ${PAX} -rw  \
+               -s ',^\./man$$,,' -s ',^\./man/.*,,'    \
+               . ${PREFIX}/share/doc/xcin
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/db3/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../inputmethod/libchewing/buildlink3.mk"
 .include "../../inputmethod/libtabe/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff -r 26ad4434d9f5 -r fabe9c58dc10 inputmethod/xcin/PLIST
--- a/inputmethod/xcin/PLIST    Sat Jan 28 02:54:32 2006 +0000
+++ b/inputmethod/xcin/PLIST    Sat Jan 28 03:03:11 2006 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/01/28 03:03:11 rxg Exp $
 bin/cin2tab
 bin/xcin
-etc/xcinrc
 lib/libxcin.la
+lib/xcin/chewing.la
 lib/xcin/bimsphone.la
 lib/xcin/gen_inp.la
 lib/xcin/tab/big5/array30.tab
@@ -54,7 +54,9 @@
 share/doc/xcin/modules/gen_inp
 share/doc/xcin/modules/im_comm
 share/doc/xcin/modules/zh_hex
+share/examples/xcin/xcinrc
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xcin.mo
+@dirrm share/examples/xcin
 @dirrm share/doc/xcin/modules
 @dirrm share/doc/xcin/internal
 @dirrm share/doc/xcin/history
diff -r 26ad4434d9f5 -r fabe9c58dc10 inputmethod/xcin/distinfo
--- a/inputmethod/xcin/distinfo Sat Jan 28 02:54:32 2006 +0000
+++ b/inputmethod/xcin/distinfo Sat Jan 28 03:03:11 2006 +0000
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.3 2005/06/26 16:45:57 rxg Exp $
+$NetBSD: distinfo,v 1.4 2006/01/28 03:03:11 rxg Exp $
 
 SHA1 (xcin-2.5.3.pre2.tar.gz) = 27e4c47e09c44e92e3a3afc9e08134e1485f6795
 RMD160 (xcin-2.5.3.pre2.tar.gz) = f1fb83d1e21a0f5dbb80c5eafdaa6c7f313ea865
 Size (xcin-2.5.3.pre2.tar.gz) = 1433915 bytes
-SHA1 (patch-aa) = f192f038e048d7118ea7969b12e424b5ba9903a9
-SHA1 (patch-ab) = 36c4c9e5ec17a45db62fc08c2d07cc0a9ff72ae2
-SHA1 (patch-ac) = 1ce8c3dce665dec10db563847edfbf79ce3e5d52
-SHA1 (patch-ad) = c39bea80e15a1283e42855ea8ed25cddf8522b56
+SHA1 (patch-aa) = f08a273843fd6dc50f71c815f0cd9c8c8c0cdc40
+SHA1 (patch-ac) = a1bccd9d946d287eedf26bba4aebb89be8ee7e70
+SHA1 (patch-ad) = 6e59d32f5e3f8f06f8b4bcbb32e221678db74018
+SHA1 (patch-ae) = 13985687af55de0a6727150d41d2d6333d103689
+SHA1 (patch-af) = 23dde43647de72fb6492a51016379db88f37cdd2
+SHA1 (patch-ag) = fdb0f067f6b58648bbff7f8e0afc8cdb2703af81
+SHA1 (patch-ah) = 0bc13a5e03157cc788228162d7f212d5741c29bf
diff -r 26ad4434d9f5 -r fabe9c58dc10 inputmethod/xcin/patches/patch-aa
--- a/inputmethod/xcin/patches/patch-aa Sat Jan 28 02:54:32 2006 +0000
+++ b/inputmethod/xcin/patches/patch-aa Sat Jan 28 03:03:11 2006 +0000
@@ -1,12 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/04 08:47:00 uebayasi Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/28 03:03:11 rxg Exp $
 
---- etc/Makefile.in.orig       Mon Mar 26 22:08:24 2001
+--- etc/Makefile.in.orig       2001-11-28 22:39:03.000000000 +0800
 +++ etc/Makefile.in
-@@ -38,7 +38,6 @@
+@@ -22,9 +22,8 @@ xcinrc:
+ .PHONY: install clean distclean subsys
  
  install: all
-       if [ ! -d "$(xcin_rcp)" ];  then $(INSTALL) -d $(xcin_rcp);  fi
+-      if [ ! -d "$(xcin_rcp)" ];  then $(INSTALL) -d $(xcin_rcp);  fi
 -      if [ -f $(xcin_rcp)/xcinrc ]; then mv $(xcin_rcp)/xcinrc $(xcin_rcp)/xcinrc.old; fi
-       $(INSTALL_DATA) xcinrc $(xcin_rcp)
+-      $(INSTALL_DATA) xcinrc $(xcin_rcp)
++      if [ ! -d "$(prefix)/share/examples/xcin" ];  then $(INSTALL) -d $(prefix)/share/examples/xcin;  fi
++      $(INSTALL_DATA) xcinrc $(prefix)/share/examples/xcin
  
  clean:
+       rm -f xcinrc
diff -r 26ad4434d9f5 -r fabe9c58dc10 inputmethod/xcin/patches/patch-ab
--- a/inputmethod/xcin/patches/patch-ab Sat Jan 28 02:54:32 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/06/04 08:47:00 uebayasi Exp $
-
---- script/Makefile.in.orig    Sun Nov 11 20:39:41 2001
-+++ script/Makefile.in
-@@ -16,7 +16,7 @@
-       ( cd etc; ${MAKE} install )
-       ( cd cin; ${MAKE} install )
-       ( cd po;  ${MAKE} install )
--      ( cd doc/man; ${MAKE} install )
-+      ( cd man; ${MAKE} install )
- 
- clean:
-       ( cd src; ${MAKE} clean )
diff -r 26ad4434d9f5 -r fabe9c58dc10 inputmethod/xcin/patches/patch-ac
--- a/inputmethod/xcin/patches/patch-ac Sat Jan 28 02:54:32 2006 +0000
+++ b/inputmethod/xcin/patches/patch-ac Sat Jan 28 03:03:11 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2005/06/26 16:45:57 rxg Exp $
+$NetBSD: patch-ac,v 1.3 2006/01/28 03:03:11 rxg Exp $
 
---- configure.orig     Tue Nov 27 22:21:17 2001
+--- configure.orig     2001-11-27 22:21:17.000000000 +0800
 +++ configure
-@@ -7666,7 +7666,7 @@
+@@ -7666,7 +7666,7 @@ found=n 
  fi
  done
  
@@ -11,7 +11,7 @@
        echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
  echo "configure:7672: checking for gettext in -lintl" >&5
  ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
-@@ -8619,7 +8619,7 @@
+@@ -8619,7 +8619,7 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g
  $ac_vpsub
  $extrasub
  s%@SHELL@%$SHELL%g
@@ -20,12 +20,11 @@
  s%@CPPFLAGS@%$CPPFLAGS%g
  s%@CXXFLAGS@%$CXXFLAGS%g
  s%@FFLAGS@%$FFLAGS%g
-@@ -8759,7 +8759,7 @@
-       cin/gb/Makefile \
-       etc/Makefile \
-       po/Makefile \
--      doc/man/Makefile"}
-+      man/Makefile"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+@@ -8751,6 +8751,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile:s
+       src/Cinput/zh_hex/Makefile \
+       src/Cinput/gen_inp/Makefile \
+       src/Cinput/bimsphone/Makefile \
++      src/Cinput/chewing/Makefile \
+       src/util/Makefile \
+       src/util/cin2tab/Makefile \
+       src/util/testprog/Makefile \
diff -r 26ad4434d9f5 -r fabe9c58dc10 inputmethod/xcin/patches/patch-ad
--- a/inputmethod/xcin/patches/patch-ad Sat Jan 28 02:54:32 2006 +0000
+++ b/inputmethod/xcin/patches/patch-ad Sat Jan 28 03:03:11 2006 +0000
@@ -1,8 +1,28 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/06/04 08:47:00 uebayasi Exp $
+$NetBSD: patch-ad,v 1.2 2006/01/28 03:03:11 rxg Exp $
 
---- etc/xcinrc.NETBSD.orig     Thu Nov 29 21:50:42 2001
+--- etc/xcinrc.NETBSD.orig     2001-11-29 21:50:42.000000000 +0800
 +++ etc/xcinrc.NETBSD
-@@ -163,7 +163,7 @@
+@@ -112,7 +112,7 @@
+     (DEFAULT_IM_SINMD "DEFAULT")
+     (PHRASE           "default.phr")
+     (CINPUT           (cj simplex phone bimspinyin bimsphone jyutping
+-                       array30 jyutping0 zh_hex))
++                       array30 jyutping0 chewing zh_hex))
+     (FONTSET          "-sony-*-24-*-iso8859-1,-*-medium-r-*-24-*-big5-0")
+     (OVERSPOT_FONTSET "-sony-*-16-*-iso8859-1,-*-medium-r-*-16-*-big5-0")))
+ ;
+@@ -152,6 +152,10 @@
+       '((SETKEY               9)
+         (BEEP_DUPCHAR         YES)))
+ 
++(define chewing@big5
++      '((SETKEY               10)
++        (MODULE               "chewing")))
++
+ 
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;
+@@ -163,7 +167,7 @@
      (DEFAULT_IM_SINMD "DEFAULT")
      (PHRASE           "default.phr")
      (CINPUT           (pinyin shuangpin jtcj_gb wubizixing phonegb2
@@ -11,7 +31,7 @@
      (FONTSET          "-sony-*-24-*-iso8859-1,-*-medium-r-*-24-*-gb2312.1980-0")
      (OVERSPOT_FONTSET "-sony-*-16-*-iso8859-1,-*-medium-r-*-16-*-gb2312.1980-0")))
  ;
-@@ -180,7 +180,7 @@
+@@ -180,7 +184,7 @@
  (define jtcj_gb@euccn
        '((SETKEY               3)))
  
@@ -20,7 +40,7 @@
        '((SETKEY               4)
          (END_KEY              YES)
          (BEEP_DUPCHAR         YES)))
-@@ -188,11 +188,6 @@
+@@ -188,11 +192,6 @@
  (define wubizixing@euccn
        '((SETKEY               5)))
  
diff -r 26ad4434d9f5 -r fabe9c58dc10 inputmethod/xcin/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/xcin/patches/patch-ae Sat Jan 28 03:03:11 2006 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2006/01/28 03:03:11 rxg Exp $
+
+--- src/Cinput/chewing/.depend.orig    2006-01-21 20:19:00.000000000 +0800
++++ src/Cinput/chewing/.depend
+@@ -0,0 +1,9 @@
++#
++# PLEASE DON'T EDIT.
++#
++# This is automatically generated from "make depend".
++# You need GCC and perl to generate me.
++#
++
++xcin_chewing.lo: xcin_chewing.c  ../../../config.h ../../../src/include/xcintool.h ../../../src/include/module.h
++      @$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INC) -c -o $@ xcin_chewing.c
diff -r 26ad4434d9f5 -r fabe9c58dc10 inputmethod/xcin/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/xcin/patches/patch-af Sat Jan 28 03:03:11 2006 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-af,v 1.1 2006/01/28 03:03:11 rxg Exp $
+
+--- src/Cinput/chewing/Makefile.in.orig        2006-01-21 20:23:07.000000000 +0800
++++ src/Cinput/chewing/Makefile.in
+@@ -0,0 +1,31 @@
++srcdir                = @srcdir@
++top_srcdir    = @top_srcdir@
++include $(top_srcdir)/Rules
++
++INC           = $(xcininc) $(intl_inc) $(x_includes) \
++              -I$(top_srcdir) \
++              -DCHEWING_DATA_DIR="\"$(LOCALBASE)/share/chewing\""
++LIB           = $(xcinlib) -lchewing
++TARGET                = chewing.la
++
++SRC = xcin_chewing.c
++OBJ = $(SRC:.c=.lo)
++
++.PHONY: depend clean distclean
++
++all: depend $(TARGET)
++
++$(TARGET): $(OBJ)
++      $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \
++              $(OBJ) $(LIB) -rpath $(moddir)
++include .depend
++
++depend:
++      $(Dep_Rule) | $(PERL) $(makedep) $(rules) LC_Rule lo > .depend
++
++clean:
++      rm -f $(OBJ) *.o $(TARGET) core *.a
++distclean: clean
++      rm -rf Makefile .libs
++install: $(TARGET)
++      $(LIBTOOL) --mode=install $(INSTALL_DATA) $(TARGET) $(xcin_modp)
diff -r 26ad4434d9f5 -r fabe9c58dc10 inputmethod/xcin/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/xcin/patches/patch-ag Sat Jan 28 03:03:11 2006 +0000
@@ -0,0 +1,520 @@
+$NetBSD: patch-ag,v 1.1 2006/01/28 03:03:11 rxg Exp $
+
+--- src/Cinput/chewing/xcin_chewing.c.orig     2006-01-21 20:32:10.000000000 +0800
++++ src/Cinput/chewing/xcin_chewing.c
+@@ -0,0 +1,515 @@



Home | Main Index | Thread Index | Old Index