Import of pkgsrc-2014Q1

This commit is contained in:
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions

View File

@@ -0,0 +1,7 @@
# $NetBSD: DEINSTALL,v 1.1 2014/01/20 13:26:54 ryoon Exp $
case ${STAGE} in
DEINSTALL)
${PREFIX}/bin/uim-module-manager --unregister-all
;;
esac

10
inputmethod/uim/INSTALL Normal file
View File

@@ -0,0 +1,10 @@
# $NetBSD: INSTALL,v 1.1 2014/01/20 13:26:54 ryoon Exp $
case ${STAGE} in
POST-INSTALL)
cd ${PREFIX}/share/uim/pkgsrc
for m in *
do ${PREFIX}/bin/uim-module-manager --register ${m}
done
;;
esac

View File

@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.79 2013/06/06 12:54:39 wiz Exp $
# $NetBSD: Makefile,v 1.91 2014/02/12 23:18:05 tron Exp $
#
.include "../../inputmethod/uim/Makefile.common"
PKGREVISION= 8
COMMENT= Multilingual input method library
PKGREVISION= 4
#LICENSE= See ${WRKSRC}/COPYING
CONFLICTS+= uim-qt4-immodule-[0-9]*
@@ -26,20 +26,20 @@ CFLAGS.SunOS+= -std=c99 -D__EXTENSIONS__
.include "options.mk"
PLIST_VARS+= editline
CHECK_BUILTIN.readline:= yes
.include "../../devel/readline/builtin.mk"
CHECK_BUILTIN.readline:= no
INSTALLATION_DIRS+= share/doc/uim share/examples/uim
.if !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS])
PLIST.editline= yes
.else
CONFIGURE_ARGS+= --with-libedit=no
.endif
INSTALLATION_DIRS+= share/doc/uim
EGDIR= ${PREFIX}/share/examples/uim
CONF_FILES= ${EGDIR}/loader.scm.example \
${PREFIX}/share/uim/loader.scm
CONF_FILES+= ${EGDIR}/installed-modules.scm.example \
${PREFIX}/share/uim/installed-modules.scm
post-install:
# Register uim module infomation
${MKDIR} ${DESTDIR}${PREFIX}/share/uim/pkgsrc
.for m in ${UIM_MODULES}
${TOUCH} ${DESTDIR}${PREFIX}/share/uim/pkgsrc/${m}
.endfor
${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/uim
${INSTALL_DATA} ${WRKSRC}/doc/COMPATIBILITY ${DESTDIR}${PREFIX}/share/doc/uim
${INSTALL_DATA} ${WRKSRC}/doc/CUSTOM ${DESTDIR}${PREFIX}/share/doc/uim
@@ -50,6 +50,11 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/PLUGIN ${DESTDIR}${PREFIX}/share/doc/uim
${INSTALL_DATA} ${WRKSRC}/doc/UIM-SCM ${DESTDIR}${PREFIX}/share/doc/uim
${INSTALL_DATA} ${WRKSRC}/doc/UIM-SH ${DESTDIR}${PREFIX}/share/doc/uim
# loader.scm and installed-modules.scm is updated by uim-module-manager.
${MV} ${DESTDIR}${PREFIX}/share/uim/loader.scm \
${DESTDIR}${EGDIR}/loader.scm.example
${MV} ${DESTDIR}${PREFIX}/share/uim/installed-modules.scm \
${DESTDIR}${EGDIR}/installed-modules.scm.example
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"

View File

@@ -1,9 +1,9 @@
# $NetBSD: Makefile.common,v 1.10 2013/03/06 11:06:55 obache Exp $
# $NetBSD: Makefile.common,v 1.11 2013/08/11 07:50:51 obache Exp $
#
# used by inputmethod/uim/Makefile
# used by inputmethod/uim-elisp/Makefile
UIM_VERSION= 1.8.4
UIM_VERSION= 1.8.6
DISTNAME= uim-${UIM_VERSION}
CATEGORIES= inputmethod
MASTER_SITES= http://uim.googlecode.com/files/

View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.20 2012/07/22 06:15:22 obache Exp $
@comment $NetBSD: PLIST,v 1.22 2014/01/20 13:26:54 ryoon Exp $
${PLIST.qt3}bin/uim-chardict-qt
${PLIST.qt}bin/uim-chardict-qt4
${PLIST.uim-dict-gtk}bin/uim-dict-gtk
@@ -158,7 +158,7 @@ share/uim/im-switcher.scm
share/uim/im.scm
share/uim/init.scm
share/uim/input-parse.scm
share/uim/installed-modules.scm
share/examples/uim/installed-modules.scm.example
share/uim/ipa-x-sampa.scm
share/uim/iso-639-1.scm
share/uim/japanese-act.scm
@@ -183,7 +183,7 @@ share/uim/lib/srfi-95.scm
share/uim/lib/unittest.scm
share/uim/light-record.scm
share/uim/load-action.scm
share/uim/loader.scm
share/examples/uim/loader.scm.example
share/uim/lolevel.scm
share/uim/look-custom.scm
share/uim/look.scm
@@ -363,6 +363,27 @@ share/uim/pixmaps/zm.svg
share/uim/pixmaps/zm_dark_background.png
share/uim/pixmaps/zm_dark_background.svg
share/uim/plugin.scm
share/uim/pkgsrc/ajax-ime
${PLIST.anthy}share/uim/pkgsrc/anthy
share/uim/pkgsrc/baidu-olime-jp
share/uim/pkgsrc/byeoru
${PLIST.canna}share/uim/pkgsrc/canna
share/uim/pkgsrc/elatin
share/uim/pkgsrc/google-cgiapi-jp
share/uim/pkgsrc/look
share/uim/pkgsrc/ipa-x-sampa
share/uim/pkgsrc/latin
${PLIST.m17nlib}share/uim/pkgsrc/m17nlib
${PLIST.prime}share/uim/pkgsrc/prime
share/uim/pkgsrc/pyload
${PLIST.sj3}share/uim/pkgsrc/sj3
share/uim/pkgsrc/skk
share/uim/pkgsrc/social-ime
share/uim/pkgsrc/tutcode
share/uim/pkgsrc/viqr
${PLIST.wnn}share/uim/pkgsrc/wnn
share/uim/pkgsrc/xmload
${PLIST.expat}share/uim/pkgsrc/yahoo-jp
share/uim/predict-custom.scm
share/uim/predict-google-suggest.scm
share/uim/predict-look-skk.scm

View File

@@ -1,10 +1,11 @@
$NetBSD: distinfo,v 1.24 2013/03/06 11:06:55 obache Exp $
$NetBSD: distinfo,v 1.26 2014/02/02 10:47:24 obache Exp $
SHA1 (uim-1.8.4.tar.bz2) = d2c699ce7a6037accc6f3342db1de8d696f361e9
RMD160 (uim-1.8.4.tar.bz2) = 9722ae76020db093e0a8f8aa0f146caddcf3fff5
Size (uim-1.8.4.tar.bz2) = 6494902 bytes
SHA1 (uim-1.8.6.tar.bz2) = 43b9dbdead6797880e6cfc9c032ecb2d37d42777
RMD160 (uim-1.8.6.tar.bz2) = 5f94218d82475ac463534ec681769f34547e5707
Size (uim-1.8.6.tar.bz2) = 6500739 bytes
SHA1 (patch-ab) = 56a7d5aadd2339f5bacae80b28ce520e6df3d1ab
SHA1 (patch-ac) = 7c36bc67764925c9d87ad0aa963a53cfd1948224
SHA1 (patch-ad) = 9c47fa28b6478bf2e720c1c0e7bf7793eb71fbab
SHA1 (patch-ae) = 59944fc9c7256056125fa3a623aecf6a2e9dfe42
SHA1 (patch-af) = 9f543b90bfefc5f560e1eaac97d60af70ffed5cc
SHA1 (patch-fep_escseq.c) = 6c25c344e5b694542a3c5bc137ae1a1d36a8c835

View File

@@ -1,12 +1,25 @@
# $NetBSD: options.mk,v 1.27 2012/10/23 10:24:07 wiz Exp $
# $NetBSD: options.mk,v 1.29 2014/01/20 13:26:54 ryoon Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.uim
PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gnome3 gtk gtk3 m17nlib openssl prime sj3 sqlite uim-fep wnn4 xim
PKG_SUPPORTED_OPTIONS+= editline
PKG_OPTIONS_OPTIONAL_GROUPS= kde qt
PKG_OPTIONS_GROUP.kde= kde kde3
PKG_OPTIONS_GROUP.qt= qt qt3
PKG_SUGGESTED_OPTIONS= anthy expat gtk prime uim-fep xim
# Store installed modules
UIM_MODULES= skk tutcode byeoru latin elatin xmload pyload \
viqr ipa-x-sampa look ajax-ime social-ime \
google-cgiapi-jp baidu-olime-jp
CHECK_BUILTIN.editline:= yes
.include "../../devel/editline/builtin.mk"
CHECK_BUILTIN.editline:= no
.if !empty(USE_BUILTIN.editline:M[Yy][Ee][Ss])
PKG_SUGGESTED_OPTIONS+= editline
.endif
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mqt)
@@ -22,6 +35,17 @@ PKG_FAIL_REASON+= "'qt3' conflict with 'qt' or 'kde' option"
PLIST_VARS+= helperdata uim-dict-gtk uim-dict-gtk3 uim-dict-helperdata fep
PLIST_VARS+= anthy curl eb expat ffi gnome gnome3 gtk gtk3 kde kde3 m17nlib openssl qt qt3 sqlite wnn xim
PLIST_VARS+= canna prime sj3
PLIST_VARS+= editline
.if !empty(PKG_OPTIONS:Meditline)
PLIST.editline= yes
.include "../../devel/editline/buildlink3.mk"
CONFIGURE_ARGS+= --with-libedit=${BUILDLINK_PREFIX.editline}
.else
CONFIGURE_ARGS+= --with-libedit=no
.endif
.if !empty(PKG_OPTIONS:Mxim)
.include "../../x11/libXft/buildlink3.mk"
@@ -57,12 +81,14 @@ CONFIGURE_ARGS+= --disable-fep
. include "../../inputmethod/anthy/buildlink3.mk"
CONFIGURE_ARGS+= --with-anthy-utf8
PLIST.anthy= yes
UIM_MODULES+= anthy
.else
CONFIGURE_ARGS+= --without-anthy
.endif
.if !empty(PKG_OPTIONS:Mcanna)
CONFIGURE_ARGS+= --with-canna
UIM_MODULES+= canna
.endif
.if !empty(PKG_OPTIONS:Mcurl)
@@ -83,6 +109,7 @@ PLIST.eb= yes
. include "../../textproc/expat/buildlink3.mk"
CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat}
PLIST.expat= yes
UIM_MODULES+= yahoo-jp
.endif
.if !empty(PKG_OPTIONS:Mffi)
@@ -160,6 +187,7 @@ PLIST.m17nlib= yes
INSTALL_TEMPLATES+= INSTALL.m17nlib
DEINSTALL_TEMPLATES+= DEINSTALL.m17nlib
CHECK_FILES_SKIP+= ${PREFIX}/share/uim/pixmaps/m17n-.*\.png
UIM_MODULES+= m17nlib
.else
CONFIGURE_ARGS+= --without-m17nlib
.endif
@@ -190,10 +218,14 @@ PLIST.openssl= yes
.if !empty(PKG_OPTIONS:Mprime)
CONFIGURE_ARGS+= --with-prime
PLIST.prime= yes
UIM_MODULES+= prime
.endif
.if !empty(PKG_OPTIONS:Msj3)
CONFIGURE_ARGS+= --with-sj3
PLIST.sj3= yes
UIM_MODULES+= sj3
.endif
# For input prediction
@@ -210,6 +242,7 @@ CONFIGURE_ARGS+= --with-wnn-includes=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/
CONFIGURE_ARGS+= --with-wnn-libraries=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/lib
CPPFLAGS+= -DWNNENVDIR=\"${BUILDLINK_PREFIX.ja-FreeWnn-lib}/share/wnn\"
PLIST.wnn= yes
UIM_MODULES+= wnn
.endif
.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome)

View File

@@ -0,0 +1,62 @@
$NetBSD: patch-fep_escseq.c,v 1.1 2014/02/02 10:47:24 obache Exp $
* termios.h is required for struct termios
* pass 9 parameters to tparm(3) for portability
--- fep/escseq.c.orig 2013-06-30 04:26:09.000000000 +0000
+++ fep/escseq.c
@@ -61,6 +61,9 @@
#ifdef HAVE_STRING_H
#include <string.h>
#endif
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+#endif
#include "uim-fep.h"
#include "draw.h"
@@ -964,7 +967,7 @@ void put_cursor_address(int row, int col
if (row == s_cursor.row && col == s_cursor.col && col < g_win->ws_col - 2) {
return;
}
- tmp = tparm(cursor_address, row, col);
+ tmp = tparm(cursor_address, row, col, 0, 0, 0, 0, 0, 0, 0);
my_putp(tmp);
s_cursor.row = row;
s_cursor.col = col;
@@ -985,7 +988,7 @@ void put_insert(int n)
if (n <= 0) {
return;
}
- tmp = tparm(parm_ich, n);
+ tmp = tparm(parm_ich, n, 0, 0, 0, 0, 0, 0, 0, 0);
my_putp(tmp);
debug(("<ins %d>", n));
}
@@ -1007,7 +1010,7 @@ void put_delete(int n)
change_background_attr(&s_attr, s_attr_uim);
}
- tmp = tparm(parm_dch, n);
+ tmp = tparm(parm_dch, n, 0, 0, 0, 0, 0, 0, 0, 0);
my_putp(tmp);
debug(("<del %d>", n));
}
@@ -1036,7 +1039,7 @@ void put_goto_lastline(int col)
if (row == s_cursor.row && col == s_cursor.col) {
return;
}
- tmp = tparm(cursor_address, row, col);
+ tmp = tparm(cursor_address, row, col, 0, 0, 0, 0, 0, 0, 0);
my_putp(tmp);
s_cursor.row = row;
s_cursor.col = col;
@@ -1103,7 +1106,7 @@ void put_clear_to_end_of_line(int width)
*/
void put_change_scroll_region(int start, int end)
{
- const char *tmp = tparm(change_scroll_region, start, end);
+ const char *tmp = tparm(change_scroll_region, start, end, 0, 0, 0, 0, 0, 0, 0);
my_putp(tmp);
s_cursor.row = s_cursor.col = 0;
debug(("<region %d %d>", start, end));