Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2014Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
inputmethod/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.55 2013/03/13 15:08:16 ryoon Exp $
# $NetBSD: Makefile,v 1.60 2014/01/20 10:46:30 ryoon Exp $
#
COMMENT= Input method tools and libraries
@@ -23,9 +23,11 @@ SUBDIR+= ibus-el
SUBDIR+= ibus-handwrite
SUBDIR+= ibus-hangul
SUBDIR+= ibus-input-pad
SUBDIR+= ibus-libthai
SUBDIR+= ibus-m17n
SUBDIR+= ibus-mozc
SUBDIR+= ibus-pinyin
SUBDIR+= ibus-python
SUBDIR+= ibus-qt
SUBDIR+= ibus-skk
SUBDIR+= ibus-t9
@@ -52,6 +54,7 @@ SUBDIR+= libskk
SUBDIR+= libtabe
SUBDIR+= m17n-im-config
SUBDIR+= mozc-elisp
SUBDIR+= mozc-renderer
SUBDIR+= mozc-server
SUBDIR+= mozc-tool
SUBDIR+= multiskkserv
@@ -63,6 +66,7 @@ SUBDIR+= prime-dict
SUBDIR+= prime-el
SUBDIR+= py-input-pad
SUBDIR+= py-zinnia
SUBDIR+= qt5-uim
SUBDIR+= ruby-zinnia
SUBDIR+= scim
SUBDIR+= scim-anthy
@@ -119,6 +123,7 @@ SUBDIR+= tomoe
SUBDIR+= tomoe-gtk
SUBDIR+= uim
SUBDIR+= uim-elisp
SUBDIR+= uim-mozc
SUBDIR+= uim-tomoe-gtk
SUBDIR+= unicon-im
SUBDIR+= xcin

4
inputmethod/canna-dict/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.13 2012/10/06 14:25:10 asau Exp $
# $NetBSD: Makefile,v 1.14 2013/07/12 10:44:55 jperkin Exp $
PKGREVISION= 2
PKGREVISION= 3
CANNA_MODULE= dict
MAKE_JOBS_SAFE= no

4
inputmethod/canna-server/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.22 2010/02/20 10:48:00 obache Exp $
# $NetBSD: Makefile,v 1.23 2013/07/12 10:44:55 jperkin Exp $
PKGREVISION= 4
PKGREVISION= 5
CANNA_MODULE= server
.include "../../inputmethod/canna/Makefile.common"

3
inputmethod/canna-server/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.7 2005/05/02 20:33:59 reed Exp $
@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:05:02 jperkin Exp $
bin/addwords
bin/canlisp
bin/cannacheck
@@ -75,4 +75,3 @@ man/man1/splitword.1
man/man1/wtoc.1
sbin/cannakill
sbin/cannaserver
share/examples/rc.d/canna

4
inputmethod/gcin/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.25 2013/06/06 12:54:36 wiz Exp $
# $NetBSD: Makefile,v 1.28 2013/10/10 14:42:17 ryoon Exp $
#
DISTNAME= gcin-1.1.7
PKGREVISION= 13
PKGREVISION= 16
CATEGORIES= inputmethod
#MASTER_SITES= http://www.csie.nctu.edu.tw/~cp76/gcin/download/
MASTER_SITES= http://cle.linux.org.tw/gcin/download/gcin-old/gcin-1.1.x/

9
inputmethod/gtk-im-libthai/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.21 2013/06/06 12:54:36 wiz Exp $
# $NetBSD: Makefile,v 1.25 2014/02/27 12:47:45 obache Exp $
#
DISTNAME= gtk-im-libthai-0.2.1
PKGREVISION= 9
PKGREVISION= 13
CATEGORIES= inputmethod
MASTER_SITES= http://linux.thai.net/pub/thailinux/software/libthai/ \
ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
@@ -16,11 +16,12 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --disable-gtk3
GTK2_IMMODULES= yes
.include "../../x11/gtk2/modules.mk"
GTK3_IMMODULES= yes
.include "../../x11/gtk3/modules.mk"
.include "../../devel/libthai/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

3
inputmethod/gtk-im-libthai/PLIST
View File

@@ -1,2 +1,3 @@
@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:01:29 joerg Exp $
@comment $NetBSD: PLIST,v 1.3 2014/02/27 12:47:45 obache Exp $
lib/gtk-2.0/2.10.0/immodules/im-thai-libthai.la
lib/gtk-3.0/3.0.0/immodules/im-thai-libthai.la

19
inputmethod/ibus-anthy/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.12 2012/10/06 14:25:11 asau Exp $
#
# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:11 wiz Exp $
DISTNAME= ibus-anthy-1.2.7
DISTNAME= ibus-anthy-1.5.4
PKGREVISION= 1
CATEGORIES= inputmethod japanese
MASTER_SITES= http://ibus.googlecode.com/files/
@@ -11,8 +11,10 @@ COMMENT= Anthy engine for IBus input platform
LICENSE= gnu-gpl-v2
DEPENDS+= kasumi>=2.1:../../inputmethod/kasumi
DEPENDS+= ibus>=1.2.0.20100111:../../inputmethod/ibus
DEPENDS+= ${PYPKGPREFIX}-gtk2>=1.15.2:../../x11/py-gtk2
DEPENDS+= ibus>=1.5.4:../../inputmethod/ibus
DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
PYTHON_VERSIONS_INCOMPATIBLE= 33 # ibus
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
@@ -26,10 +28,15 @@ FIND_PREFIX:= KASUMI_DIR=kasumi
CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
CONFIGURE_ARGS+= --with-kasumi-exec=${KASUMI_DIR}/bin/kasumi
CONFIGURE_ARGS+= --with-kasumi-icon=${KASUMI_DIR}/share/pixmaps/kasumi.png
#CONFIGURE_ARGS+= --enable-pygtk2-anthy
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/swig/buildlink3.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPMETHOD.gobject-introspection= build
.include "../../devel/gobject-introspection/buildlink3.mk"
PY_PATCHPLIST= yes
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../lang/python/extension.mk"
.include "../../inputmethod/anthy/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

23
inputmethod/ibus-anthy/PLIST
View File

@@ -1,10 +1,19 @@
@comment $NetBSD: PLIST,v 1.2 2011/05/17 11:58:44 obache Exp $
${PYSITELIB}/_anthy.la
${PYSITELIB}/anthy.py
@comment $NetBSD: PLIST,v 1.3 2013/10/23 12:09:28 obache Exp $
include/ibus-anthy-1.0/anthygcontext.h
lib/girepository-1.0/Anthy-9000.typelib
lib/libanthygobject-1.0.la
libexec/ibus-engine-anthy
libexec/ibus-setup-anthy
share/applications/ibus-setup-anthy.desktop
share/gir-1.0/Anthy-9000.gir
share/ibus-anthy/dicts/era.t
share/ibus-anthy/dicts/oldchar.t
share/ibus-anthy/dicts/symbol.t
share/ibus-anthy/dicts/zipcode.t
share/ibus-anthy/engine/_config.py
share/ibus-anthy/engine/_config.pyc
share/ibus-anthy/engine/_config.pyo
share/ibus-anthy/engine/default.xml
share/ibus-anthy/engine/engine.py
share/ibus-anthy/engine/engine.pyc
share/ibus-anthy/engine/engine.pyo
@@ -32,7 +41,9 @@ share/ibus-anthy/engine/tables.pyo
share/ibus-anthy/engine/thumb.py
share/ibus-anthy/engine/thumb.pyc
share/ibus-anthy/engine/thumb.pyo
share/ibus-anthy/icons/ibus-anthy.png
share/ibus-anthy/setup/_config.py
share/ibus-anthy/setup/_config.pyc
share/ibus-anthy/setup/_config.pyo
share/ibus-anthy/setup/anthyprefs.py
share/ibus-anthy/setup/anthyprefs.pyc
share/ibus-anthy/setup/anthyprefs.pyo
@@ -42,8 +53,10 @@ share/ibus-anthy/setup/main.pyo
share/ibus-anthy/setup/prefs.py
share/ibus-anthy/setup/prefs.pyc
share/ibus-anthy/setup/prefs.pyo
share/ibus-anthy/setup/setup.glade
share/ibus-anthy/setup/setup.ui
share/ibus/component/anthy.xml
share/icons/hicolor/scalable/apps/ibus-anthy.svg
share/locale/el/LC_MESSAGES/ibus-anthy.mo
share/locale/fr/LC_MESSAGES/ibus-anthy.mo
share/locale/ja/LC_MESSAGES/ibus-anthy.mo
share/locale/zh_CN/LC_MESSAGES/ibus-anthy.mo

8
inputmethod/ibus-anthy/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.7 2012/04/22 13:58:21 obache Exp $
$NetBSD: distinfo,v 1.8 2013/10/23 12:09:28 obache Exp $
SHA1 (ibus-anthy-1.2.7.tar.gz) = cdfbc440d7a5069b99e565c3b6e8d9e8b62e7af6
RMD160 (ibus-anthy-1.2.7.tar.gz) = 0576a582079337d68de5d49a068b2ef7e8b0f2b6
Size (ibus-anthy-1.2.7.tar.gz) = 523139 bytes
SHA1 (ibus-anthy-1.5.4.tar.gz) = 476e308dccf0d691b27a1bdfb03e1c6bc2a0f0c0
RMD160 (ibus-anthy-1.5.4.tar.gz) = c1ec2a2ca3910f61bed52126cdf4e65e183ff64e
Size (ibus-anthy-1.5.4.tar.gz) = 592595 bytes

9
inputmethod/ibus-array/Makefile
View File

@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.8 2012/10/06 14:25:11 asau Exp $
#
# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:11 wiz Exp $
DISTNAME= ibus-array-0.0.2
PKGREVISION= 6
PKGREVISION= 7
CATEGORIES= inputmethod chinese
MASTER_SITES= http://ibus-array.googlecode.com/files/
@@ -11,6 +10,8 @@ HOMEPAGE= http://code.google.com/p/ibus-array/
COMMENT= Array 30 Input Method for iBus
LICENSE= gnu-gpl-v3
DEPENDS+= ${PYPKGPREFIX}-ibus-python-[0-9]*:../../inputmethod/ibus-python
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config
@@ -20,6 +21,8 @@ SUBST_STAGE.epython= pre-configure
SUBST_FILES.epython= setup/ibus-setup-array.in
SUBST_SED.epython= -e 's;exec python;exec ${PYTHONBIN};g'
PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 via py-ibus-python
.include "../../inputmethod/ibus/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"

21
inputmethod/ibus-chewing/Makefile
View File

@@ -1,9 +1,8 @@
# $NetBSD: Makefile,v 1.26 2013/06/06 12:54:37 wiz Exp $
# $NetBSD: Makefile,v 1.35 2014/01/17 07:54:54 obache Exp $
#
DISTNAME= ibus-chewing-1.4.3-Source
DISTNAME= ibus-chewing-1.4.7-Source
PKGNAME= ${DISTNAME:S/-Source//}
PKGREVISION= 4
CATEGORIES= inputmethod chinese
MASTER_SITES= http://ibus.googlecode.com/files/
@@ -17,22 +16,14 @@ BUILD_DEPENDS+= gob2-[0-9]*:../../devel/gob2
USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
USE_TOOLS+= msgmerge pkg-config
SUBST_CLASSES+= msgctxt
SUBST_STAGE.msgctxt= post-patch
SUBST_FILES.msgctxt= po/*.po po/*.pot
SUBST_FILTER_CMD.msgctxt= ${STRIP_CMD.${MSGFMT_STRIP_MSGCTXT}}
STRIP_CMD.yes= ${AWK} -f ${PKGSRCDIR}/mk/tools/msgfmt-msgctxt.awk
STRIP_CMD.no= ${CAT}
USE_TOOLS+= msgfmt pkg-config
TOOLS_NOOP+= msgmerge xgettext
GCONF_SCHEMAS= ibus-chewing.schemas
CMAKE_ARGS+= -DLIBEXEC_DIR=${PREFIX}/libexec
CMAKE_ARGS+= -DGCONF_SCHEMAS_INSTALLED_DIR=${GCONF_SCHEMAS_DIR}
CMAKE_ARGS+= -DGCONF_SCHEMAS_INSTALLED_DIR:PATH=${GCONF_SCHEMAS_DIR}
# missing in archive
post-extract:
${TOUCH} ${WRKSRC}/po/ibus-chewing.pot
BUILD_TARGET= all translations
.include "../../devel/GConf/schemas.mk"
.include "../../inputmethod/ibus/buildlink3.mk"

11
inputmethod/ibus-chewing/PLIST
View File

@@ -1,15 +1,22 @@
@comment $NetBSD: PLIST,v 1.2 2010/12/03 08:56:39 obache Exp $
@comment $NetBSD: PLIST,v 1.4 2014/01/16 11:14:51 obache Exp $
libexec/ibus-engine-chewing
share/doc/${PKGNAME}/AUTHORS
share/doc/${PKGNAME}/COPYING
share/doc/${PKGNAME}/ChangeLog
share/doc/${PKGNAME}/README
share/doc/${PKGNAME}/RELEASE-NOTES.txt
share/doc/${PKGNAME}/USER-GUIDE
share/gconf/schemas/ibus-chewing.schemas
share/ibus-chewing/icons/ibus-chewing-orig.png
share/ibus-chewing/icons/ibus-chewing.png
share/ibus-chewing/icons/settings.png
share/ibus/component/chewing.xml
share/locale/de_DE/LC_MESSAGES/ibus-chewing.mo
share/locale/es_ES/LC_MESSAGES/ibus-chewing.mo
share/locale/fr_FR/LC_MESSAGES/ibus-chewing.mo
share/locale/it_IT/LC_MESSAGES/ibus-chewing.mo
share/locale/ja_JP/LC_MESSAGES/ibus-chewing.mo
share/locale/ko_KR/LC_MESSAGES/ibus-chewing.mo
share/locale/pt_BR/LC_MESSAGES/ibus-chewing.mo
share/locale/uk_UA/LC_MESSAGES/ibus-chewing.mo
share/locale/zh_CN/LC_MESSAGES/ibus-chewing.mo
share/locale/zh_TW/LC_MESSAGES/ibus-chewing.mo

14
inputmethod/ibus-chewing/distinfo
View File

@@ -1,6 +1,12 @@
$NetBSD: distinfo,v 1.9 2012/12/22 08:41:36 obache Exp $
$NetBSD: distinfo,v 1.15 2014/01/17 07:54:54 obache Exp $
SHA1 (ibus-chewing-1.4.3-Source.tar.gz) = 82ec86daf2b7f3de88410ec01c9f41db0184f91e
RMD160 (ibus-chewing-1.4.3-Source.tar.gz) = b08e2f0a34c0168a3b69c6273ac614f81fdb2d0f
Size (ibus-chewing-1.4.3-Source.tar.gz) = 84023 bytes
SHA1 (ibus-chewing-1.4.7-Source.tar.gz) = 9e2a9792db374be2575f5dd6998755a699d9011d
RMD160 (ibus-chewing-1.4.7-Source.tar.gz) = a5e6f83c1675c42aa445bbbeff0beffb67e20438
Size (ibus-chewing-1.4.7-Source.tar.gz) = 108078 bytes
SHA1 (patch-Modules_DateTimeFormat.cmake) = 588068914de5db765c1c5d1a623e3b73f720a64f
SHA1 (patch-Modules_ManageEnvironment.cmake) = 333c7aa542d0555c7bb9cd3913e73a205c0dea94
SHA1 (patch-Modules_ManageGConf.cmake) = 54e0059fbbea29add90740222d8b7dc81eb6f63f
SHA1 (patch-Modules_ManageTranslation.cmake) = 5fd818a2a089eb9885fc749a60ded8e478f6be64
SHA1 (patch-po_zh__CN.po) = 8818c423d3096e5d527c6e9034b876c2a4eba5d3
SHA1 (patch-src_generate-gconf-schemas.c) = 8800a1ab67dce1848dc516e26c38cece46b9ffab
SHA1 (patch-src_main.c) = cd160807386097de5bee3e24f8bbaae3c420d2d5

15
inputmethod/ibus-chewing/patches/patch-Modules_ManageEnvironment.cmake Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-Modules_ManageEnvironment.cmake,v 1.1 2013/10/08 12:06:23 obache Exp $
* PKGLOCALEDIR support
--- Modules/ManageEnvironment.cmake.orig 2012-11-26 07:37:40.000000000 +0000
+++ Modules/ManageEnvironment.cmake
@@ -163,6 +163,8 @@ IF(NOT DEFINED _MANAGE_ENVIRONMENT_CMAKE
CACHE PATH "Data dir")
SET_COMPILE_ENV(DOC_DIR "${DATA_DIR}/doc"
CACHE PATH "Documentation dir")
+ SET_COMPILE_ENV(LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALEDIR}"
+ CACHE PATH "Locale dir")
SET_COMPILE_ENV(SYSCONF_DIR "/etc"
CACHE PATH "System configuration dir")
SET_COMPILE_ENV(LIBEXEC_DIR "${CMAKE_INSTALL_PREFIX}/libexec"

17
inputmethod/ibus-chewing/patches/patch-Modules_ManageGConf.cmake Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-Modules_ManageGConf.cmake,v 1.1 2013/12/28 04:59:36 obache Exp $
* Honor GCONF_SCHEMAS_INSTALLED_DIR as document
--- Modules/ManageGConf.cmake.orig 2013-12-17 09:08:18.000000000 +0000
+++ Modules/ManageGConf.cmake
@@ -60,8 +60,8 @@ IF(NOT DEFINED _MANAGE_GCONF_CMAKE_)
COMMENT "Installing schemas"
)
- MANAGE_FILE_INSTALL(SYSCONF ${GCONF_SCHEMAS_FILE}
- DEST_SUBDIR "gconf/schemas")
+ INSTALL(FILES ${GCONF_SCHEMAS_FILE}
+ DESTINATION "${GCONF_SCHEMAS_INSTALLED_DIR}")
ENDIF(NOT DEFINED _MANAGE_GCONF_CMAKE_)

15
inputmethod/ibus-chewing/patches/patch-Modules_ManageTranslation.cmake Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-Modules_ManageTranslation.cmake,v 1.3 2013/12/28 04:59:36 obache Exp $
* PKGLOCALEDIR support
--- Modules/ManageTranslation.cmake.orig 2013-12-17 15:57:40.000000000 +0000
+++ Modules/ManageTranslation.cmake
@@ -199,7 +199,7 @@ IF(NOT DEFINED _MANAGE_TRANSLATION_CMAKE
## No need to use MANAGE_FILE_INSTALL
## As this will handle by rpmbuild
INSTALL(FILES ${_gmoFile} DESTINATION
- ${DATA_DIR}/locale/${_locale}/LC_MESSAGES
+ ${CMAKE_INSTALL_LOCALEDIR}/${_locale}/LC_MESSAGES
RENAME ${_opt_POTFILE_NAME}.mo
)
ENDFOREACH(_locale ${_opt_LOCALES})

15
inputmethod/ibus-chewing/patches/patch-po_zh__CN.po Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-po_zh__CN.po,v 1.2 2014/01/16 11:14:51 obache Exp $
* fixes initial default value
--- po/zh_CN.po.orig 2014-01-15 11:09:51.000000000 +0000
+++ po/zh_CN.po
@@ -8,7 +8,7 @@ msgstr "Project-Id-Version: ibus-chewin
"POT-Creation-Date: 2014-01-15 21:09+1000\n"
"PO-Revision-Date: 2012-11-28 08:19-0500\n"
"Last-Translator: leahliu <lliu@redhat.com>\n"
- "Language-Team: LANGUAGE <LL@li.org>\n"
+ "Language-Team: Simplfied Chinese\n"
"Language: zh-CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

15
inputmethod/ibus-chewing/patches/patch-src_generate-gconf-schemas.c Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-src_generate-gconf-schemas.c,v 1.1 2013/10/08 12:06:23 obache Exp $
* PKGLOCALEDIR support
--- src/generate-gconf-schemas.c.orig 2012-10-22 05:32:11.000000000 +0000
+++ src/generate-gconf-schemas.c
@@ -41,7 +41,7 @@ int main (gint argc, gchar *argv[])
/* Init i18n messages */
setlocale (LC_ALL, "");
- bindtextdomain(quote_me(PROJECT_NAME), quote_me(DATA_DIR) "/locale");
+ bindtextdomain(quote_me(PROJECT_NAME), quote_me(LOCALE_DIR));
textdomain(quote_me(PROJECT_NAME));
context = g_option_context_new("schemasFile");

15
inputmethod/ibus-chewing/patches/patch-src_main.c Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-src_main.c,v 1.3 2013/10/08 12:06:23 obache Exp $
* PKGLOCALEDIR support
--- src/main.c.orig 2012-10-22 05:32:11.000000000 +0000
+++ src/main.c
@@ -146,7 +146,7 @@ main (gint argc, gchar *argv[])
/* Init i18n messages */
setlocale (LC_ALL, "zh_TW.utf8");
- bindtextdomain(quote_me(PROJECT_NAME), quote_me(DATA_DIR) "/locale");
+ bindtextdomain(quote_me(PROJECT_NAME), quote_me(LOCALE_DIR));
textdomain(quote_me(PROJECT_NAME));
context = g_option_context_new ("- ibus chewing engine component");

9
inputmethod/ibus-handwrite/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.26 2013/06/06 12:54:37 wiz Exp $
# $NetBSD: Makefile,v 1.29 2013/10/23 12:15:20 obache Exp $
#
DISTNAME= ibus-handwrite-2.1.4
PKGREVISION= 15
PKGREVISION= 18
CATEGORIES= inputmethod
MASTER_SITES= http://ibus-handwrite.googlecode.com/files/
EXTRACT_SUFX= .tar.bz2
@@ -24,6 +24,11 @@ USE_TOOLS+= gmake pkg-config
CONFIGURE_ARGS+= --enable-zinnia
CONFIGURE_ARGS+= --with-zinnia-tomoe=${ZINNIA_TOMOE_DIR}/lib/zinnia/model/tomoe
SUBST_CLASSES+= locale_dir
SUBST_STAGE.locale_dir= pre-configure
SUBST_FILES.locale_dir= src/main.c
SUBST_VARS.locale_dir= _PKGLOCALEDIR
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/gtkglext/buildlink3.mk"
.include "../../inputmethod/ibus/buildlink3.mk"

3
inputmethod/ibus-handwrite/distinfo
View File

@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.7 2012/11/19 23:16:40 joerg Exp $
$NetBSD: distinfo,v 1.8 2013/10/23 12:15:20 obache Exp $
SHA1 (ibus-handwrite-2.1.4.tar.bz2) = 2798728c628dfa60a7c1c45c8a59882962c91b1e
RMD160 (ibus-handwrite-2.1.4.tar.bz2) = 35e7288d5efcd98a01138d075b0455874730a4ea
@@ -6,3 +6,4 @@ Size (ibus-handwrite-2.1.4.tar.bz2) = 237980 bytes
SHA1 (patch-configure) = 66d3e86c3ac5de1bbd466bfca1fc1d709b2d1da6
SHA1 (patch-configure.ac) = 0730abb2210c60b2feb1e9a3055568f4fbb11e2a
SHA1 (patch-src_UI__gtk.c) = 1225bb4effdf4bf7e0de57ebfc9edc65134f9a61
SHA1 (patch-src_main.c) = b8adc7218d9de5f6cabe8c4a0de73b8ae69b792d

15
inputmethod/ibus-handwrite/patches/patch-src_main.c Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-src_main.c,v 1.1 2013/10/23 12:15:21 obache Exp $
* Set PKGLOCALEDIR as default locale dir.
--- src/main.c.orig 2011-01-25 23:55:35.000000000 +0000
+++ src/main.c
@@ -36,7 +36,7 @@ int main(int argc, char* argv[])
const gchar * icon_dir = NULL;
- const gchar * locale_dir = NULL;
+ const gchar * locale_dir = "@_PKGLOCALEDIR@";
setlocale(LC_ALL, "");

3
inputmethod/ibus-hangul/Makefile
View File

@@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.12 2013/01/26 11:48:26 obache Exp $
# $NetBSD: Makefile,v 1.13 2013/10/23 12:23:57 obache Exp $
#
DISTNAME= ibus-hangul-1.4.2
PKGREVISION= 1
CATEGORIES= inputmethod korean
MASTER_SITES= http://ibus.googlecode.com/files/

9
inputmethod/ibus-input-pad/Makefile
View File

@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.22 2013/06/06 12:54:37 wiz Exp $
# $NetBSD: Makefile,v 1.27 2013/12/29 06:45:14 obache Exp $
#
DISTNAME= ibus-input-pad-1.4.0
PKGREVISION= 9
DISTNAME= ibus-input-pad-1.4.2
CATEGORIES= inputmethod
MASTER_SITES= http://input-pad.googlecode.com/files/
@@ -16,11 +15,11 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake pkg-config intltool msgfmt xgettext msgmerge
CONFIGURE_ARGS+= --with-gtk=2.0
CONFIGURE_ARGS+= --disable-maintainer-mode
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../inputmethod/ibus/buildlink3.mk"
.include "../../inputmethod/input-pad/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

7
inputmethod/ibus-input-pad/PLIST
View File

@@ -1,7 +1,12 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2010/08/31 08:27:52 obache Exp $
@comment $NetBSD: PLIST,v 1.2 2013/12/07 11:41:09 obache Exp $
libexec/ibus-engine-input-pad
libexec/ibus-setup-input-pad
share/applications/ibus-setup-input-pad.desktop
share/ibus-input-pad/setup/setup-gtk2.ui
share/ibus/component/input-pad.xml
share/locale/fr/LC_MESSAGES/ibus-input-pad.mo
share/locale/ja/LC_MESSAGES/ibus-input-pad.mo
share/locale/pl/LC_MESSAGES/ibus-input-pad.mo
share/locale/te/LC_MESSAGES/ibus-input-pad.mo
share/locale/uk/LC_MESSAGES/ibus-input-pad.mo
share/locale/zh_TW/LC_MESSAGES/ibus-input-pad.mo

8
inputmethod/ibus-input-pad/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.3 2012/04/22 14:01:31 obache Exp $
$NetBSD: distinfo,v 1.5 2013/12/29 06:45:14 obache Exp $
SHA1 (ibus-input-pad-1.4.0.tar.gz) = d4252da08490c85c7d6704a5af56d35e4bb40b64
RMD160 (ibus-input-pad-1.4.0.tar.gz) = 543cbb108df0ebaf57f37f063e43df3ecfeb7b07
Size (ibus-input-pad-1.4.0.tar.gz) = 374431 bytes
SHA1 (ibus-input-pad-1.4.2.tar.gz) = d3ea0327b0e0ba6ecd6ecc8ff11307e79a3e7650
RMD160 (ibus-input-pad-1.4.2.tar.gz) = 5c098dccf2014c9901b17471932505193d8b1779
Size (ibus-input-pad-1.4.2.tar.gz) = 402952 bytes

17
inputmethod/ibus-libthai/DESCR Normal file
View File

@@ -0,0 +1,17 @@
IBus-LibThai is a Thai input method engine for IBus, based on the LibThai
library.
Currently, it provides 3 keyboard layouts internally:
- Ketmanee
- Pattachote
- TIS-820.2538
(Thai XKB symbols are also supported.)
The input method also filters out invalid input sequences with 3 levels of
strictness:
- Passthrough (no check)
- Basic Check
- Srict Check
For applications that support surrounding text retrieval/deletion,
it can also correct the invalid input sequences.

25
inputmethod/ibus-libthai/Makefile Normal file
View File

@@ -0,0 +1,25 @@
# $NetBSD: Makefile,v 1.4 2014/02/27 12:48:53 obache Exp $
#
DISTNAME= ibus-libthai-0.1.2
CATEGORIES= inputmethod
MASTER_SITES= http://linux.thai.net/pub/thailinux/software/libthai/ \
ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
EXTRACT_SUFX= .tar.xz
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://linux.thai.net/projects/ibus-libthai
COMMENT= Thai imput method engine for IBus based on libthai library
LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= pkg-config
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_API_DEPENDS.libthai+= libthai>=0.1.19
.include "../../devel/libthai/buildlink3.mk"
.include "../../inputmethod/ibus/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

6
inputmethod/ibus-libthai/PLIST Normal file
View File

@@ -0,0 +1,6 @@
@comment $NetBSD: PLIST,v 1.1 2013/09/09 11:56:57 obache Exp $
libexec/ibus-engine-libthai
libexec/ibus-setup-libthai
share/ibus-libthai/icons/ibus-libthai.svg
share/ibus/component/libthai.xml
share/locale/th/LC_MESSAGES/ibus-libthai.mo

5
inputmethod/ibus-libthai/distinfo Normal file
View File

@@ -0,0 +1,5 @@
$NetBSD: distinfo,v 1.2 2014/02/27 12:48:53 obache Exp $
SHA1 (ibus-libthai-0.1.2.tar.xz) = 0d264b9998d55a2036af79270062f5b31bfed065
RMD160 (ibus-libthai-0.1.2.tar.xz) = 7cd3964a8beb2880c73200bf9b1422a290b5184d
Size (ibus-libthai-0.1.2.tar.xz) = 150224 bytes

4
inputmethod/ibus-m17n/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.25 2013/06/06 12:54:37 wiz Exp $
# $NetBSD: Makefile,v 1.29 2013/10/23 12:50:02 obache Exp $
#
DISTNAME= ibus-m17n-1.3.4
PKGREVISION= 10
PKGREVISION= 14
CATEGORIES= inputmethod
MASTER_SITES= http://ibus.googlecode.com/files/

17
inputmethod/ibus-mozc/Makefile
View File

@@ -1,12 +1,15 @@
# $NetBSD: Makefile,v 1.9 2013/06/06 12:54:37 wiz Exp $
# $NetBSD: Makefile,v 1.17 2014/02/12 23:18:04 tron Exp $
PKGNAME= ibus-${DISTNAME}
PKGREVISION= 3
PKGREVISION= 2
INSTALLATION_DIRS+= libexec share/ibus share/icons share/ibus/component \
INSTALLATION_DIRS+= libexec share/ibus share/ibus/component \
share/ibus-mozc
DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
DEPENDS+= mozc-renderer-[0-9]*:../../inputmethod/mozc-renderer
DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server
DEPENDS+= mozc-tool-[0-9]*:../../inputmethod/mozc-tool
do-build:
cd ${WRKSRC} && env ${MAKE_ENV} \
@@ -18,14 +21,8 @@ do-install:
${DESTDIR}${PREFIX}/libexec/ibus-engine-mozc
${INSTALL_DATA} ${WRKSRC}/out_${OSDEST}/${MOZC_BUILD_MODE}/obj/gen/unix/ibus/mozc.xml \
${DESTDIR}${PREFIX}/share/ibus/component
.for f in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \
ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool
${INSTALL_DATA} ${WRKSRC}/data/images/unix/${f}.png \
${DESTDIR}${PREFIX}/share/icons/${f:S/^ui-/mozc-/}.png
.endfor
${INSTALL_DATA} ${WRKSRC}/data/images/product_icon_32bpp-128.png \
${DESTDIR}${PREFIX}/share/icons/mozc.png
${INSTALL_DATA} ${WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \
${DESTDIR}${PREFIX}/share/ibus-mozc/product_icon.png
.include "../../inputmethod/ibus/buildlink3.mk"
.include "../../inputmethod/mozc-server/Makefile.common"

12
inputmethod/ibus-mozc/PLIST
View File

@@ -1,14 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2013/01/18 11:36:39 ryoon Exp $
@comment $NetBSD: PLIST,v 1.3 2014/01/20 10:40:36 ryoon Exp $
libexec/ibus-engine-mozc
share/ibus-mozc/product_icon.png
share/ibus/component/mozc.xml
share/icons/mozc-alpha_full.png
share/icons/mozc-alpha_half.png
share/icons/mozc-dictionary.png
share/icons/mozc-direct.png
share/icons/mozc-hiragana.png
share/icons/mozc-katakana_full.png
share/icons/mozc-katakana_half.png
share/icons/mozc-properties.png
share/icons/mozc-tool.png
share/icons/mozc.png

23
inputmethod/ibus-pinyin/Makefile
View File

@@ -1,11 +1,9 @@
# $NetBSD: Makefile,v 1.19 2013/05/09 07:40:01 adam Exp $
# $NetBSD: Makefile,v 1.22 2013/10/23 12:39:55 obache Exp $
#
DISTNAME= ibus-pinyin-1.4.0
PKGREVISION= 4
DISTNAME= ibus-pinyin-1.5.0
CATEGORIES= inputmethod chinese
MASTER_SITES= http://ibus.googlecode.com/files/
DISTFILES= ${DEFAULT_DISTFILES} ${DBTAR}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://code.google.com/p/ibus/
@@ -18,34 +16,18 @@ USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config gmake intltool msgfmt
# taken from ${WRKSRC}/data/db/open-phrase/Makefile.in
DBVER= 1.2.99
DBTAR= pinyin-database-${DBVER}.tar.bz2
post-extract:
${RUN} cd ${WRKSRC}/data/db/open-phrase; \
mkdir -p db; \
mv ${WRKDIR}/db/main.db db/open-phrase.db; \
touch ${DBTAR} stamp-db
SUBST_CLASSES+= epython
SUBST_STAGE.epython= pre-configure
SUBST_FILES.epython= setup/ibus-setup-pinyin.in
SUBST_SED.epython= -e 's;exec python;exec ${PYTHONBIN};g'
CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
CONFIGURE_ARGS+= --disable-db-android
CONFIGURE_ARGS+= --enable-db-open-phrase
.include "options.mk"
.include "../../mk/bsd.prefs.mk"
.include "../../mk/compiler.mk"
.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
. include "../../devel/libuuid/buildlink3.mk"
.endif
.if (!empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*)) || !empty(PKGSRC_COMPILER:Mclang)
CONFIGURE_ARGS+= --disable-boost
.else
@@ -60,6 +42,7 @@ SUBST_SED.shared_ptr= -e 's,std::shared_ptr,boost::shared_ptr,g'
.include "../../inputmethod/ibus/bad-env-usage.mk"
.include "../../converters/pyzy/buildlink3.mk"
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../inputmethod/ibus/buildlink3.mk"
.include "../../lang/python/application.mk"

7
inputmethod/ibus-pinyin/PLIST
View File

@@ -1,10 +1,10 @@
@comment $NetBSD: PLIST,v 1.2 2012/04/22 14:02:50 obache Exp $
@comment $NetBSD: PLIST,v 1.4 2013/10/30 11:30:36 obache Exp $
libexec/ibus-engine-pinyin
libexec/ibus-setup-pinyin
share/applications/ibus-setup-bopomofo.desktop
share/applications/ibus-setup-pinyin.desktop
${PLIST.lua}share/ibus-pinyin/base.lua
share/ibus-pinyin/db/create_index.sql
share/ibus-pinyin/db/english.db
share/ibus-pinyin/db/open-phrase.db
share/ibus-pinyin/icons/chinese.svg
share/ibus-pinyin/icons/english.svg
share/ibus-pinyin/icons/full-punct.svg
@@ -24,6 +24,7 @@ share/ibus-pinyin/setup/version.py
share/ibus-pinyin/setup/version.pyc
share/ibus-pinyin/setup/version.pyo
share/ibus/component/pinyin.xml
share/locale/fr/LC_MESSAGES/ibus-pinyin.mo
share/locale/ru/LC_MESSAGES/ibus-pinyin.mo
share/locale/zh_CN/LC_MESSAGES/ibus-pinyin.mo
share/locale/zh_HK/LC_MESSAGES/ibus-pinyin.mo

13
inputmethod/ibus-pinyin/distinfo
View File

@@ -1,9 +1,8 @@
$NetBSD: distinfo,v 1.3 2012/04/22 14:02:50 obache Exp $
$NetBSD: distinfo,v 1.5 2013/10/30 11:30:36 obache Exp $
SHA1 (ibus-pinyin-1.4.0.tar.gz) = 499ceb4d3bec5614f88322b8e7695c04586b63e9
RMD160 (ibus-pinyin-1.4.0.tar.gz) = b1c540225e2204ebade5cfa527305898807c4dbf
Size (ibus-pinyin-1.4.0.tar.gz) = 1813003 bytes
SHA1 (pinyin-database-1.2.99.tar.bz2) = e38a148a772e9909facda66b2d579e17b94cccbe
RMD160 (pinyin-database-1.2.99.tar.bz2) = 1679567f31c20a235577f02175df38e16a05e7de
Size (pinyin-database-1.2.99.tar.bz2) = 9977983 bytes
SHA1 (ibus-pinyin-1.5.0.tar.gz) = 40abf915bb2599189d8fd76f456ce399edfa4184
RMD160 (ibus-pinyin-1.5.0.tar.gz) = 9137f3e40971bd819fbaaf1715779a538d20a90c
Size (ibus-pinyin-1.5.0.tar.gz) = 692516 bytes
SHA1 (patch-lua_lmyoslib.c) = 7934c67df6134085f5a429ad678e1bfa89c65be8
SHA1 (patch-lua_lua-plugin.h) = 51fbb077a8f0c528101dbdaafcbac9702dde334f
SHA1 (patch-src_PYUtil.h) = 93e289e83abaec2fef6cd5a7cf924cd3bb6a20ad

20
inputmethod/ibus-pinyin/patches/patch-lua_lmyoslib.c Normal file
View File

@@ -0,0 +1,20 @@
$NetBSD: patch-lua_lmyoslib.c,v 1.1 2013/10/30 11:30:37 obache Exp $
* for Lua 5.2 API change
--- lua/lmyoslib.c.orig 2012-06-01 15:47:06.000000000 +0000
+++ lua/lmyoslib.c
@@ -20,6 +20,13 @@
#include "lualib.h"
+#ifdef LUA_VERSION_NUM
+# if (LUA_VERSION_NUM >= 502)
+#undef luaL_register
+#define luaL_register(L,n,f) \
+ { if ((n) == NULL) luaL_setfuncs(L,f,0); else luaL_newlib(L,f); }
+# endif
+#endif
/*
** {======================================================

27
inputmethod/ibus-pinyin/patches/patch-lua_lua-plugin.h Normal file
View File

@@ -0,0 +1,27 @@
$NetBSD: patch-lua_lua-plugin.h,v 1.1 2013/10/30 11:30:37 obache Exp $
* for Lua-5.1 and 5.2 API change
--- lua/lua-plugin.h.orig 2012-07-09 14:32:10.000000000 +0000
+++ lua/lua-plugin.h
@@ -29,6 +29,20 @@
#include <glib-object.h>
+#ifdef LUA_VERSION_NUM
+# if (LUA_VERSION_NUM >= 501)
+#undef lua_open
+#define lua_open luaL_newstate
+# endif
+# if (LUA_VERSION_NUM >= 502)
+#undef lua_objlen
+#define lua_objlen lua_rawlen
+#undef luaL_register
+#define luaL_register(L,n,f) \
+ { if ((n) == NULL) luaL_setfuncs(L,f,0); else luaL_newlib(L,f); }
+# endif
+#endif
+
#define LUA_IMELIBNAME "ime"
LUALIB_API int (luaopen_ime) (lua_State * L);
LUALIB_API int (luaopen_myos) (lua_State * L);

5
inputmethod/ibus-python/DESCR Normal file
View File

@@ -0,0 +1,5 @@
IBus means an Intelligent Input Bus. It is a new input framework for Linux OS.
It provides full featured and user friendly input method user interface.
It also may help developers to develop input method easily.
This package provide Python library for IBus.

49
inputmethod/ibus-python/Makefile Normal file
View File

@@ -0,0 +1,49 @@
# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:11 wiz Exp $
.include "../../inputmethod/ibus/Makefile.common"
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/ibus/ibus-python/}
COMMENT= Python library for Intelligent Input Bus
LICENSE= gnu-lgpl-v2.1
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config intltool msgfmt gmake
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
DEPENDS+= ibus>=${PKGVERSION_NOREV}:../../inputmethod/ibus
DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in
CONFIGURE_ARGS+= --disable-gtk2
CONFIGURE_ARGS+= --disable-gtk3
CONFIGURE_ARGS+= --disable-xim
CONFIGURE_ARGS+= --disable-nls
CONFIGURE_ARGS+= --disable-libnotify
CONFIGURE_ARGS+= --disable-engine
CONFIGURE_ARGS+= --disable-surround-text
.include "../../mk/compiler.mk"
.if !empty(CC_VERSION:Mgcc-4.1.[0-9]*)
BUILDLINK_TRANSFORM+= rm:-Wno-unused-but-set-variable
.endif
NO_BUILD= yes
INSTALL_DIRS= bindings ibus
CONFIGURE_ARGS+= --disable-dconf
CONFIGURE_ARGS+= --disable-gconf
CONFIGURE_ARGS+= --enable-python-library
PYTHON_VERSIONS_INCOMPATIBLE= 26 33 # py-gtk2
.include "../../devel/py-gobject3/buildlink3.mk"
PY_PATCHPLIST= yes
.include "../../lang/python/extension.mk"
BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.83.0
.include "../../sysutils/py-dbus/buildlink3.mk"
.include "../../textproc/iso-codes/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

109
inputmethod/ibus-python/PLIST Normal file
View File

@@ -0,0 +1,109 @@
@comment $NetBSD: PLIST,v 1.1 2013/10/23 11:56:21 obache Exp $
${PYSITELIB}/gi/overrides/IBus.py
${PYSITELIB}/gi/overrides/IBus.pyc
${PYSITELIB}/gi/overrides/IBus.pyo
${PYSITELIB}/ibus/__init__.py
${PYSITELIB}/ibus/__init__.pyc
${PYSITELIB}/ibus/__init__.pyo
${PYSITELIB}/ibus/_config.py
${PYSITELIB}/ibus/_config.pyc
${PYSITELIB}/ibus/_config.pyo
${PYSITELIB}/ibus/_gtk.py
${PYSITELIB}/ibus/_gtk.pyc
${PYSITELIB}/ibus/_gtk.pyo
${PYSITELIB}/ibus/application.py
${PYSITELIB}/ibus/application.pyc
${PYSITELIB}/ibus/application.pyo
${PYSITELIB}/ibus/ascii.py
${PYSITELIB}/ibus/ascii.pyc
${PYSITELIB}/ibus/ascii.pyo
${PYSITELIB}/ibus/attribute.py
${PYSITELIB}/ibus/attribute.pyc
${PYSITELIB}/ibus/attribute.pyo
${PYSITELIB}/ibus/bus.py
${PYSITELIB}/ibus/bus.pyc
${PYSITELIB}/ibus/bus.pyo
${PYSITELIB}/ibus/common.py
${PYSITELIB}/ibus/common.pyc
${PYSITELIB}/ibus/common.pyo
${PYSITELIB}/ibus/component.py
${PYSITELIB}/ibus/component.pyc
${PYSITELIB}/ibus/component.pyo
${PYSITELIB}/ibus/config.py
${PYSITELIB}/ibus/config.pyc
${PYSITELIB}/ibus/config.pyo
${PYSITELIB}/ibus/engine.py
${PYSITELIB}/ibus/engine.pyc
${PYSITELIB}/ibus/engine.pyo
${PYSITELIB}/ibus/enginedesc.py
${PYSITELIB}/ibus/enginedesc.pyc
${PYSITELIB}/ibus/enginedesc.pyo
${PYSITELIB}/ibus/exception.py
${PYSITELIB}/ibus/exception.pyc
${PYSITELIB}/ibus/exception.pyo
${PYSITELIB}/ibus/factory.py
${PYSITELIB}/ibus/factory.pyc
${PYSITELIB}/ibus/factory.pyo
${PYSITELIB}/ibus/inputcontext.py
${PYSITELIB}/ibus/inputcontext.pyc
${PYSITELIB}/ibus/inputcontext.pyo
${PYSITELIB}/ibus/interface/__init__.py
${PYSITELIB}/ibus/interface/__init__.pyc
${PYSITELIB}/ibus/interface/__init__.pyo
${PYSITELIB}/ibus/interface/iconfig.py
${PYSITELIB}/ibus/interface/iconfig.pyc
${PYSITELIB}/ibus/interface/iconfig.pyo
${PYSITELIB}/ibus/interface/iengine.py
${PYSITELIB}/ibus/interface/iengine.pyc
${PYSITELIB}/ibus/interface/iengine.pyo
${PYSITELIB}/ibus/interface/ienginefactory.py
${PYSITELIB}/ibus/interface/ienginefactory.pyc
${PYSITELIB}/ibus/interface/ienginefactory.pyo
${PYSITELIB}/ibus/interface/iibus.py
${PYSITELIB}/ibus/interface/iibus.pyc
${PYSITELIB}/ibus/interface/iibus.pyo
${PYSITELIB}/ibus/interface/iinputcontext.py
${PYSITELIB}/ibus/interface/iinputcontext.pyc
${PYSITELIB}/ibus/interface/iinputcontext.pyo
${PYSITELIB}/ibus/interface/inotifications.py
${PYSITELIB}/ibus/interface/inotifications.pyc
${PYSITELIB}/ibus/interface/inotifications.pyo
${PYSITELIB}/ibus/interface/ipanel.py
${PYSITELIB}/ibus/interface/ipanel.pyc
${PYSITELIB}/ibus/interface/ipanel.pyo
${PYSITELIB}/ibus/keysyms.py
${PYSITELIB}/ibus/keysyms.pyc
${PYSITELIB}/ibus/keysyms.pyo
${PYSITELIB}/ibus/lang.py
${PYSITELIB}/ibus/lang.pyc
${PYSITELIB}/ibus/lang.pyo
${PYSITELIB}/ibus/lookuptable.py
${PYSITELIB}/ibus/lookuptable.pyc
${PYSITELIB}/ibus/lookuptable.pyo
${PYSITELIB}/ibus/modifier.py
${PYSITELIB}/ibus/modifier.pyc
${PYSITELIB}/ibus/modifier.pyo
${PYSITELIB}/ibus/notifications.py
${PYSITELIB}/ibus/notifications.pyc
${PYSITELIB}/ibus/notifications.pyo
${PYSITELIB}/ibus/object.py
${PYSITELIB}/ibus/object.pyc
${PYSITELIB}/ibus/object.pyo
${PYSITELIB}/ibus/observedpath.py
${PYSITELIB}/ibus/observedpath.pyc
${PYSITELIB}/ibus/observedpath.pyo
${PYSITELIB}/ibus/panel.py
${PYSITELIB}/ibus/panel.pyc
${PYSITELIB}/ibus/panel.pyo
${PYSITELIB}/ibus/property.py
${PYSITELIB}/ibus/property.pyc
${PYSITELIB}/ibus/property.pyo
${PYSITELIB}/ibus/serializable.py
${PYSITELIB}/ibus/serializable.pyc
${PYSITELIB}/ibus/serializable.pyo
${PYSITELIB}/ibus/text.py
${PYSITELIB}/ibus/text.pyc
${PYSITELIB}/ibus/text.pyo
${PYSITELIB}/ibus/utility.py
${PYSITELIB}/ibus/utility.pyc
${PYSITELIB}/ibus/utility.pyo

4
inputmethod/ibus-qt/Makefile
View File

@@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.30 2013/06/06 12:54:37 wiz Exp $
# $NetBSD: Makefile,v 1.33 2014/02/12 23:18:04 tron Exp $
#
DISTNAME= ibus-qt-1.3.2-Source
PKGNAME= ${DISTNAME:S/-Source//}
PKGREVISION= 4
PKGREVISION= 7
CATEGORIES= inputmethod
MASTER_SITES= http://ibus.googlecode.com/files/

4
inputmethod/ibus-skk/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.23 2013/06/06 12:54:37 wiz Exp $
# $NetBSD: Makefile,v 1.26 2013/10/23 12:50:02 obache Exp $
#
DISTNAME= ibus-skk-1.4.1
PKGREVISION= 8
PKGREVISION= 11
CATEGORIES= inputmethod japanese
MASTER_SITES= http://cloud.github.com/downloads/ueno/ibus-skk/

4
inputmethod/ibus-t9/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.18 2013/06/06 12:54:37 wiz Exp $
# $NetBSD: Makefile,v 1.21 2013/10/23 12:50:02 obache Exp $
#
DISTNAME= ibus-t9-2.1.0.20100601
PKGREVISION= 17
PKGREVISION= 20
CATEGORIES= inputmethod chinese
MASTER_SITES= http://ibus-t9.googlecode.com/files/

19
inputmethod/ibus-table/Makefile
View File

@@ -1,14 +1,13 @@
# $NetBSD: Makefile,v 1.7 2012/10/06 14:25:12 asau Exp $
#
# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:11 wiz Exp $
DISTNAME= ibus-table-1.3.0.20100621
PKGREVISION= 5
DISTNAME= ibus-table-1.5.0
PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= http://ibus.googlecode.com/files/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://code.google.com/p/ibus/
COMMENT= The Table engine for IBus platform
COMMENT= Table engine for IBus platform
LICENSE= gnu-lgpl-v2.1
DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
@@ -19,22 +18,14 @@ USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE+= ibus-table.pc.in
CONFIGURE_ARGS+= --disable-additional
SUBST_CLASSES+= prefix
SUBST_STAGE.prefix= pre-configure
SUBST_FILES.prefix= engine/tabcreatedb.py
SUBST_SED.prefix= -e 's|/usr/share|${PREFIX}/share|g'
SUBST_CLASSES+= epython
SUBST_STAGE.epython= pre-configure
SUBST_FILES.epython= engine/ibus-engine-table.in
SUBST_FILES.epython+= engine/ibus-table-createdb.in
SUBST_SED.epython= -e 's;exec python;exec ${PYTHONBIN};g'
REPLACE_PYTHON+= engine/tabcreatedb.py
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.5.0
.include "../../lang/python/application.mk"
BUILDLINK_ABI_DEPENDS.ibus+= ibus>=1.1.0
.include "../../inputmethod/ibus/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

3
inputmethod/ibus-table/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2010/08/07 02:13:06 obache Exp $
@comment $NetBSD: PLIST,v 1.2 2013/10/23 12:43:49 obache Exp $
bin/ibus-table-createdb
lib/pkgconfig/ibus-table.pc
libexec/ibus-engine-table
@@ -41,6 +41,7 @@ share/ibus-table/icons/tc-mode.svg
share/ibus-table/icons/tcb-mode.svg
share/ibus-table/tables/template.txt
share/ibus/component/table.xml
share/locale/de/LC_MESSAGES/ibus-table.mo
share/locale/zh_CN/LC_MESSAGES/ibus-table.mo
share/locale/zh_HK/LC_MESSAGES/ibus-table.mo
share/locale/zh_TW/LC_MESSAGES/ibus-table.mo

9
inputmethod/ibus-table/distinfo
View File

@@ -1,5 +1,6 @@
$NetBSD: distinfo,v 1.1.1.1 2010/08/07 02:13:06 obache Exp $
$NetBSD: distinfo,v 1.3 2013/12/28 09:02:31 obache Exp $
SHA1 (ibus-table-1.3.0.20100621.tar.gz) = 3d1578c037d6b31adebc32f0f58c9c3f5fdd1ea8
RMD160 (ibus-table-1.3.0.20100621.tar.gz) = 02d2249a79a9e5aa8d0c6c68365ef22773563673
Size (ibus-table-1.3.0.20100621.tar.gz) = 421845 bytes
SHA1 (ibus-table-1.5.0.tar.gz) = 3e474e52d963927fac1056112c1b92dfd47e5cbd
RMD160 (ibus-table-1.5.0.tar.gz) = 4c9b00679a0a448839fd59d3439be36fc1083705
Size (ibus-table-1.5.0.tar.gz) = 432844 bytes
SHA1 (patch-engine_tabsqlitedb.py) = c360974f0dfb327f6bd18cce0c8bec4fe5dd806b

17
inputmethod/ibus-table/patches/patch-engine_tabsqlitedb.py Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-engine_tabsqlitedb.py,v 1.1 2013/12/28 09:02:31 obache Exp $
* \U is not usable with UCS2.
--- engine/tabsqlitedb.py.orig 2013-01-15 21:46:47.000000000 +0000
+++ engine/tabsqlitedb.py
@@ -499,10 +499,6 @@ class tabsqlitedb:
+ u'\u4E00-\u9FCB'
+ u'\u3400-\u4DB5'
+ u'\uF900-\uFaFF'
- + u'\U00020000-\U0002A6D6'
- + u'\U0002A700-\U0002B734'
- + u'\U0002B740-\U0002B81D'
- + u'\U0002F800-\U0002FA1D'
+ u']+',
phrase))
# first whether in gb2312

7
inputmethod/ibus-tegaki/Makefile
View File

@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.4 2012/10/06 14:25:12 asau Exp $
#
# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:11 wiz Exp $
DISTNAME= ibus-tegaki-0.3.1
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= inputmethod
MASTER_SITES= http://www.tegaki.org/releases/${PKGVERSION_NOREV}/
@@ -13,6 +12,7 @@ LICENSE= gnu-gpl-v2
DEPENDS+= tegaki-pygtk>=0.3:../../inputmethod/tegaki-pygtk
DEPENDS+= ibus>=1.2:../../inputmethod/ibus
DEPENDS+= ${PYPKGPREFIX}-ibus-python-[0-9]*:../../inputmethod/ibus-python
USE_LANGUAGES= # none
@@ -22,6 +22,7 @@ SUBST_FILES.epython= ibus-engine-tegaki.in
SUBST_SED.epython= -e 's;exec python;exec ${PYTHONBIN};g'
EGG_NAME= ${DISTNAME:S/-/_/}
PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 via py-ibus-python
.include "../../lang/python/distutils.mk"
.include "../../lang/python/application.mk"

9
inputmethod/ibus-unikey/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.20 2013/06/06 12:54:37 wiz Exp $
# $NetBSD: Makefile,v 1.24 2013/10/23 12:48:26 obache Exp $
#
DISTNAME= ibus-unikey-0.6.1
PKGREVISION= 8
PKGREVISION= 11
CATEGORIES= inputmethod
MASTER_SITES= http://ibus-unikey.googlecode.com/files/
@@ -17,9 +17,8 @@ USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_TOOLS+= gmake pkg-config intltool msgfmt
CONFIGURE_ARGS+= --with-gtk-version=2
CONFIGURE_ARGS+= --with-gtk-version=3
.include "../../inputmethod/ibus/buildlink3.mk"
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.12.0
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

50
inputmethod/ibus/Makefile
View File

@@ -1,18 +1,13 @@
# $NetBSD: Makefile,v 1.28 2013/06/06 12:54:36 wiz Exp $
#
# $NetBSD: Makefile,v 1.35.2.1 2014/04/08 19:49:59 tron Exp $
DISTNAME= ibus-1.4.2
PKGREVISION= 9
CATEGORIES= inputmethod
MASTER_SITES= http://ibus.googlecode.com/files/
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.5.4
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://code.google.com/p/ibus/
.include "Makefile.common"
PKGREVISION= 1
COMMENT= Intelligent Input Bus
LICENSE= gnu-lgpl-v2.1
DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
DEPENDS+= ${PYPKGPREFIX}-notify-python>=0.1.1nb3:../../sysutils/py-notify-python
DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
@@ -25,9 +20,12 @@ PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
CONFIGURE_ARGS+= --enable-dconf
CONFIGURE_ARGS+= --enable-gconf
CONFIGURE_ARGS+= --enable-gtk2
CONFIGURE_ARGS+= --disable-gtk3
CONFIGURE_ARGS+= --enable-gtk3
CONFIGURE_ARGS+= --enable-surrounding-text
CONFIGURE_ARGS+= --enable-introspection=yes
SUBST_CLASSES+= dbus
SUBST_STAGE.dbus= post-configure
@@ -35,21 +33,39 @@ SUBST_FILES.dbus= src/ibusshare.c
SUBST_SED.dbus= -e 's,/var/lib/dbus/machine-id,${VARBASE}/db/dbus/machine-id,g'
BUILD_DEFS+= PKG_SYSCONFBASE VARBASE
MANCOMPRESSED= yes
INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/ibus
MAKE_DIRS+= ${PKG_SYSCONFDIR}/dconf/db/ibus.d
MAKE_DIRS+= ${PKG_SYSCONFDIR}/dconf/profile
CONF_FILES+= ${PREFIX}/share/examples/ibus/dconf/db/ibus.d/00-upstream-settings \
${PKG_SYSCONFDIR}/dconf/db/ibus.d/00-upstream-settings
CONF_FILES+= ${PREFIX}/share/examples/ibus/dconf/profile/ibus \
${PKG_SYSCONFDIR}/dconf/profile/ibus
.include "../../mk/compiler.mk"
.if !empty(CC_VERSION:Mgcc-4.1.[0-9]*)
BUILDLINK_TRANSFORM+= rm:-Wno-unused-but-set-variable
.endif
BUILDLINK_API_DEPENDS.GConf+= GConf>=2.12
.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/schemas.mk"
.include "../../devel/dconf/buildlink3.mk"
BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.6
BUILDLINK_DEPMETHOD.gobject-introspection+= build
.include "../../devel/gobject-introspection/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
.include "../../devel/glib2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
PY_PATCHPLIST= yes
.include "../../lang/python/extension.mk"
BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.83.0
.include "../../sysutils/py-dbus/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
.include "../../textproc/iso-codes/buildlink3.mk"
GTK2_IMMODULES= yes
.include "../../x11/gtk2/modules.mk"
.include "../../x11/py-gtk2/buildlink3.mk"
GTK3_IMMODULES= yes
.include "../../x11/gtk3/modules.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"

15
inputmethod/ibus/Makefile.common Normal file
View File

@@ -0,0 +1,15 @@
# $NetBSD: Makefile.common,v 1.2 2014/01/16 11:04:26 obache Exp $
#
# used by inputmethod/ibus/Makefile
# used by inputmethod/ibus-python/Makefile
DISTNAME= ibus-1.5.5
CATEGORIES= inputmethod
MASTER_SITES= http://ibus.googlecode.com/files/
DISTINFO_FILE= ${.CURDIR}/../../inputmethod/ibus/distinfo
PATCHDIR= ${.CURDIR}/../../inputmethod/ibus/patches
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://code.google.com/p/ibus/
LICENSE= gnu-lgpl-v2.1

183
inputmethod/ibus/PLIST
View File

@@ -1,4 +1,5 @@
@comment $NetBSD: PLIST,v 1.2 2012/04/22 13:57:30 obache Exp $
@comment $NetBSD: PLIST,v 1.4 2014/01/16 11:04:26 obache Exp $
bin/ibus
bin/ibus-daemon
bin/ibus-setup
include/ibus-1.0/ibus.h
@@ -11,6 +12,7 @@ include/ibus-1.0/ibusconfigservice.h
include/ibus-1.0/ibusdebug.h
include/ibus-1.0/ibusengine.h
include/ibus-1.0/ibusenginedesc.h
include/ibus-1.0/ibusenginesimple.h
include/ibus-1.0/ibusenumtypes.h
include/ibus-1.0/ibuserror.h
include/ibus-1.0/ibusfactory.h
@@ -18,6 +20,7 @@ include/ibus-1.0/ibushotkey.h
include/ibus-1.0/ibusinputcontext.h
include/ibus-1.0/ibuskeymap.h
include/ibus-1.0/ibuskeys.h
include/ibus-1.0/ibuskeysyms-compat.h
include/ibus-1.0/ibuskeysyms.h
include/ibus-1.0/ibuslookuptable.h
include/ibus-1.0/ibusobject.h
@@ -26,6 +29,7 @@ include/ibus-1.0/ibuspanelservice.h
include/ibus-1.0/ibusproperty.h
include/ibus-1.0/ibusproplist.h
include/ibus-1.0/ibusproxy.h
include/ibus-1.0/ibusregistry.h
include/ibus-1.0/ibusserializable.h
include/ibus-1.0/ibusservice.h
include/ibus-1.0/ibusshare.h
@@ -34,120 +38,27 @@ include/ibus-1.0/ibustypes.h
include/ibus-1.0/ibusutil.h
include/ibus-1.0/ibusversion.h
include/ibus-1.0/ibusxml.h
lib/girepository-1.0/IBus-1.0.typelib
lib/gtk-2.0/2.10.0/immodules/im-ibus.la
lib/gtk-3.0/3.0.0/immodules/im-ibus.la
lib/libibus-1.0.la
lib/pkgconfig/ibus-1.0.pc
${PYSITELIB}/ibus/__init__.py
${PYSITELIB}/ibus/__init__.pyc
${PYSITELIB}/ibus/__init__.pyo
${PYSITELIB}/ibus/_config.py
${PYSITELIB}/ibus/_config.pyc
${PYSITELIB}/ibus/_config.pyo
${PYSITELIB}/ibus/_gtk.py
${PYSITELIB}/ibus/_gtk.pyc
${PYSITELIB}/ibus/_gtk.pyo
${PYSITELIB}/ibus/application.py
${PYSITELIB}/ibus/application.pyc
${PYSITELIB}/ibus/application.pyo
${PYSITELIB}/ibus/ascii.py
${PYSITELIB}/ibus/ascii.pyc
${PYSITELIB}/ibus/ascii.pyo
${PYSITELIB}/ibus/attribute.py
${PYSITELIB}/ibus/attribute.pyc
${PYSITELIB}/ibus/attribute.pyo
${PYSITELIB}/ibus/bus.py
${PYSITELIB}/ibus/bus.pyc
${PYSITELIB}/ibus/bus.pyo
${PYSITELIB}/ibus/common.py
${PYSITELIB}/ibus/common.pyc
${PYSITELIB}/ibus/common.pyo
${PYSITELIB}/ibus/component.py
${PYSITELIB}/ibus/component.pyc
${PYSITELIB}/ibus/component.pyo
${PYSITELIB}/ibus/config.py
${PYSITELIB}/ibus/config.pyc
${PYSITELIB}/ibus/config.pyo
${PYSITELIB}/ibus/engine.py
${PYSITELIB}/ibus/engine.pyc
${PYSITELIB}/ibus/engine.pyo
${PYSITELIB}/ibus/enginedesc.py
${PYSITELIB}/ibus/enginedesc.pyc
${PYSITELIB}/ibus/enginedesc.pyo
${PYSITELIB}/ibus/exception.py
${PYSITELIB}/ibus/exception.pyc
${PYSITELIB}/ibus/exception.pyo
${PYSITELIB}/ibus/factory.py
${PYSITELIB}/ibus/factory.pyc
${PYSITELIB}/ibus/factory.pyo
${PYSITELIB}/ibus/inputcontext.py
${PYSITELIB}/ibus/inputcontext.pyc
${PYSITELIB}/ibus/inputcontext.pyo
${PYSITELIB}/ibus/interface/__init__.py
${PYSITELIB}/ibus/interface/__init__.pyc
${PYSITELIB}/ibus/interface/__init__.pyo
${PYSITELIB}/ibus/interface/iconfig.py
${PYSITELIB}/ibus/interface/iconfig.pyc
${PYSITELIB}/ibus/interface/iconfig.pyo
${PYSITELIB}/ibus/interface/iengine.py
${PYSITELIB}/ibus/interface/iengine.pyc
${PYSITELIB}/ibus/interface/iengine.pyo
${PYSITELIB}/ibus/interface/ienginefactory.py
${PYSITELIB}/ibus/interface/ienginefactory.pyc
${PYSITELIB}/ibus/interface/ienginefactory.pyo
${PYSITELIB}/ibus/interface/iibus.py
${PYSITELIB}/ibus/interface/iibus.pyc
${PYSITELIB}/ibus/interface/iibus.pyo
${PYSITELIB}/ibus/interface/iinputcontext.py
${PYSITELIB}/ibus/interface/iinputcontext.pyc
${PYSITELIB}/ibus/interface/iinputcontext.pyo
${PYSITELIB}/ibus/interface/inotifications.py
${PYSITELIB}/ibus/interface/inotifications.pyc
${PYSITELIB}/ibus/interface/inotifications.pyo
${PYSITELIB}/ibus/interface/ipanel.py
${PYSITELIB}/ibus/interface/ipanel.pyc
${PYSITELIB}/ibus/interface/ipanel.pyo
${PYSITELIB}/ibus/keysyms.py
${PYSITELIB}/ibus/keysyms.pyc
${PYSITELIB}/ibus/keysyms.pyo
${PYSITELIB}/ibus/lang.py
${PYSITELIB}/ibus/lang.pyc
${PYSITELIB}/ibus/lang.pyo
${PYSITELIB}/ibus/lookuptable.py
${PYSITELIB}/ibus/lookuptable.pyc
${PYSITELIB}/ibus/lookuptable.pyo
${PYSITELIB}/ibus/modifier.py
${PYSITELIB}/ibus/modifier.pyc
${PYSITELIB}/ibus/modifier.pyo
${PYSITELIB}/ibus/notifications.py
${PYSITELIB}/ibus/notifications.pyc
${PYSITELIB}/ibus/notifications.pyo
${PYSITELIB}/ibus/object.py
${PYSITELIB}/ibus/object.pyc
${PYSITELIB}/ibus/object.pyo
${PYSITELIB}/ibus/observedpath.py
${PYSITELIB}/ibus/observedpath.pyc
${PYSITELIB}/ibus/observedpath.pyo
${PYSITELIB}/ibus/panel.py
${PYSITELIB}/ibus/panel.pyc
${PYSITELIB}/ibus/panel.pyo
${PYSITELIB}/ibus/property.py
${PYSITELIB}/ibus/property.pyc
${PYSITELIB}/ibus/property.pyo
${PYSITELIB}/ibus/serializable.py
${PYSITELIB}/ibus/serializable.pyc
${PYSITELIB}/ibus/serializable.pyo
${PYSITELIB}/ibus/text.py
${PYSITELIB}/ibus/text.pyc
${PYSITELIB}/ibus/text.pyo
${PYSITELIB}/ibus/utility.py
${PYSITELIB}/ibus/utility.pyc
${PYSITELIB}/ibus/utility.pyo
libexec/ibus-dconf
libexec/ibus-engine-simple
libexec/ibus-gconf
libexec/ibus-ui-gtk
libexec/ibus-ui-gtk3
libexec/ibus-x11
man/man1/ibus-daemon.1
man/man1/ibus-setup.1
man/man1/ibus.1
share/GConf/gsettings/ibus.convert
share/applications/ibus-setup.desktop
share/applications/ibus.desktop
share/bash-completion/completions/ibus.bash
share/examples/ibus/dconf/db/ibus.d/00-upstream-settings
share/examples/ibus/dconf/profile/ibus
share/gconf/schemas/ibus.schemas
share/gir-1.0/IBus-1.0.gir
share/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml
share/gtk-doc/html/ibus/IBusAttrList.html
share/gtk-doc/html/ibus/IBusAttribute.html
share/gtk-doc/html/ibus/IBusBus.html
@@ -167,9 +78,13 @@ share/gtk-doc/html/ibus/IBusPanelService.html
share/gtk-doc/html/ibus/IBusPropList.html
share/gtk-doc/html/ibus/IBusProperty.html
share/gtk-doc/html/ibus/IBusProxy.html
share/gtk-doc/html/ibus/IBusRegistry.html
share/gtk-doc/html/ibus/IBusSerializable.html
share/gtk-doc/html/ibus/IBusService.html
share/gtk-doc/html/ibus/IBusText.html
share/gtk-doc/html/ibus/annotation-glossary.html
share/gtk-doc/html/ibus/api-index-deprecated.html
share/gtk-doc/html/ibus/api-index-full.html
share/gtk-doc/html/ibus/ch01.html
share/gtk-doc/html/ibus/ch02.html
share/gtk-doc/html/ibus/ch03.html
@@ -177,11 +92,15 @@ share/gtk-doc/html/ibus/ch04.html
share/gtk-doc/html/ibus/ch05.html
share/gtk-doc/html/ibus/ch06.html
share/gtk-doc/html/ibus/home.png
share/gtk-doc/html/ibus/ibus-IBusEngineSimple.html
share/gtk-doc/html/ibus/ibus-IBusKeysyms.html
share/gtk-doc/html/ibus/ibus-ibusdebug.html
share/gtk-doc/html/ibus/ibus-ibuserror.html
share/gtk-doc/html/ibus/ibus-ibuskeys.html
share/gtk-doc/html/ibus/ibus-ibuskeysyms-compat.html
share/gtk-doc/html/ibus/ibus-ibusshare.html
share/gtk-doc/html/ibus/ibus-ibustypes.html
share/gtk-doc/html/ibus/ibus-ibusutil.html
share/gtk-doc/html/ibus/ibus-ibusversion.html
share/gtk-doc/html/ibus/ibus-ibusxml.html
share/gtk-doc/html/ibus/ibus.devhelp2
@@ -191,8 +110,10 @@ share/gtk-doc/html/ibus/left.png
share/gtk-doc/html/ibus/right.png
share/gtk-doc/html/ibus/style.css
share/gtk-doc/html/ibus/up.png
share/ibus/component/dconf.xml
share/ibus/component/gconf.xml
share/ibus/component/gtkpanel.xml
share/ibus/component/simple.xml
share/ibus/keymaps/common
share/ibus/keymaps/in
share/ibus/keymaps/jp
@@ -221,42 +142,6 @@ share/ibus/setup/main.py
share/ibus/setup/main.pyc
share/ibus/setup/main.pyo
share/ibus/setup/setup.ui
share/ibus/ui/gtk/candidatepanel.py
share/ibus/ui/gtk/candidatepanel.pyc
share/ibus/ui/gtk/candidatepanel.pyo
share/ibus/ui/gtk/engineabout.py
share/ibus/ui/gtk/engineabout.pyc
share/ibus/ui/gtk/engineabout.pyo
share/ibus/ui/gtk/handle.py
share/ibus/ui/gtk/handle.pyc
share/ibus/ui/gtk/handle.pyo
share/ibus/ui/gtk/i18n.py
share/ibus/ui/gtk/i18n.pyc
share/ibus/ui/gtk/i18n.pyo
share/ibus/ui/gtk/icon.py
share/ibus/ui/gtk/icon.pyc
share/ibus/ui/gtk/icon.pyo
share/ibus/ui/gtk/languagebar.py
share/ibus/ui/gtk/languagebar.pyc
share/ibus/ui/gtk/languagebar.pyo
share/ibus/ui/gtk/main.py
share/ibus/ui/gtk/main.pyc
share/ibus/ui/gtk/main.pyo
share/ibus/ui/gtk/menu.py
share/ibus/ui/gtk/menu.pyc
share/ibus/ui/gtk/menu.pyo
share/ibus/ui/gtk/notifications.py
share/ibus/ui/gtk/notifications.pyc
share/ibus/ui/gtk/notifications.pyo
share/ibus/ui/gtk/panel.py
share/ibus/ui/gtk/panel.pyc
share/ibus/ui/gtk/panel.pyo
share/ibus/ui/gtk/propitem.py
share/ibus/ui/gtk/propitem.pyc
share/ibus/ui/gtk/propitem.pyo
share/ibus/ui/gtk/toolitem.py
share/ibus/ui/gtk/toolitem.pyc
share/ibus/ui/gtk/toolitem.pyo
share/icons/hicolor/16x16/apps/ibus-keyboard.png
share/icons/hicolor/22x22/apps/ibus-keyboard.png
share/icons/hicolor/24x24/apps/ibus-keyboard.png
@@ -268,17 +153,22 @@ share/icons/hicolor/scalable/apps/ibus-setup.svg
share/icons/hicolor/scalable/apps/ibus.svg
share/locale/ar/LC_MESSAGES/ibus10.mo
share/locale/as/LC_MESSAGES/ibus10.mo
share/locale/bg/LC_MESSAGES/ibus10.mo
share/locale/bn/LC_MESSAGES/ibus10.mo
share/locale/bn_IN/LC_MESSAGES/ibus10.mo
share/locale/ca/LC_MESSAGES/ibus10.mo
share/locale/da/LC_MESSAGES/ibus10.mo
share/locale/de/LC_MESSAGES/ibus10.mo
share/locale/en_GB/LC_MESSAGES/ibus10.mo
share/locale/es/LC_MESSAGES/ibus10.mo
share/locale/et/LC_MESSAGES/ibus10.mo
share/locale/eu/LC_MESSAGES/ibus10.mo
share/locale/fa/LC_MESSAGES/ibus10.mo
share/locale/fr/LC_MESSAGES/ibus10.mo
share/locale/gu/LC_MESSAGES/ibus10.mo
share/locale/hi/LC_MESSAGES/ibus10.mo
share/locale/hu/LC_MESSAGES/ibus10.mo
share/locale/ia/LC_MESSAGES/ibus10.mo
share/locale/it/LC_MESSAGES/ibus10.mo
share/locale/ja/LC_MESSAGES/ibus10.mo
share/locale/kn/LC_MESSAGES/ibus10.mo
@@ -286,6 +176,7 @@ share/locale/ko/LC_MESSAGES/ibus10.mo
share/locale/lv/LC_MESSAGES/ibus10.mo
share/locale/ml/LC_MESSAGES/ibus10.mo
share/locale/mr/LC_MESSAGES/ibus10.mo
share/locale/nb/LC_MESSAGES/ibus10.mo
share/locale/nl/LC_MESSAGES/ibus10.mo
share/locale/or/LC_MESSAGES/ibus10.mo
share/locale/pa/LC_MESSAGES/ibus10.mo
@@ -302,8 +193,4 @@ share/locale/vi/LC_MESSAGES/ibus10.mo
share/locale/zh_CN/LC_MESSAGES/ibus10.mo
share/locale/zh_HK/LC_MESSAGES/ibus10.mo
share/locale/zh_TW/LC_MESSAGES/ibus10.mo
share/vala/vapi/ibus-1.0.deps
share/vala/vapi/ibus-1.0.vapi
@pkgdir share/pixmaps
@pkgdir share/ibus/icons
@pkgdir share/ibus/engine

5
inputmethod/ibus/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.6 2012/09/15 10:05:11 obache Exp $
# $NetBSD: buildlink3.mk,v 1.7 2013/10/23 11:50:04 obache Exp $
#
BUILDLINK_TREE+= ibus
@@ -6,8 +6,7 @@ BUILDLINK_TREE+= ibus
.if !defined(IBUS_BUILDLINK3_MK)
IBUS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ibus+= ibus>=1.4.0
BUILDLINK_ABI_DEPENDS.ibus?= ibus>=1.4.2nb2
BUILDLINK_API_DEPENDS.ibus+= ibus>=1.5.0
BUILDLINK_PKGSRCDIR.ibus?= ../../inputmethod/ibus
.include "../../devel/glib2/buildlink3.mk"

10
inputmethod/ibus/distinfo
View File

@@ -1,5 +1,7 @@
$NetBSD: distinfo,v 1.7 2012/08/23 12:34:14 obache Exp $
$NetBSD: distinfo,v 1.10 2014/01/16 11:04:26 obache Exp $
SHA1 (ibus-1.4.2.tar.gz) = a2d11d8bb64761691df918e9e50f0b35c711760d
RMD160 (ibus-1.4.2.tar.gz) = 88e143fcae7da6bf44b3c9459e0845a104895432
Size (ibus-1.4.2.tar.gz) = 1489482 bytes
SHA1 (ibus-1.5.5.tar.gz) = 5671fe504e65aaf396c1d779032d7526c161b64b
RMD160 (ibus-1.5.5.tar.gz) = d3941dd044886e3946da92b4576b94581a3f8797
Size (ibus-1.5.5.tar.gz) = 2063794 bytes
SHA1 (patch-client_gtk2_ibusimcontext.c) = 31e72d06884858476097f04591004ce46b6074c1
SHA1 (patch-client_gtk3_ibusimcontext.c) = 543192191d14d61ae3e193de6ffda7b099969a1a

54
inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c Normal file
View File

@@ -0,0 +1,54 @@
$NetBSD: patch-client_gtk2_ibusimcontext.c,v 1.1 2013/11/12 02:57:43 dholland Exp $
NetBSD 6.99.25's gcc says:
error: #pragma GCC diagnostic not allowed inside functions
--- client/gtk2/ibusimcontext.c~ 2013-09-20 03:15:51.000000000 +0000
+++ client/gtk2/ibusimcontext.c
@@ -509,6 +509,9 @@ daemon_name_vanished (GDBusConnection *c
_daemon_is_running = FALSE;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
static void
ibus_im_context_class_init (IBusIMContextClass *class)
{
@@ -593,10 +596,7 @@ ibus_im_context_class_init (IBusIMContex
/* always install snooper */
if (_key_snooper_id == 0) {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
_key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL);
-#pragma GCC diagnostic pop
}
_daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
@@ -607,21 +607,22 @@ ibus_im_context_class_init (IBusIMContex
NULL,
NULL);
}
+#pragma GCC diagnostic pop
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
static void
ibus_im_context_class_fini (IBusIMContextClass *class)
{
if (_key_snooper_id != 0) {
IDEBUG ("snooper is terminated.");
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
gtk_key_snooper_remove (_key_snooper_id);
-#pragma GCC diagnostic pop
_key_snooper_id = 0;
}
g_bus_unwatch_name (_daemon_name_watch_id);
}
+#pragma GCC diagnostic pop
/* Copied from gtk+2.0-2.20.1/modules/input/imcedilla.c to fix crosbug.com/11421.
* Overwrite the original Gtk+'s compose table in gtk+-2.x.y/gtk/gtkimcontextsimple.c. */

54
inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c Normal file
View File

@@ -0,0 +1,54 @@
$NetBSD: patch-client_gtk3_ibusimcontext.c,v 1.1 2013/11/12 02:57:43 dholland Exp $
NetBSD 6.99.25's gcc says:
error: #pragma GCC diagnostic not allowed inside functions
--- client/gtk3/ibusimcontext.c~ 2013-09-20 03:15:51.000000000 +0000
+++ client/gtk3/ibusimcontext.c
@@ -509,6 +509,9 @@ daemon_name_vanished (GDBusConnection *c
_daemon_is_running = FALSE;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
static void
ibus_im_context_class_init (IBusIMContextClass *class)
{
@@ -593,10 +596,7 @@ ibus_im_context_class_init (IBusIMContex
/* always install snooper */
if (_key_snooper_id == 0) {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
_key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL);
-#pragma GCC diagnostic pop
}
_daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
@@ -607,21 +607,22 @@ ibus_im_context_class_init (IBusIMContex
NULL,
NULL);
}
+#pragma GCC diagnostic pop
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
static void
ibus_im_context_class_fini (IBusIMContextClass *class)
{
if (_key_snooper_id != 0) {
IDEBUG ("snooper is terminated.");
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
gtk_key_snooper_remove (_key_snooper_id);
-#pragma GCC diagnostic pop
_key_snooper_id = 0;
}
g_bus_unwatch_name (_daemon_name_watch_id);
}
+#pragma GCC diagnostic pop
/* Copied from gtk+2.0-2.20.1/modules/input/imcedilla.c to fix crosbug.com/11421.
* Overwrite the original Gtk+'s compose table in gtk+-2.x.y/gtk/gtkimcontextsimple.c. */

4
inputmethod/im-ja/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.31 2013/06/06 12:54:37 wiz Exp $
# $NetBSD: Makefile,v 1.38 2014/02/12 23:18:04 tron Exp $
#
DISTNAME= im-ja-1.5
PKGREVISION= 29
PKGREVISION= 36
CATEGORIES= inputmethod japanese
MASTER_SITES= http://im-ja.sourceforge.net/

4
inputmethod/imhangul/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.33 2013/06/06 12:54:37 wiz Exp $
# $NetBSD: Makefile,v 1.36 2013/10/10 14:42:18 ryoon Exp $
DISTNAME= imhangul-2.0.0
PKGREVISION= 9
PKGREVISION= 12
CATEGORIES= inputmethod korean
MASTER_SITES= http://kldp.net/frs/download.php/5924/
EXTRACT_SUFX= .tar.bz2

4
inputmethod/imhangul_status_applet/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.63 2013/06/06 12:54:37 wiz Exp $
# $NetBSD: Makefile,v 1.69 2014/02/12 23:18:04 tron Exp $
#
DISTNAME= imhangul_status_applet-0.3
PKGREVISION= 45
PKGREVISION= 51
CATEGORIES= korean inputmethod
MASTER_SITES= http://download.kldp.net/imhangul/imhangul_status_applet/0.3/

10
inputmethod/input-pad/Makefile
View File

@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.22 2013/06/06 12:53:55 wiz Exp $
# $NetBSD: Makefile,v 1.26 2013/12/07 11:32:31 obache Exp $
#
.include "Makefile.common"
PKGREVISION= 9
MAINTAINER= obache@NetBSD.org
COMMENT= On-screen Input Pad to Send Characters with Mouse
@@ -14,14 +13,17 @@ USE_TOOLS+= gmake pkg-config intltool msgfmt xgettext msgmerge
PKGCONFIG_OVERRIDE+= input-pad.pc.in
CONFIGURE_ARGS+= --enable-python=no
CONFIGURE_ARGS+= --enable-pygobject2=no
CONFIGURE_ARGS+= --disable-maintainer-mode
MANCOMPRESSED= yes
.include "options.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libxkbfile/buildlink3.mk"
BUILDLINK_API_DEPENDS.libxklavier+= libxklavier>=4.0

4
inputmethod/input-pad/Makefile.common
View File

@@ -1,9 +1,9 @@
# $NetBSD: Makefile.common,v 1.4 2012/04/22 13:56:19 obache Exp $
# $NetBSD: Makefile.common,v 1.6 2013/12/07 11:32:31 obache Exp $
#
# used by inputmethod/input-pad/Makefile
# used by inputmethod/py-input-pad/Makefile
DISTNAME= input-pad-1.0.1
DISTNAME= input-pad-1.0.3
CATEGORIES= inputmethod
MASTER_SITES= http://input-pad.googlecode.com/files/

13
inputmethod/input-pad/PLIST
View File

@@ -1,21 +1,30 @@
@comment $NetBSD: PLIST,v 1.3 2012/04/22 13:56:19 obache Exp $
@comment $NetBSD: PLIST,v 1.5 2013/12/07 11:32:31 obache Exp $
bin/input-pad
include/input-pad-1.0/input-pad-group.h
include/input-pad-1.0/input-pad-kbdui-gtk.h
include/input-pad-1.0/input-pad-window-gtk.h
include/input-pad-1.0/input-pad.h
${PLIST.introspection}lib/girepository-1.0/InputPad-1.0.typelib
${PLIST.eek}lib/input-pad-1.0/modules/kbdui/libinput-pad-eek-gtk.la
${PLIST.xtest}lib/input-pad-1.0/modules/xkeysend/libinput-pad-xtest-gdk.la
lib/libinput-pad.la
lib/pkgconfig/input-pad.pc
man/man1/input-pad.1
${PLIST.introspection}share/gir-1.0/InputPad-1.0.gir
share/input-pad/pad/group01-base.xml
share/input-pad/pad/group02-alphabet.xml
share/input-pad/pad/group02-ja.xml
share/input-pad/pad/group02-zh.xml
share/input-pad/pad/group03-runr.xml
share/input-pad/pad/group50-str.xml
share/input-pad/pad/group60-w3c.xml
share/input-pad/pad/group70-cmd.xml
share/input-pad/ui/gtk/input-pad.ui
share/locale/ca/LC_MESSAGES/input-pad.mo
share/locale/eu/LC_MESSAGES/input-pad.mo
share/locale/fr/LC_MESSAGES/input-pad.mo
share/locale/hu/LC_MESSAGES/input-pad.mo
share/locale/ja/LC_MESSAGES/input-pad.mo
share/locale/uk/LC_MESSAGES/input-pad.mo
share/locale/zh_CN/LC_MESSAGES/input-pad.mo
share/locale/zh_TW/LC_MESSAGES/input-pad.mo
share/pixmaps/input-pad.png

7
inputmethod/input-pad/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.19 2013/06/06 12:53:55 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.22 2013/10/23 12:31:14 obache Exp $
#
BUILDLINK_TREE+= input-pad
@@ -6,14 +6,13 @@ BUILDLINK_TREE+= input-pad
.if !defined(INPUT_PAD_BUILDLINK3_MK)
INPUT_PAD_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.input-pad+= input-pad>=1.0.1
BUILDLINK_ABI_DEPENDS.input-pad?= input-pad>=1.0.1nb9
BUILDLINK_API_DEPENDS.input-pad+= input-pad>=1.0.2
BUILDLINK_PKGSRCDIR.input-pad?= ../../inputmethod/input-pad
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libxkbfile/buildlink3.mk"
.include "../../x11/libxklavier/buildlink3.mk"

8
inputmethod/input-pad/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.4 2012/04/22 13:56:19 obache Exp $
$NetBSD: distinfo,v 1.6 2013/12/07 11:32:31 obache Exp $
SHA1 (input-pad-1.0.1.tar.gz) = 333f2343ff514c1032382c2c5cac9047b13788cb
RMD160 (input-pad-1.0.1.tar.gz) = e681a507a12f528861aded5642f06bdd78adce77
Size (input-pad-1.0.1.tar.gz) = 508956 bytes
SHA1 (input-pad-1.0.3.tar.gz) = bce74190e294cd6b8a0d6290d4a27b7ed8114fe8
RMD160 (input-pad-1.0.3.tar.gz) = 5ed2017c35642c9b5c3135bfa54e307c7b13dff9
Size (input-pad-1.0.3.tar.gz) = 614644 bytes

17
inputmethod/input-pad/options.mk
View File

@@ -1,13 +1,13 @@
# $NetBSD: options.mk,v 1.3 2010/11/30 11:20:16 obache Exp $
# $NetBSD: options.mk,v 1.5 2013/12/07 11:32:31 obache Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.input-pad
PKG_SUPPORTED_OPTIONS= eekboard xtest
PKG_SUGGESTED_OPTIONS= eekboard
PKG_SUPPORTED_OPTIONS= eekboard introspection xtest
PKG_SUGGESTED_OPTIONS= introspection xtest
.include "../../mk/bsd.options.mk"
PLIST_VARS+= eek xtest
PLIST_VARS+= eek introspection xtest
#
# Draw keyboard using libeek
@@ -26,3 +26,12 @@ PLIST.eek= yes
CONFIGURE_ARGS+= --enable-xtest=yes
PLIST.xtest= yes
.endif
#
# Introspection support
#
.if !empty(PKG_OPTIONS:Mintrospection)
BUILDLINK_DEPMETHOD.gobject-introspection= build
.include "../../devel/gobject-introspection/buildlink3.mk"
PLIST.introspection= yes
.endif

5
inputmethod/ja-freewnn-lib/Makefile
View File

@@ -1,8 +1,11 @@
# $NetBSD: Makefile,v 1.11 2011/09/13 07:23:16 mef Exp $
# $NetBSD: Makefile,v 1.12 2013/10/15 06:25:37 mef Exp $
.include "Makefile.common"
PKGNAME= ja-FreeWnn-lib-1.11alpha22
# DISTFILE now includes all patches, the same PKGNAME, almost the same binary
# but build is different, and binary may not be exactly the same
PKGREVISION= 1
COMMENT+= (Japanese client library)

6
inputmethod/ja-freewnn-lib/Makefile.common
View File

@@ -1,9 +1,9 @@
# $NetBSD: Makefile.common,v 1.18 2013/06/10 03:09:01 dholland Exp $
# $NetBSD: Makefile.common,v 1.19 2013/10/15 06:25:37 mef Exp $
# used by inputmethod/ja-freewnn-server/Makefile
# used by inputmethod/ja-freewnn-lib/Makefile
DISTNAME= FreeWnn-1.1.1-a021
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=freewnn/17724/} \
DISTNAME= FreeWnn-1.1.1-a022
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=freewnn/59257/} \
ftp://ftp.st.ryukoku.ac.jp/pub/japanese-im/FreeWnn/
CATEGORIES= inputmethod

78
inputmethod/ja-freewnn-lib/distinfo
View File

@@ -1,74 +1,6 @@
$NetBSD: distinfo,v 1.11 2011/09/13 07:23:16 mef Exp $
$NetBSD: distinfo,v 1.12 2013/10/15 06:25:37 mef Exp $
SHA1 (FreeWnn-1.1.1-a021.tar.gz) = 9fec62d6f0a584f4ccfdc879687bf2726b86df47
RMD160 (FreeWnn-1.1.1-a021.tar.gz) = e16b39b572cc368a705bf24fbb87dedf8d8940de
Size (FreeWnn-1.1.1-a021.tar.gz) = 3617618 bytes
SHA1 (patch-CONTRIBUTORS) = d266fbd7f46b37aea0872f111ec8399590986b08
SHA1 (patch-ChangeLog) = 465a0ffd0cbe0741470c5f13628a69c02561c705
SHA1 (patch-ChangeLog.en) = 9a25261d0988171c8a41f5dc6819709c69479463
SHA1 (patch-Contrib_dic_gerodic_Makefile.in) = c0e4cfd5d4a91d87b5e91ccbc6f1224229a66b67
SHA1 (patch-INSTALL) = 1adeeea9147a3d1343df61df0a1e426c8ff7fd27
SHA1 (patch-INSTALL.en) = f47e38aa5a46926d733b92df5e6e8d0320dd852f
SHA1 (patch-Makefile.in) = 2a7867f909e01af1c7a4d7db3c950de9f5cbc68c
SHA1 (patch-PubdicPlus_pod.c) = 1d6b66c7772299a0f15d08b5dc2a5197bc3b7f32
SHA1 (patch-Wnn_Makefile.in) = ecadaaaba0f8ba98b2aae0d44fd2b40f90f8632c
SHA1 (patch-Wnn_conv_cvt__head.h) = 23a4e8652117708b76e875e1b53b30e4cff70916
SHA1 (patch-Wnn_conv_cvt__read.c) = 7ab3255f6dc81787ffa6826f1f51b3f7dccce905
SHA1 (patch-Wnn_include_commonhd.h) = 476d644af23b455a511ea86067b08751c989a910
SHA1 (patch-Wnn_include_jllib.h) = c1a787d10d3eaca5a987d76f625c2921f6c0f304
SHA1 (patch-Wnn_include_jslib.h) = 8bf82de6cf46fbe52b2c7fb2f6a11a3332487ed0
SHA1 (patch-Wnn_include_wnn__os.h) = 59ade03300429d8dfc33065fb9fed413316ae033
SHA1 (patch-Wnn_jlib.V3_Makefile.in) = 696609aec7a42a8d83eb26fbe530186e4ddfacc9
SHA1 (patch-Wnn_jlib_Makefile.in) = 0cf9edcefd68fdf58e2daacc18843dd960e86cb2
SHA1 (patch-Wnn_jserver_Makefile.in) = 5627dfbe6dd8a585a2561c6bbef78698b515ba27
SHA1 (patch-Wnn_jserver_de__header.h) = 714639d77f07fe91fb5235db1e7c907c2bff3f82
SHA1 (patch-Wnn_jserver_renbn__kai.c) = eebf524ad171d49fe7a630e7599715f0cbc2c18a
SHA1 (patch-Wnn_jutil_Makefile.in) = 2d4bb490b2b84e240e6ca3b805f4bf1296b23972
SHA1 (patch-Wnn_jutil_ujisf.c) = 182dd1677fd261444f693ea9208d7100878f4673
SHA1 (patch-Wnn_man_2.env_wnn_2b__romkan.man) = 5662c5e2d107a5c2392052f93d30269b6a00be76
SHA1 (patch-Wnn_man_4.cmd_Makefile.in) = e3447e1fd6ad7a1f5f62ccfe6b0d6f1ec2083e5a
SHA1 (patch-Wnn_man_6.jutil_Makefile.in) = 44010d0db4fc3fab32779cd6068e5ea280743460
SHA1 (patch-Wnn_manual_2.env_wnn_2b__romkana) = e02b0d905957670a83b307c507cf42c0a1461ff0
SHA1 (patch-Wnn_pubdicplus_Makefile.in) = ecdceea5ae48700a9554769de2cfaf6615e657ee
SHA1 (patch-Wnn_romkan_Makefile.in) = 5b32541fd3c5948e93aeb12d329854cb7bbbbb3a
SHA1 (patch-Wnn_uum_Makefile.in) = f4609dae969bd4cab1cc5549a6439bc6ca5f3fea
SHA1 (patch-Wnn_uum_basic__op.c) = 4e83cd2bfb5f6256a3cb24da2faa4637358bb3d5
SHA1 (patch-Wnn_uum_epilogue.c) = c0c8937f932ea5f88aeee4542a11ce6c2838cc18
SHA1 (patch-Wnn_uum_header.c) = 633c1498283a0f7cde2689c7f7e00b8d578a22a6
SHA1 (patch-Wnn_uum_hinsi.c) = fed5b127f0b9690c96554faad0ac28c60cebb532
SHA1 (patch-Wnn_uum_jhlp.c) = 1eb0c5f7d9bbd7a43fe898c2ba19b45525b2f255
SHA1 (patch-Wnn_uum_jikouho.c) = ace7f19c0b0b4796559a0744d7da9ab12f2c4c1b
SHA1 (patch-Wnn_uum_printf.c) = 863f6dafe7e9271a10465614dc4aa32a4295d688
SHA1 (patch-Wnn_uum_sdefine.h) = e286bbb6eb7ec2fb3846f97d48d8462a647343de
SHA1 (patch-Wnn_uum_setutmp.c) = 7259fdec5c975435e4750c528e49f35bf115d9f3
SHA1 (patch-Wnn_uum_sheader.h) = 75015835b05c92947cb2efa1e992282e30237c18
SHA1 (patch-Wnn_uum_termcap.c) = a27ddf00b16de74084f86a9aafd9c1645653ee50
SHA1 (patch-Wnn_uum_termio.c) = c57582336fd5a94d073d7795d5852c6fe56b6623
SHA1 (patch-Wnn_uum_touroku.c) = 2b3890220fe20f79583a9e8ef14d78fda49aa06f
SHA1 (patch-aclocal.m4) = 883a7db7666ea03e61aed95900ca56150c4b135a
SHA1 (patch-cWnn_Makefile.in) = c03dbd8492c7914f7c9d1ca3c3bc7c110806a109
SHA1 (patch-cWnn_cdic_Makefile.in) = d3a5d81b3e50f455d13815280cd8f1bf6b9f61c6
SHA1 (patch-cWnn_jlib_Makefile.in) = fffa48c9a2891b5240a49c699cb5a20b1a297b7d
SHA1 (patch-cWnn_jserver_Makefile.in) = 443625fb83356c62d38795d4e1c0d5c1ef97e3bc
SHA1 (patch-cWnn_jutil_Makefile.in) = 3e23ba23b453dd49fa703c76ad0626015db48978
SHA1 (patch-cWnn_man_2.env_ckey.man) = f0ccf53a8907b7fd4e1f5e835a855826e5ce0d8f
SHA1 (patch-cWnn_man_4.cmd_Makefile.in) = ce2d1bfb332a8a60ec4cd90a169a555bbea8738b
SHA1 (patch-cWnn_man_6.jutil_Makefile.in) = 521d372977d095666cef5f76590546ce638df1b8
SHA1 (patch-cWnn_romkan_Makefile.in) = 447b60c7ece313337f8b4cf64d566218ee0400e3
SHA1 (patch-cWnn_tdic_Makefile.in) = 29f0a39e9321906250041d9a5661272a539fd598
SHA1 (patch-cWnn_uum_Makefile.in) = b600c3693f7d13fb5fcf3020f3aaa657fd3bd5ca
SHA1 (patch-config.guess) = 7ec197c7acd7d30b710980c6192b181988c94e04
SHA1 (patch-config.h.in) = 86d2136d77de53551f73550edb93fd3751a213f0
SHA1 (patch-config.sub) = 7559286d131f783873f1fdb4218f65ca813b2ed9
SHA1 (patch-configure) = 538ae7cbe6c354eaeb967e9928ba6503cb8bc7a8
SHA1 (patch-configure.in) = 0fc409da3fc1cb888e60a9a4140be6a7f27b9e01
SHA1 (patch-kWnn_Makefile.in) = 10b587a04c1426f5c597bbe1348e0b89ad523c33
SHA1 (patch-kWnn_jlib_Makefile.in) = 47a2c15fa9a2fd46fc1be5bdb82f411f5cf0fc0b
SHA1 (patch-kWnn_jserver_Makefile.in) = 0a59e11b28a1168028ec176ce226b08554ea7273
SHA1 (patch-kWnn_jutil_Makefile.in) = f7f2ecf2d82b804b89f67e7849001e05e432a129
SHA1 (patch-kWnn_kdic_Makefile.in) = 5920cd464833a2aa18f54e02217748c8c2cdb432
SHA1 (patch-kWnn_romkan_Makefile.in) = 5ccccf5c0e5d0965d3203bf03c84d9817c08f9dd
SHA1 (patch-kWnn_uum_Makefile.in) = 0fade22c5cffabeff5c743c85f8c9077831a9598
SHA1 (patch-ltmain.sh) = 291d07960a3553fe3b24ffb1e6844cf89c8e520f
SHA1 (patch-makerule.mk.in) = 2fd873224c1a4bba5ba5bea454b7f9964e750e88
SHA1 (patch-makerule.mk.in-2) = 3c27d57081ac5937bb280c1b8cdaf12e489d2384
SHA1 (FreeWnn-1.1.1-a022.tar.gz) = 659ab9db35e7a92189671ea6be17f138c24913d3
RMD160 (FreeWnn-1.1.1-a022.tar.gz) = ae8373cb1522de9170bab01a185287c325368749
Size (FreeWnn-1.1.1-a022.tar.gz) = 3702026 bytes
SHA1 (patch-makerule.mk.in) = 3c27d57081ac5937bb280c1b8cdaf12e489d2384

15
inputmethod/ja-freewnn-lib/patches/patch-CONTRIBUTORS
View File

@@ -1,15 +0,0 @@
$NetBSD: patch-CONTRIBUTORS,v 1.1 2011/09/13 07:23:16 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- CONTRIBUTORS.orig 2005-04-10 15:26:36.000000000 +0000
+++ CONTRIBUTORS
@@ -60,6 +60,8 @@ FreeWnn 1.1.1 (予定)
Keiji Wada - 和田@川崎 <keiji@hiemalis.org>
Kazuo ISHIDA - いしだ@NEC <ishidakz@hml.cl.nec.co.jp>
Yukihiro Nakai
+ AIDA Shinra and Canna contributors
+ Taketo Kabe
Pubdic+ 部分
SUNAGAWA Keiki <kei_sun@ba2.so-net.ne.jp>

15
inputmethod/ja-freewnn-lib/patches/patch-ChangeLog
View File

@@ -1,15 +0,0 @@
$NetBSD: patch-ChangeLog,v 1.1 2011/09/13 07:23:16 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- ChangeLog.orig 2005-11-29 17:30:42.000000000 +0000
+++ ChangeLog
@@ -82,7 +82,7 @@ Mon, 11 Apr 2005 00:26:36 Tomoki AONO <
Changed license of libwnn-related files to LGPL-2.0.
Thanks to the original Wnn authors and FreeWnn contributors.
- And thanks to Yukihiro Nagai (and tyoshida) for coordination
+ And thanks to Yukihiro Nakai (and tyoshida) for coordination
of this relicensing.
Mon, 31 Jan 2005 02:14:20 Tomoki AONO <aonoto at users.sourceforge.jp>

15
inputmethod/ja-freewnn-lib/patches/patch-ChangeLog.en
View File

@@ -1,15 +0,0 @@
$NetBSD: patch-ChangeLog.en,v 1.1 2011/09/13 07:23:16 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- ChangeLog.en.orig 2005-11-29 17:30:42.000000000 +0000
+++ ChangeLog.en
@@ -76,7 +76,7 @@ Mon, 11 Apr 2005 00:26:36 Tomoki AONO <
Changed license of libwnn-related files to LGPL-2.0.
Thanks to the original Wnn authors and FreeWnn contributors.
- And thanks to Yukihiro Nagai (and tyoshida) for coordination
+ And thanks to Yukihiro Nakai (and tyoshida) for coordination
of this relicensing.
Mon, 31 Jan 2005 02:14:20 Tomoki AONO <aonoto at users.sourceforge.jp>

45
inputmethod/ja-freewnn-lib/patches/patch-Contrib_dic_gerodic_Makefile.in
View File

@@ -1,45 +0,0 @@
$NetBSD: patch-Contrib_dic_gerodic_Makefile.in,v 1.1 2011/09/13 07:23:16 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Contrib/dic/gerodic/Makefile.in.orig 2001-08-14 13:43:20.000000000 +0000
+++ Contrib/dic/gerodic/Makefile.in
@@ -31,11 +31,14 @@
# '99/04/19 TAOKA Satoshi - 田岡 智志<taoka@infonets.hiroshima-u.ac.jp>
# インストールディレクトリを変更可能にする
#
-# Last modified date: 19,Apr.1999
+# More changes are described in ChangeLog file or CVS commit log.
#
-include @top_srcdir@/makerule.mk
-top_builddir = ../../..
+include @top_builddir@/makerule.mk
+ top_srcdir = @top_srcdir@
+ srcdir = @srcdir@
+top_builddir = @top_builddir@
+ WNNJUTILOBJ = $(top_builddir)/Wnn/jutil
# Makefile for gerodic 1.00
#
@@ -46,17 +49,17 @@ INSTALL = @INSTALL@ $(INSTALLFLA
LOCAL_INSTFLAGS = -o ${WNNOWNER}
#ATOD=${JWNNBINDIR}/atod
-ATOD=${WNNJUTILSRC}/atod
+ATOD=${WNNJUTILOBJ}/atod
#WNNTOUCH=${WNNBINDIR}/wnntouch
-WNNTOUCH=${WNNJUTILSRC}/wnntouch
+WNNTOUCH=${WNNJUTILOBJ}/wnntouch
#HINSI=${JWNNWNNDIR}/hinsi.data
HINSI=${PUBDICPLUSSRC}/hinsi.data
GERODIR=${JWNNDICDIR}/gerodic
-SRC=g-jinmei.u
+SRC=$(srcdir)/g-jinmei.u
OBJ=g-jinmei.dic
all:: ${OBJ}

121
inputmethod/ja-freewnn-lib/patches/patch-INSTALL
View File

@@ -1,121 +0,0 @@
$NetBSD: patch-INSTALL,v 1.1 2011/09/13 07:23:16 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- INSTALL.orig 2004-05-21 16:39:31.000000000 +0000
+++ INSTALL
@@ -10,9 +10,9 @@
# 1987, 1988, 1989, 1990, 1991, 1992
# Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
# Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
-# Copyright FreeWnn Project 1999, 2000, 2002
+# Copyright FreeWnn Project 1999, 2000, 2002, 2006, 2007, 2010
#
-# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+# Maintainer: FreeWnn Project
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -55,19 +55,33 @@
$ make
-5. スーパーユーザーになって make install します
+5. (サーバを構築する場合は)ユーザー wnn を作成します
+
+ 既にユーザー wnn が存在する場合は不要です。
+ ユーザー wnnでログインする必要はないため、パスワードをロック(または相当の
+ 状態に)しておいて下さい。
+ ユーザーの作成方法は
+ お使いのシステムに依存しますので、詳細はそのシステムのマニュアル
+ などを参照してください。
+
+ 注3: [cjkt]server はシステムやファイルへの影響を少なくするため、
+ ユーザー wnn の権限で動作します。また、ローカルユーザが誰でも
+ 起動できるようにユーザー wnn に setuidした状態でインストール
+ されます。
+
+6. スーパーユーザーになって make install します
$ su
# make install
- 注3: 現在のところ、スーパーユーザー以外でのインストールはうまく行
+ 注4: 現在のところ、スーパーユーザー以外でのインストールはうまく行
きません。
-6. マニュアルをインストールします
+7. マニュアルをインストールします
# make install.man
- 注4: マニュアルが不要であれば省略して構いません。
+ 注5: マニュアルが不要であれば省略して構いません。
【configure のオプション】
@@ -88,16 +102,52 @@ FreeWnn 独自の configure option のうち、
--enable-Wnn Wnn (日本語) を作成及びインストールします。
--enable-cWnn cWnn (中国語) を作成及びインストールします。
--enable-kWnn kWnn (韓国語) を作成及びインストールします。
+ --enable-traditional-layout
+ 無効にした場合、近年のソフトが
+ よく利用するディレクトリ構成でインストールしようとします。
+ 有効のままの場合は、従来のWnn4のインストール先に
+ 準じたディレクトリ構成でインストールします。(注6)
default で無効なもの:
--enable-ipv6 IPv6 を有効にします。
--enable-unsafe-path jserverdir 以外のディレクトリに jserver がファイル
- を作成するのを許可します。(注5)
- --enable-client uum を作成及びインストールします。(注6)
+ を作成するのを許可します。(注7)
+ --enable-client uum を作成及びインストールします。
+
+ configure中で必要性・ライブラリの存在を確認するもの:
--with-libwrap TCP wrapperのlibwrapを使用し、jserverの接続時点での
- アクセス制限を可能にします。(注7)
+ アクセス制限を可能にします。(注8)
+ --enable-client-utmp (uumを作成する場合)uumが確保した擬似端末情報を
+ utmpに登録し、whoコマンドなどで参照できるように
+ します。(一部のシステムを除き有効になります)
+ --enable-client-setuid[=user]
+ (uumを作成する場合)指定したuser(未指定の場合は
+ root)でset-uidしてuumをインストールします。
+ このオプション自体を指定しない場合は、判別結果に
+ より必要な場合はset-uidします。
+ --enable-client-setgid=group
+ (uumを作成する場合)指定したgroupでset-gidして
+ uumをインストールします。前述のオプションと異なり、
+ groupは必ず指定する必要があります。
+ このオプション自体を指定しない場合は、判別結果に
+ より必要な場合はset-gidします。
+ --enable-sub-bindir コマンド類をインストールする際、言語別に
+ 「Wnn4」などのサブディレクトリを作成するかどうかを
+ 制御します。指定しない場合は、
+ --enable-traditional-layout オプションが有効の時には
+ 有効、無効の時には無効となります。(注6)
+
+注6: いわゆるFHS (File Hierarchy Standard)に近づけることを意図しています。
+ 現時点ではパラメータにより、インストールするパスに以下の変化があります。
+
+ (ファイル) enable disable
+ jserver, wnnstat, wnnkill $(bindir)/*Wnn4 $(sbindir)
+ その他のコマンド類 $(bindir)/*Wnn4 $(bindir)
-注5: [cjkt]server は、任意の host からの要求を受け付けてしまいます。
+ 「*Wnn4」は言語に応じて「Wnn4」「cWnn4」「kWnn4」のいずれかが利用されます。
+ 「*Wnn4」を作成するかどうかは --enable-sub-bindir で制御できます。
+
+注7: [cjkt]server は、任意の host からの要求を受け付けてしまいます。
--enable-unsafe-path を有効にすると、任意の host から jserver 実行ユーザー
の権限で、任意の path に Wnn の辞書ファイルを作成することができてしまい
ます。従来、home directory など、lib/wnn/$LANG/dic/usr 以外に辞書ファイ
@@ -107,6 +157,4 @@ FreeWnn 独自の configure option のうち、
(通常は /usr/local/lib/wnn/$LANG/dic) 以下に辞書ファイルを作成することは
防げません。
-注6: cuum はまだ compile 出来ません。
-
-注7: --enable-ipv6と同時に指定する場合、libwrapもIPv6対応である必要があります。
+注8: --enable-ipv6と同時に指定する場合、libwrapもIPv6対応である必要があります。

117
inputmethod/ja-freewnn-lib/patches/patch-INSTALL.en
View File

@@ -1,117 +0,0 @@
$NetBSD: patch-INSTALL.en,v 1.1 2011/09/13 07:23:16 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- INSTALL.en.orig 2004-05-21 16:39:31.000000000 +0000
+++ INSTALL.en
@@ -10,9 +10,9 @@
# 1987, 1988, 1989, 1990, 1991, 1992
# Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
# Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
-# Copyright FreeWnn Project 1999, 2000, 2002
+# Copyright FreeWnn Project 1999, 2000, 2002, 2006, 2007, 2010
#
-# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+# Maintainer: FreeWnn Project
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -54,19 +54,29 @@
$ make
-5. To install commands, libraries, dictionaries and so on,
- run make install as a superuser(*3).
+5. (If you build server,) add user named `wnn'.
+
+ You don't need to add `wnn' if it exists. We don't login as `wnn',
+ so please lock password (or equivalent state). Please refer
+ to administration manual of your system to add user `wnn'.
+
+ *3: jserver (and [ckt]server) runs as user `wnn' to reduce affect
+ system and files. We install them as setuid `wnn',
+ so any local user can run jserver.
+
+6. To install commands, libraries, dictionaries and so on,
+ run make install as a superuser(*4).
$ su
# make install
- *3: Currently, install target does not work well for other user.
+ *4: Currently, install target does not work well for other user.
-6. To install manuals, you should do the following as a superuser
+7. To install manuals, you should do the following as a superuser
# make install.man
- *4: You can ommit this if you do not want manuals installed.
+ *5: You can ommit this if you do not want manuals installed.
[Configure options]
@@ -88,21 +98,56 @@ Below are the main configure option of F
--enable-Wnn compile and install Wnn (Japanese).
--enable-cWnn compile and install cWnn (Chinese).
--enable-kWnn compile and install kWnn (Korean).
+ --enable-traditional-layout
+ If disabled, install files in modern layout.
+ If leave enabled, install files in Wnn4 compatible
+ directories. (*6)
disabled by default:
--enable-ipv6 enable IPv6 feature.
- --enable-unsafe-path allow creating files in jserver_dir (*5).
- --enable-client compile and install uum (*6).
+ --enable-unsafe-path allow creating files in jserver_dir (*7).
+ --enable-client compile and install uum.
+
+ auto determine by default:
--with-libwrap use libwrap (in TCP wrapper) for jserver
- to enable connection-based access control (*7).
+ to enable connection-based access control (*8).
+ --enable-client-utmp (if --enable-client specified,) uum register
+ pseudo tty information to utmp. (Except some systems,
+ it is enabled by default.)
+ --enable-client-setuid[=user]
+ (if --enable-client specified,) install uum as set-uid
+ program with specified user (root by default).
+ If this option (itself) is not specified,
+ configure determine if set-uid install is needed.
+ --enable-client-setgid=group
+ (if --enable-client specified,) install uum as set-gid
+ program with specified group (you must specify group).
+ If this option (itself) is not specified,
+ configure determine if set-gid install is needed.
+ --enable-sub-bindir Control if we install commands to separate sub directory
+ by language (ex. Japanese commands to $(bindir)/Wnn4).
+ If this option is not specified, it relies on
+ --enable-traditional-layout option. (Enable if
+ --enable-traditional-layout specified, disable
+ otherwise.) (*6)
+
+*6: We intend to follow installation path like FHS (File Hierarchy
+ Standard). Currently difference between specifying parameter
+ --enable-traditional-layout or not is following:
+
+ Files If enabled If disabled
+ jserver, wnnstat, wnnkill $(bindir)/*Wnn4 $(sbindir)
+ Other commands $(bindir)/*Wnn4 $(bindir)
+
+ Note the name of sub directory "*Wnn4" depends on language (Wnn4,
+ cWnn4, kWnn4). You can control whether you use "*Wnn4" by specifing
+ --enable-sub-bindir option.
-*5: If the option --enable-unsafe-path is enabled, the [cjkt]server
+*7: If the option --enable-unsafe-path is enabled, the [cjkt]server
daemons accept creation of an FreeWnn dictionary file in an arbitrary
path, and they accept request from client of any hosts.
This feature may be a security hole.
Unless you used to place FreeWnn dictionary files in a path other than
jserver_dir (lib/wnn/$LANG/dic/usr), you should not enable this feature.
-*6: cuum cannot be compiled yet.
-
-*7: If you specify --enable-ipv6, libwrap need to support IPv6 also.
+*8: If you specify --enable-ipv6, libwrap need to support IPv6 also.

79
inputmethod/ja-freewnn-lib/patches/patch-Makefile.in
View File

@@ -1,79 +0,0 @@
$NetBSD: patch-Makefile.in,v 1.1 2011/09/13 07:23:16 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Makefile.in.orig 2003-05-11 18:22:54.000000000 +0000
+++ Makefile.in
@@ -10,9 +10,9 @@
# 1987, 1988, 1989, 1990, 1991, 1992
# Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
# Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
-# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2003
+# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2003, 2010
#
-# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+# Maintainer: FreeWnn Project
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -114,26 +114,6 @@ man_keywords::
# ----------------------------------------------------------------------
# rules for building in SUBDIRS - do not edit
-install::
- @for flag in ${MAKEFLAGS} ''; do \
- case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
- for i in $(SUBDIRS) ;\
- do \
- echo "installing" "in $(CURRENT_DIR)/$$i..."; \
- (cd $$i && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \
- DESTDIR=$(DESTDIR) install); \
- done
-
-install.man::
- @for flag in ${MAKEFLAGS} ''; do \
- case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
- for i in $(SUBDIRS) ;\
- do \
- echo "installing man pages" "in $(CURRENT_DIR)/$$i..."; \
- (cd $$i && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \
- DESTDIR=$(DESTDIR) install.man); \
- done
-
install.linkkit::
@for flag in ${MAKEFLAGS} ''; do \
case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
@@ -144,16 +124,6 @@ install.linkkit::
DESTDIR='$(DESTDIR)' install.linkkit); \
done
-clean::
- @for flag in ${MAKEFLAGS} ''; do \
- case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
- for i in $(SUBDIRS) ;\
- do \
- echo "cleaning" "in $(CURRENT_DIR)/$$i..."; \
- (cd $$i && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \
- clean); \
- done
-
tags::
@for flag in ${MAKEFLAGS} ''; do \
case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
@@ -164,16 +134,6 @@ tags::
TAGS='$(TAGS)' tags); \
done
-includes::
- @for flag in ${MAKEFLAGS} ''; do \
- case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
- for i in $(SUBDIRS) ;\
- do \
- echo including "in $(CURRENT_DIR)/$$i..."; \
- (cd $$i && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \
- includes); \
- done
-
# ----------------------------------------------------------------------
# dependencies generated by makedepend

24
inputmethod/ja-freewnn-lib/patches/patch-PubdicPlus_pod.c
View File

@@ -1,24 +0,0 @@
$NetBSD: patch-PubdicPlus_pod.c,v 1.1 2011/09/13 07:23:16 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- PubdicPlus/pod.c.orig 2005-11-29 17:00:02.000000000 +0000
+++ PubdicPlus/pod.c
@@ -130,7 +130,7 @@ struct dicpack
#if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(_WIN32)
/* Prototype for C89 (or later) */
-#ifndef POD_WCHAR
+#ifdef POD_WCHAR
size_t Mbstowcs (Wchar *d, char *ss, int n);
size_t Wcstombs (char *d, Wchar *s, int n);
int Wscmp (register Wchar *s1, register Wchar *s2);
@@ -139,7 +139,7 @@ int Wslen (Wchar *s);
int Watoi (Wchar *s);
static void Fputws (Wchar *s, FILE *f);
Wchar *Fgetws (Wchar *buf, int siz, FILE *f);
-#endif /* !POD_WCHAR */
+#endif /* POD_WCHAR */
static int all_kana (Wchar *s);
static Wchar *findslash (Wchar *s);

43
inputmethod/ja-freewnn-lib/patches/patch-Wnn_Makefile.in
View File

@@ -1,43 +0,0 @@
$NetBSD: patch-Wnn_Makefile.in,v 1.1 2011/09/13 07:23:16 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/Makefile.in.orig 2001-09-16 11:42:58.000000000 +0000
+++ Wnn/Makefile.in
@@ -10,9 +10,9 @@
# 1987, 1988, 1989, 1990, 1991, 1992
# Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
# Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
-# Copyright FreeWnn Project 1999, 2000, 2001
+# Copyright FreeWnn Project 1999, 2000, 2001, 2006
#
-# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+# Maintainer: FreeWnn Project
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,8 +29,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-include @top_srcdir@/makerule.mk
-top_builddir = ..
+include @top_builddir@/makerule.mk
+top_builddir = @top_builddir@
WNNOWNER= wnn
@@ -56,11 +56,11 @@ JLIBV3DIR = jlib.V3
UUMDIR = uum
-LIB_SUBDIRS = $(JDDIR) $(JLIBDIR) $(WNNCLIENTSDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR)
+LIB_SUBDIRS = $(JDDIR) $(JLIBDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR)
SERVER_SUBDIRS = $(JSERVERDIR) $(WNNJUTILDIR) $(PUBDICPLUSDIR) $(WNNCONSDIR) $(WNNMANDIR)
-CLIENT_SUBDIRS = $(UUMDIR)
+CLIENT_SUBDIRS = $(WNNCLIENTSDIR) $(UUMDIR)
SUBDIRS = @SUBDIRS@

32
inputmethod/ja-freewnn-lib/patches/patch-Wnn_conv_cvt__head.h
View File

@@ -1,32 +0,0 @@
$NetBSD: patch-Wnn_conv_cvt__head.h,v 1.1 2011/09/13 07:23:16 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/conv/cvt_head.h.orig 2002-03-21 03:32:45.000000000 +0000
+++ Wnn/conv/cvt_head.h
@@ -10,9 +10,9 @@
* 1987, 1988, 1989, 1990, 1991, 1992
* Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
* Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
- * Copyright FreeWnn Project 1999, 2000, 2002
+ * Copyright FreeWnn Project 1999, 2000, 2002, 2006
*
- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+ * Maintainer: FreeWnn Project
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -40,11 +40,11 @@
#include "commonhd.h"
-#if defined(luna) || defined(DGUX)
+#if defined(luna) || defined(DGUX) || defined(hpux) || defined(sun)
#ifndef SUPPORT_TWODIGIT_FUNCTIONS
#define SUPPORT_TWODIGIT_FUNCTIONS
#endif /* SUPPORT_TWODIGIT_FUNCTIONS */
-#endif /* defined(luna) || defined(DGUX) */
+#endif /* defined(luna) || defined(DGUX) || defined(hpux) || defined(sun) */
#define BITSIZ (sizeof(int) * 8)
#define CHANGE_MAX 4 /* 変換テーブルの最大個数÷BITSIZを下回らない整数 */

158
inputmethod/ja-freewnn-lib/patches/patch-Wnn_conv_cvt__read.c
View File

@@ -1,158 +0,0 @@
$NetBSD: patch-Wnn_conv_cvt__read.c,v 1.1 2011/09/13 07:23:16 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/conv/cvt_read.c.orig 2002-04-03 04:16:19.000000000 +0000
+++ Wnn/conv/cvt_read.c
@@ -10,9 +10,10 @@
* 1987, 1988, 1989, 1990, 1991, 1992
* Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
* Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
- * Copyright FreeWnn Project 1999, 2000, 2002
+ * Copyright FreeWnn Project 1999, 2000, 2002, 2003, 2006
+ * Copyright Taketo Kabe 2003
*
- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+ * Maintainer: FreeWnn Project
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -52,16 +53,91 @@
#if HAVE_FCNTL_H
# include <fcntl.h>
#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
-#include "cvt_head.h"
+/* Solaris 2.x needs termio.h , so include both. */
+#if HAVE_TERMIOS_H
+# include <termios.h>
+#endif
+#if HAVE_TERMIO_H
+# include <termio.h>
+#endif
+
+#if defined(HAVE_TERMIOS_H)
+/* # include <termios.h> */
+# define USE_TERMIOS 1
+#elif defined(HAVE_TERMIO_H)
+/* # include <termio.h> */
+# define USE_TERMIO 1
+#elif defined(HAVE_SYS_TERMIO_H)
+# include <sys/termio.h>
+# define USE_TERMIO 1
+#elif defined(HAVE_SGTTY_H)
+# include <sgtty.h>
+# define USE_SGTTY
+#else
+# error "No termio header."
+#endif /* HAVE_TERMIOS_H */
-#ifdef SYSVR2
-#ifdef TERMINFO
-#include <curses.h>
-#endif /* TERMINFO */
-#include <term.h>
+#ifdef HAVE_TERMINFO
+# define TERMINFO 1
+#else
+# define TERMCAP 1
+#endif /* HAVE_TERMINFO */
+
+/* ncurses' term.h defines them to either 0 or 1! */
+#ifndef HAVE_TERMIOS_H
+# define DONT_HAVE_TERMIOS_H
+#endif
+#ifndef HAVE_TERMIO_H
+# define DONT_HAVE_TERMIO_H
+#endif
+#ifndef HAVE_SYS_TERMIO_H
+# define DONT_HAVE_SYS_TERMIO_H
+#endif
+#ifndef HAVE_SGTTY_H
+# define DONT_HAVE_SGTTY_H
+#endif
+
+#if defined(HAVE_TERMINFO)
+# if defined(HAVE_CURSES_H)
+# include <curses.h>
+# elif defined(HAVE_NCURSES_H)
+# include <ncurses.h>
+# else
+# error "no terminfo header"
+# endif /* HAVE_CURSES_H */
+# ifdef HAVE_TERM_H
+# include <term.h>
+# endif
+#else /* HAVE_TERMINFO */
+# if defined(HAVE_TERMCAP_H)
+# include <termcap.h>
+# endif /* HAVE_TERMCAP_H */
+#endif /* HAVE_TERMINFO */
+
+#ifdef DONT_HAVE_TERMIOS_H
+# undef HAVE_TERMIOS_H
+# undef DONT_HAVE_TERMIOS_H
+#endif
+#ifdef DONT_HAVE_TERMIO_H
+# undef HAVE_TERMIO_H
+# undef DONT_HAVE_TERMIO_H
+#endif
+#ifdef DONT_HAVE_SYS_TERMIO_H
+# undef HAVE_SYS_TERMIO_H
+# undef DONT_HAVE_SYS_TERMIO_H
+#endif
+#ifdef DONT_HAVE_SGTTY_H
+# undef HAVE_SGTTY_H
+# undef DONT_HAVE_SGTTY_H
#endif
+#include "wnn_os.h"
+#include "cvt_head.h"
+
#define ENTRY_LEN 10 /* コンバート表のエントリ名の最大長 */
/*
@@ -455,6 +531,40 @@ convert_getstrs (flg)
keydef_key[i++] = stradd (&tdataptr, key_f29);
keydef_key[i++] = stradd (&tdataptr, key_f30);
keydef_key[i++] = stradd (&tdataptr, key_f31);
+# ifndef uniosu
+ keydef_key[i++] = stradd (&tdataptr, key_f32);
+ keydef_key[i++] = stradd (&tdataptr, key_f33);
+ keydef_key[i++] = stradd (&tdataptr, key_f34);
+ keydef_key[i++] = stradd (&tdataptr, key_f35);
+ keydef_key[i++] = stradd (&tdataptr, key_f36);
+ keydef_key[i++] = stradd (&tdataptr, key_f37);
+ keydef_key[i++] = stradd (&tdataptr, key_f38);
+ keydef_key[i++] = stradd (&tdataptr, key_f39);
+ keydef_key[i++] = stradd (&tdataptr, key_f40);
+ keydef_key[i++] = stradd (&tdataptr, key_f41);
+ keydef_key[i++] = stradd (&tdataptr, key_f42);
+ keydef_key[i++] = stradd (&tdataptr, key_f43);
+ keydef_key[i++] = stradd (&tdataptr, key_f44);
+ keydef_key[i++] = stradd (&tdataptr, key_f45);
+ keydef_key[i++] = stradd (&tdataptr, key_f46);
+ keydef_key[i++] = stradd (&tdataptr, key_f47);
+ keydef_key[i++] = stradd (&tdataptr, key_f48);
+ keydef_key[i++] = stradd (&tdataptr, key_f49);
+ keydef_key[i++] = stradd (&tdataptr, key_f50);
+ keydef_key[i++] = stradd (&tdataptr, key_f51);
+ keydef_key[i++] = stradd (&tdataptr, key_f52);
+ keydef_key[i++] = stradd (&tdataptr, key_f53);
+ keydef_key[i++] = stradd (&tdataptr, key_f54);
+ keydef_key[i++] = stradd (&tdataptr, key_f55);
+ keydef_key[i++] = stradd (&tdataptr, key_f56);
+ keydef_key[i++] = stradd (&tdataptr, key_f57);
+ keydef_key[i++] = stradd (&tdataptr, key_f58);
+ keydef_key[i++] = stradd (&tdataptr, key_f59);
+ keydef_key[i++] = stradd (&tdataptr, key_f60);
+ keydef_key[i++] = stradd (&tdataptr, key_f61);
+ keydef_key[i++] = stradd (&tdataptr, key_f62);
+ keydef_key[i++] = stradd (&tdataptr, key_f63);
+# endif /* !uniosu */
#endif /* SUPPORT_TWODIGIT_FUNCTIONS */
/* 以下順に
"kcuu1", "kcuf1", "kcub1", "kcud1", "khome",

99
inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_commonhd.h
View File

@@ -1,99 +0,0 @@
$NetBSD: patch-Wnn_include_commonhd.h,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/include/commonhd.h.orig 2005-04-10 15:26:37.000000000 +0000
+++ Wnn/include/commonhd.h
@@ -10,9 +10,9 @@
* 1987, 1988, 1989, 1990, 1991, 1992
* Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
* Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
- * Copyright FreeWnn Project 1999, 2000, 2001, 2002
+ * Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2005, 2006
*
- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+ * Maintainer: FreeWnn Project
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -39,7 +39,7 @@
#include <stdio.h>
#define JSERVER_VERSION 0x4200 /* minor version */
-#define _SERVER_VERSION "FreeWnn 1.1.0 pl21"
+#define _SERVER_VERSION "FreeWnn 1.1.0 pl22"
#include "wnnerror.h"
@@ -75,9 +75,6 @@ typedef unsigned char UCHAR;
# ifndef SYSVR2
# define SYSVR2
# endif
-# ifndef TERMINFO
-# define TERMINFO
-# endif
#else /* if defined(MACH) || defined(uniosb) */
# ifndef BSD42
# define BSD42
@@ -90,34 +87,22 @@ typedef unsigned char UCHAR;
# define BSD44
# endif
# endif /* defined(luna68k) */
-# ifndef TERMCAP
-# define TERMCAP
-# endif
#endif
#else /* defined(luna) */
#if defined(sun) && !defined(SVR4)
# ifndef BSD42
# define BSD42
# endif
-# ifndef TERMCAP
-# define TERMCAP
-# endif
#else /* sun else */
#if defined(DGUX) || defined(linux)
# ifndef SYSVR2
# define SYSVR2
# endif
-# ifndef TERMCAP
-# define TERMCAP
-# endif
#else
-#if defined(SVR4) || defined(hpux)
+#if defined(SVR4) || defined(hpux) || defined(SYSV) || defined(USG)
# ifndef SYSVR2
# define SYSVR2
# endif
-# ifndef TERMINFO
-# define TERMINFO
-# endif
# ifdef sun
# define SOLARIS
# endif
@@ -128,22 +113,19 @@ typedef unsigned char UCHAR;
# ifndef BSD42
# define BSD42
# endif
-# ifndef TERMCAP
-# define TERMCAP
-# endif
-#endif /* defined(SVR4) || defined(hpux) */
+#endif /* defined(SVR4) || defined(hpux) || defined(SYSV) || defined(USG) */
#endif /* DGUX */
#endif /* sun */
#endif /* luna */
-#if defined(SVR4) || defined(hpux)
+#if defined(SVR4) || defined(hpux) || defined(SYSV) || defined(USG)
#ifndef F_OK
#define F_OK 0
#endif
#ifndef R_OK
#define R_OK 4
#endif
-#endif
+#endif /* defined(SVR4) || defined(hpux) || defined(SYSV) || defined(USG) */
#define MAXBUNSETSU 80
#define LIMITBUNSETSU 400

144
inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_jllib.h
View File

@@ -1,144 +0,0 @@
$NetBSD: patch-Wnn_include_jllib.h,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/include/jllib.h.orig 2005-04-10 15:26:37.000000000 +0000
+++ Wnn/include/jllib.h
@@ -10,9 +10,9 @@
* 1987, 1988, 1989, 1990, 1991, 1992
* Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
* Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
- * Copyright FreeWnn Project 1999, 2000
+ * Copyright FreeWnn Project 1999, 2000, 2008
*
- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+ * Maintainer: FreeWnn Project
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -39,6 +39,9 @@
#include "jslib.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
/*
ユーザープログラムは、直接この構造体の内容をアクセスする必要は無いはず。
@@ -248,59 +251,65 @@ struct wnn_buf
#define jl_set_lang(buf, lang) js_set_lang((buf)->env, lang)
/* extern function defines */
-extern struct wnn_buf *jl_open_lang ();
-extern struct wnn_env *jl_connect_lang ();
-extern struct wnn_env *jl_env_get ();
-extern struct wnn_jdata *jl_word_info_e ();
-extern w_char *jl_hinsi_name_e ();
-
-extern void jl_close ();
-extern int jl_dic_add_e ();
-extern int jl_dic_comment_set_e ();
-extern int jl_dic_delete_e ();
-extern int jl_dic_list_e ();
-extern int jl_dic_save_all_e ();
-extern int jl_dic_save_e ();
-extern int jl_dic_use_e ();
-extern void jl_disconnect ();
-extern void jl_disconnect_if_server_dead ();
-extern void jl_env_set ();
-extern int jl_fuzokugo_get_e ();
-extern int jl_fuzokugo_set_e ();
-extern void jl_get_zenkouho_kanji ();
-extern int jl_hinsi_dicts_e ();
-extern int jl_hinsi_list_e ();
-extern int jl_hinsi_number_e ();
-extern int jl_isconnect_e ();
-extern int jl_kanji_len ();
-extern int jl_kill ();
-extern int jl_nobi_conv ();
-extern int jl_nobi_conv_e2 ();
-extern int jl_param_get_e ();
-extern int jl_param_set_e ();
-extern int jl_ren_conv ();
-extern int jl_set_env_wnnrc ();
-extern int jl_set_env_wnnrc1 ();
-extern int jl_set_jikouho ();
-extern int jl_set_jikouho_dai ();
-extern int jl_tan_conv ();
-extern int jl_update_hindo ();
-extern int jl_word_add_e ();
-extern int jl_word_comment_set_e ();
-extern int jl_word_delete_e ();
-extern int jl_word_search_by_env_e ();
-extern int jl_word_search_e ();
-extern int jl_word_use_e ();
-extern int jl_yomi_len ();
-extern int jl_zenkouho ();
-extern int jl_zenkouho_dai ();
-extern int wnn_get_area ();
+/* Note: FRWNN_PARAMS is defined in jslib.h . */
+
+extern struct wnn_buf *jl_open_lang FRWNN_PARAMS((char *env_n, char *server_n, char *lang, char *wnnrc_n, int (*error_handler) (), int (*message_handler) (), int timeout));
+extern struct wnn_env *jl_connect_lang FRWNN_PARAMS((register char *env_n, register char *server_n, register char *lang, register char *wnnrc_n, int (*error_handler) (), int (*message_handler) (), int timeout));
+extern struct wnn_env *jl_env_get FRWNN_PARAMS((register struct wnn_buf *buf));
+extern struct wnn_jdata *jl_word_info_e FRWNN_PARAMS((register struct wnn_env *env, int dic_no, int entry));
+extern w_char *jl_hinsi_name_e FRWNN_PARAMS((register struct wnn_env *env, register int no));
+
+extern void jl_close FRWNN_PARAMS((register struct wnn_buf *buf));
+extern int jl_dic_add_e FRWNN_PARAMS((register struct wnn_env *env, char *dic_name, char *hindo_name, int rev, int prio, int rw, int hrw, char *pwd_dic, char *pwd_hindo, int (*error_handler) (), int (*message_handler) () ));
+extern int jl_dic_comment_set_e FRWNN_PARAMS((register struct wnn_env *env, int dic_no, w_char *comment));
+extern int jl_dic_delete_e FRWNN_PARAMS((register struct wnn_env *env, register int dic_no));
+extern int jl_dic_list_e FRWNN_PARAMS((struct wnn_env *env, WNN_DIC_INFO **dicinfo));
+extern int jl_dic_save_all_e FRWNN_PARAMS((struct wnn_env *env));
+extern int jl_dic_save_e FRWNN_PARAMS((register struct wnn_env *env, int dic_no));
+extern int jl_dic_use_e FRWNN_PARAMS((struct wnn_env *env, int dic_no, int flag));
+extern void jl_disconnect FRWNN_PARAMS((register struct wnn_env *env));
+extern void jl_disconnect_if_server_dead FRWNN_PARAMS((register struct wnn_env *env));
+extern void jl_env_set FRWNN_PARAMS((register struct wnn_buf *buf, register struct wnn_env *env));
+extern int jl_fuzokugo_get_e FRWNN_PARAMS((register struct wnn_env *env, char *fname));
+extern int jl_fuzokugo_set_e FRWNN_PARAMS((struct wnn_env *env, char *fname));
+extern void jl_get_zenkouho_kanji FRWNN_PARAMS((register struct wnn_buf *buf, int zen_num, w_char *area));
+extern int jl_hinsi_dicts_e FRWNN_PARAMS((register struct wnn_env *env, int no, int **area));
+extern int jl_hinsi_list_e FRWNN_PARAMS((register struct wnn_env *env, int dic_no, w_char *name, w_char ***area));
+extern int jl_hinsi_number_e FRWNN_PARAMS((register struct wnn_env *env, w_char *name));
+extern int jl_isconnect_e FRWNN_PARAMS((register struct wnn_env *env));
+extern int jl_kanji_len FRWNN_PARAMS((struct wnn_buf *buf, register int bun_no, register int bun_no2));
+extern int jl_kill FRWNN_PARAMS((struct wnn_buf *buf, register int bun_no, register int bun_no2));
+extern int jl_nobi_conv FRWNN_PARAMS((register struct wnn_buf *buf, register int bun_no, int ichbn_len, register int bun_no2, int use_maep, int ich_shop));
+extern int jl_nobi_conv_e2 FRWNN_PARAMS((register struct wnn_buf *buf, struct wnn_env *env, register int bun_no, int ichbn_len, register int bun_no2, int use_maep, int ich_shop));
+extern int jl_param_get_e FRWNN_PARAMS((struct wnn_env *env, struct wnn_param *para));
+extern int jl_param_set_e FRWNN_PARAMS((register struct wnn_env *env, struct wnn_param *para));
+extern int jl_ren_conv FRWNN_PARAMS((register struct wnn_buf *buf, register w_char *yomi, int bun_no, int bun_no2, int use_maep));
+extern int jl_set_env_wnnrc FRWNN_PARAMS((register struct wnn_env *env, char *wnnrc_n, int (*error_handler) (), int (*message_handler) () ));
+extern int jl_set_env_wnnrc1 FRWNN_PARAMS((register struct wnn_env *env, char *wnnrc_n, int (*error_handler) (), int (*message_handler) (), int level));
+extern int jl_set_jikouho FRWNN_PARAMS((register struct wnn_buf *buf, register int offset));
+extern int jl_set_jikouho_dai FRWNN_PARAMS((register struct wnn_buf *buf, int offset));
+extern int jl_tan_conv FRWNN_PARAMS((register struct wnn_buf *buf, w_char *yomi, register int bun_no, register int bun_no2, int use_maep, int ich_shop));
+extern int jl_update_hindo FRWNN_PARAMS((register struct wnn_buf *buf, int bun_no, int bun_no2));
+extern int jl_word_add_e FRWNN_PARAMS((struct wnn_env *env, int dic_no, w_char *yomi, w_char *kanji, w_char *comment, int hinsi, int init_hindo));
+extern int jl_word_comment_set_e FRWNN_PARAMS((register struct wnn_env *env, int dic_no, int entry, w_char *comment));
+extern int jl_word_delete_e FRWNN_PARAMS((struct wnn_env *env, int dic_no, int entry));
+extern int jl_word_search_by_env_e FRWNN_PARAMS((register struct wnn_env *env, w_char *yomi, struct wnn_jdata **jdp));
+extern int jl_word_search_e FRWNN_PARAMS((register struct wnn_env *env, int dic_no, w_char *yomi, struct wnn_jdata **jdp));
+extern int jl_word_use_e FRWNN_PARAMS((register struct wnn_env *env, int dic_no, int entry));
+extern int jl_yomi_len FRWNN_PARAMS((struct wnn_buf *buf, register int bun_no, register int bun_no2));
+extern int jl_zenkouho FRWNN_PARAMS((register struct wnn_buf *buf, int bun_no, int use_maep, int uniq_level));
+extern int jl_zenkouho_dai FRWNN_PARAMS((register struct wnn_buf *buf, int bun_no, int bun_no2, int use_maep, int uniq_level));
+extern int wnn_get_area FRWNN_PARAMS((struct wnn_buf *buf, register int bun_no, register int bun_no2, w_char *area, int kanjip));
-extern char *wnn_perror ();
-extern char *wnn_perror_lang ();
+extern char *wnn_perror FRWNN_PARAMS((void));
+extern char *wnn_perror_lang FRWNN_PARAMS((char *lang));
#ifdef CONVERT_by_STROKE
-extern void jl_get_zenkouho_yomi ();
+extern void jl_get_zenkouho_yomi FRWNN_PARAMS((register struct wnn_buf *buf, int zen_num, w_char *area));
+#endif
+
+#ifdef __cplusplus
+}
#endif
#endif /* WNN_JLLIB_H */

180
inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_jslib.h
View File

@@ -1,180 +0,0 @@
$NetBSD: patch-Wnn_include_jslib.h,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/include/jslib.h.orig 2005-04-10 15:26:37.000000000 +0000
+++ Wnn/include/jslib.h
@@ -10,9 +10,9 @@
* 1987, 1988, 1989, 1990, 1991, 1992
* Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
* Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
- * Copyright FreeWnn Project 1999, 2000
+ * Copyright FreeWnn Project 1999, 2000, 2008
*
- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+ * Maintainer: FreeWnn Project
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -42,6 +42,10 @@
#include <setjmp.h>
#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define JLIB_VERSION 0x4003
#ifndef w_char
@@ -399,70 +403,87 @@ struct wnn_file_head
#define js_open(server, timeout) js_open_lang(server, "ja_JP", timeout)
#define js_connect(server,env_name) js_connect_lang(server, env_name, "ja_JP")
-extern WNN_JSERVER_ID *js_open_lang ();
-extern int js_close ();
-extern WNN_JSERVER_ID *js_change_current_jserver ();
-extern struct wnn_env *js_connect_lang ();
-extern int js_disconnect ();
-extern int js_env_list ();
-extern int js_param_set ();
-extern int js_param_get ();
-extern char *js_get_lang ();
+#ifndef FRWNN_PARAMS
+/*
+ * I currently think ANSI-C is not sufficiant on building your clients
+ * linked with libwnn. (aonoto)
+ */
+#if __STDC__ /* Sufficient? */
+#define FRWNN_PARAMS(paramlist) paramlist
+#else
+#define FRWNN_PARAMS(paramlist) ()
+#endif
+#endif
+
+extern WNN_JSERVER_ID *js_open_lang FRWNN_PARAMS((register char *server, register char *lang, register int timeout));
+extern int js_close FRWNN_PARAMS((WNN_JSERVER_ID *server));
+/* extern WNN_JSERVER_ID *js_change_current_jserver (); */ /* Not exist? */
+extern struct wnn_env *js_connect_lang FRWNN_PARAMS((WNN_JSERVER_ID *server, register char *env_name, char *lang));
+extern int js_disconnect FRWNN_PARAMS((register struct wnn_env *env));
+extern int js_env_list FRWNN_PARAMS((WNN_JSERVER_ID *server, struct wnn_ret_buf *ret));
+extern int js_param_set FRWNN_PARAMS((struct wnn_env *env, register struct wnn_param *para));
+extern int js_param_get FRWNN_PARAMS((struct wnn_env *env, register struct wnn_param *para));
+extern char *js_get_lang FRWNN_PARAMS((struct wnn_env *env));
/**************************************/
-extern int js_access ();
-extern int js_dic_add ();
-extern int js_dic_delete ();
-extern int js_dic_file_create ();
-extern int js_dic_file_create_client ();
-extern int js_dic_info ();
-extern int js_dic_list ();
-extern int js_dic_list_all ();
-extern int js_dic_use ();
-extern int js_env_exist ();
-extern int js_env_sticky ();
-extern int js_env_un_sticky ();
-extern int js_file_comment_set ();
-extern int js_file_discard ();
-extern int js_file_info ();
-extern int js_file_list ();
-extern int js_file_list_all ();
-extern int js_file_loaded ();
-extern int js_file_loaded_local ();
-extern int js_file_password_set ();
-extern int js_file_read ();
-extern int js_file_receive ();
-extern int js_file_remove ();
-extern int js_file_remove_client ();
-extern int js_file_send ();
-extern int js_file_stat ();
-extern int js_file_write ();
-extern void js_flush ();
-extern int js_fuzokugo_get ();
-extern int js_fuzokugo_set ();
-extern int js_hindo_file_create ();
-extern int js_hindo_file_create_client ();
-extern int js_hindo_set ();
-extern int js_hinsi_dicts ();
-extern int js_hinsi_list ();
-extern int js_hinsi_name ();
-extern int js_hinsi_number ();
-extern int js_hinsi_table_set ();
-extern int js_isconnect ();
-extern int js_kanren ();
-extern int js_kantan_dai ();
-extern int js_kantan_sho ();
-extern int js_kanzen_dai ();
-extern int js_kanzen_sho ();
-extern int js_kill ();
-extern int js_mkdir ();
-extern int js_version ();
-extern int js_who ();
-extern int js_word_add ();
-extern int js_word_comment_set ();
-extern int js_word_delete ();
-extern int js_word_info ();
-extern int js_word_search ();
-extern int js_word_search_by_env ();
+extern int js_access FRWNN_PARAMS((struct wnn_env *env, char *path, int amode));
+extern int js_dic_add FRWNN_PARAMS((struct wnn_env *env, int fid, int hfid, int rev,int jnice, int rw, int hrw, char *pw1, char *pw2));
+extern int js_dic_delete FRWNN_PARAMS((struct wnn_env *env, int dicno));
+extern int js_dic_file_create FRWNN_PARAMS((struct wnn_env *env, char *fn, int type, w_char *comment, char *passwd, char *hpasswd));
+extern int js_dic_file_create_client FRWNN_PARAMS((struct wnn_env *env, char *fn, int type, w_char *comment, char *passwd, char *hpasswd));
+extern int js_dic_info FRWNN_PARAMS((struct wnn_env *env, int dic_no, register WNN_DIC_INFO *ret));
+extern int js_dic_list FRWNN_PARAMS((struct wnn_env *env, struct wnn_ret_buf *ret));
+extern int js_dic_list_all FRWNN_PARAMS((WNN_JSERVER_ID *server, struct wnn_ret_buf *ret));
+extern int js_dic_use FRWNN_PARAMS((struct wnn_env *env, int dic_no, int flag));
+extern int js_env_exist FRWNN_PARAMS((register WNN_JSERVER_ID *server, register char *env_name));
+extern int js_env_sticky FRWNN_PARAMS((register struct wnn_env *env));
+extern int js_env_un_sticky FRWNN_PARAMS((register struct wnn_env *env));
+extern int js_file_comment_set FRWNN_PARAMS((struct wnn_env *env, int fid, w_char *comment));
+extern int js_file_discard FRWNN_PARAMS((struct wnn_env *env, int fid));
+extern int js_file_info FRWNN_PARAMS((struct wnn_env *env, int fid, register WNN_FILE_INFO_STRUCT *file));
+extern int js_file_list FRWNN_PARAMS((struct wnn_env *env, struct wnn_ret_buf *ret));
+extern int js_file_list_all FRWNN_PARAMS((WNN_JSERVER_ID *server, struct wnn_ret_buf *ret));
+extern int js_file_loaded FRWNN_PARAMS((WNN_JSERVER_ID *server, char *path));
+extern int js_file_loaded_local FRWNN_PARAMS((WNN_JSERVER_ID *server, char *path));
+extern int js_file_password_set FRWNN_PARAMS((struct wnn_env *env, int fid, int which, char *old_passwd, char *new_passwd));
+extern int js_file_read FRWNN_PARAMS((struct wnn_env *env, char *fn));
+extern int js_file_receive FRWNN_PARAMS((struct wnn_env *env, int fid, char *fn));
+extern int js_file_remove FRWNN_PARAMS((WNN_JSERVER_ID *server, char *n, char *pwd));
+extern int js_file_remove_client FRWNN_PARAMS((WNN_JSERVER_ID *server, char *n, char *pwd));
+extern int js_file_send FRWNN_PARAMS((struct wnn_env *env, char *fn));
+extern int js_file_stat FRWNN_PARAMS((struct wnn_env *env, char *path, WNN_FILE_STAT *s));
+extern int js_file_write FRWNN_PARAMS((struct wnn_env *env, int fid, char *fn));
+extern void js_flush FRWNN_PARAMS((struct wnn_env *env));
+extern int js_fuzokugo_get FRWNN_PARAMS((struct wnn_env *env));
+extern int js_fuzokugo_set FRWNN_PARAMS((struct wnn_env *env, int fid));
+extern int js_hindo_file_create FRWNN_PARAMS((struct wnn_env *env, int fid, char *fn, w_char *comment, char *hpasswd));
+extern int js_hindo_file_create_client FRWNN_PARAMS((struct wnn_env *env, int fid, char *fn, w_char *com, char *hpasswd));
+extern int js_hindo_set FRWNN_PARAMS((struct wnn_env *env, int dic, int entry, int ima, int hindo));
+extern int js_hinsi_dicts FRWNN_PARAMS((struct wnn_env *env, int no, struct wnn_ret_buf *rb));
+extern int js_hinsi_list FRWNN_PARAMS((struct wnn_env *env, int dic_no, w_char *name, struct wnn_ret_buf *rb));
+extern int js_hinsi_name FRWNN_PARAMS((WNN_JSERVER_ID *server, int no, struct wnn_ret_buf *rb));
+extern int js_hinsi_number FRWNN_PARAMS((WNN_JSERVER_ID *server, w_char *name));
+extern int js_hinsi_table_set FRWNN_PARAMS((struct wnn_env *env, int dic_no, w_char *hinsi_table));
+extern int js_isconnect FRWNN_PARAMS((register struct wnn_env *env));
+extern int js_kanren FRWNN_PARAMS((struct wnn_env *env, w_char *yomi, int hinsi, w_char *fzk, int vec, int vec1, int vec2, struct wnn_ret_buf *rb));
+extern int js_kantan_dai FRWNN_PARAMS((struct wnn_env *env, w_char *yomi, int hinsi, w_char *fzk, int vec, int vec1, struct wnn_ret_buf *rb));
+extern int js_kantan_sho FRWNN_PARAMS((struct wnn_env *env, w_char *yomi, int hinsi, w_char *fzk, int vec, int vec1, struct wnn_ret_buf *rb));
+extern int js_kanzen_dai FRWNN_PARAMS((struct wnn_env *env, w_char *yomi, int hinsi, w_char *fzk, int vec, int vec1, struct wnn_ret_buf *rb));
+extern int js_kanzen_sho FRWNN_PARAMS((struct wnn_env *env, w_char *yomi, int hinsi, w_char *fzk, int vec, int vec1, struct wnn_ret_buf *rb));
+extern int js_kill FRWNN_PARAMS((WNN_JSERVER_ID *server));
+extern int js_mkdir FRWNN_PARAMS((struct wnn_env *env, char *path));
+extern int js_version FRWNN_PARAMS((WNN_JSERVER_ID *server, int *serv, int *libv));
+extern int js_who FRWNN_PARAMS((WNN_JSERVER_ID *server, struct wnn_ret_buf *ret));
+extern int js_word_add FRWNN_PARAMS((struct wnn_env *env, int dic_no, w_char *yomi, w_char *kanji, w_char *comment, int hinshi, int init_hindo));
+extern int js_word_comment_set FRWNN_PARAMS((struct wnn_env *env, int dic_no, int entry, w_char *comment));
+extern int js_word_delete FRWNN_PARAMS((struct wnn_env *env, int dic_no, int entry));
+extern int js_word_info FRWNN_PARAMS((struct wnn_env *env, int dic_no, int entry, struct wnn_ret_buf *ret));
+extern int js_word_search FRWNN_PARAMS((struct wnn_env *env, int dic_no, w_char *yomi, struct wnn_ret_buf *ret));
+extern int js_word_search_by_env FRWNN_PARAMS((struct wnn_env *env, w_char *yomi, struct wnn_ret_buf *ret));
+#endif /* !JSERVER */
+
+#ifdef __cplusplus
+}
#endif
+
#endif /* WNN_JSLIB_H */

30
inputmethod/ja-freewnn-lib/patches/patch-Wnn_include_wnn__os.h
View File

@@ -1,30 +0,0 @@
$NetBSD: patch-Wnn_include_wnn__os.h,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/include/wnn_os.h.orig 2005-06-12 17:14:23.000000000 +0000
+++ Wnn/include/wnn_os.h
@@ -10,9 +10,9 @@
* 1987, 1988, 1989, 1990, 1991, 1992
* Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
* Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
- * Copyright FreeWnn Project 1999, 2000, 2002, 2005
+ * Copyright FreeWnn Project 1999, 2000, 2002, 2005, 2006
*
- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+ * Maintainer: FreeWnn Project
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -50,11 +50,6 @@
# include <sys/param.h>
#endif
-#ifdef TERMINFO
-#include <curses.h>
-#include <term.h>
-#endif
-
/* strchr vs. index, etc. */
#if (HAVE_MEMSET) && !(HAVE_BZERO)
# define bzero(adr,n) memset((adr),0,(n))

105
inputmethod/ja-freewnn-lib/patches/patch-Wnn_jlib.V3_Makefile.in
View File

@@ -1,105 +0,0 @@
$NetBSD: patch-Wnn_jlib.V3_Makefile.in,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/jlib.V3/Makefile.in.orig 2003-05-11 18:31:44.000000000 +0000
+++ Wnn/jlib.V3/Makefile.in
@@ -10,9 +10,9 @@
# 1987, 1988, 1989, 1990, 1991, 1992
# Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
# Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
-# Copyright FreeWnn Project 1999, 2000, 2001, 2003
+# Copyright FreeWnn Project 1999, 2000, 2001, 2003, 2009
#
-# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+# Maintainer: FreeWnn Project
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,12 +29,17 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-include @top_srcdir@/makerule.mk
-top_builddir = ../..
+include @top_builddir@/makerule.mk
+ top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ WNNJLIBOBJ = $(top_builddir)/Wnn/jlib
+WNNROMKANOBJ = $(top_builddir)/Wnn/romkan
INSTALL = @INSTALL@ $(INSTALLFLAGS)
- INCLUDES = -I$(WNNINCLUDESRC) -I$(TOP)
+ INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir)
DEFINES = $(WNNDEFINES) $(WNNLANGDEF)
LINTLIBS =
@@ -48,15 +53,15 @@ SRC4= $(WNNETCSRC)/xutoj.c
OBJ4= xutoj.o
LOCAL_RKSRCS= $(WNNROMKANSRC)/rk_bltinfn.c $(WNNROMKANSRC)/rk_main.c $(WNNROMKANSRC)/rk_modread.c $(WNNROMKANSRC)/rk_read.c $(WNNROMKANSRC)/rk_vars.c
-LOCAL_RKOBJS= $(WNNROMKANSRC)/rk_bltinfn.o $(WNNROMKANSRC)/rk_main.o $(WNNROMKANSRC)/rk_modread.o $(WNNROMKANSRC)/rk_read.o $(WNNROMKANSRC)/rk_vars.o
+LOCAL_RKOBJS= $(WNNROMKANOBJ)/rk_bltinfn.o $(WNNROMKANOBJ)/rk_main.o $(WNNROMKANOBJ)/rk_modread.o $(WNNROMKANOBJ)/rk_read.o $(WNNROMKANOBJ)/rk_vars.o
LOCAL_ETCSRCS= $(WNNETCSRC)/msg.c $(WNNETCSRC)/yincoding.c $(WNNETCSRC)/py_table.c $(WNNETCSRC)/zy_table.c $(WNNETCSRC)/strings.c $(WNNETCSRC)/bcopy.c $(WNNETCSRC)/mkdir.c
-LOCAL_ETCOBJS= $(WNNJLIBSRC)/msg.o $(WNNJLIBSRC)/yincoding.o $(WNNJLIBSRC)/py_table.o $(WNNJLIBSRC)/zy_table.o $(WNNJLIBSRC)/strings.o $(WNNJLIBSRC)/bcopy.o $(WNNJLIBSRC)/mkdir.o
+LOCAL_ETCOBJS= $(WNNJLIBOBJ)/msg.o $(WNNJLIBOBJ)/yincoding.o $(WNNJLIBOBJ)/py_table.o $(WNNJLIBOBJ)/zy_table.o $(WNNJLIBOBJ)/strings.o $(WNNJLIBOBJ)/bcopy.o $(WNNJLIBOBJ)/mkdir.o
LOCAL_JLIBSRCS= $(WNNJLIBSRC)/js.c $(WNNJLIBSRC)/wnnerrmsg.c $(WNNJLIBSRC)/jl.c
-LOCAL_JLIBOBJS= $(WNNJLIBSRC)/js.o $(WNNJLIBSRC)/wnnerrmsg.o $(WNNJLIBSRC)/jl.o
+LOCAL_JLIBOBJS= $(WNNJLIBOBJ)/js.o $(WNNJLIBOBJ)/wnnerrmsg.o $(WNNJLIBOBJ)/jl.o
SRCS= $(SRC1) $(SRC2) $(SRC3) $(SRC4)
OBJS= $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS) $(LOCAL_JLIBOBJS)
@@ -71,12 +76,12 @@ includes::
.c.o:
$(RM) $@
- $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
+ $(LT_CC) -c $(CFLAGS) $(_NOOP_) $<
all:: libjd.la
libjd.la: $(OBJS) $(EXTRALIBRARYDEPS)
- $(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION)
+ $(LT_LD) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION) @LIBS@
lintlib:: llib-ljd.ln
@@ -87,12 +92,12 @@ llib-ljd.ln: $(SRCS) $(EXTRALIBRARYDEPS)
install:: libjd.la
@if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi
- $(LIBTOOL) $(INSTALL) $(INSTLIBFLAGS) libjd.la $(DESTDIR)$(WNNLIBDIR)
+ $(LT_INSTALL) $(INSTLIBFLAGS) libjd.la $(DESTDIR)$(WNNLIBDIR)
install:: jlib.h
@if [ -d $(DESTDIR)$(JWNNINCDIR) ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNINCDIR)); fi
- $(INSTALL) $(INSTDATFLAGS) jlib.h $(DESTDIR)$(JWNNINCDIR)/jlib.h
+ $(INSTALL) $(INSTDATFLAGS) $(srcdir)/jlib.h $(DESTDIR)$(JWNNINCDIR)/jlib.h
lint:
$(LINT) $(LINTFLAGS) $(SRCS) $(LINTLIBS)
@@ -109,13 +114,13 @@ $(WNNJLIB)::
done
$(OBJ2) : $(SRC2)
- $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c
+ $(LT_CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c
$(OBJ3) : $(SRC3)
- $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c
+ $(LT_CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c
$(OBJ4) : $(SRC4)
- $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c
+ $(LT_CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c
depend:: .depend

45
inputmethod/ja-freewnn-lib/patches/patch-Wnn_jlib_Makefile.in
View File

@@ -1,45 +0,0 @@
$NetBSD: patch-Wnn_jlib_Makefile.in,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/jlib/Makefile.in.orig 2004-09-12 16:56:55.000000000 +0000
+++ Wnn/jlib/Makefile.in
@@ -10,9 +10,9 @@
# 1987, 1988, 1989, 1990, 1991, 1992
# Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
# Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
-# Copyright FreeWnn Project 1999, 2000, 2001, 2003
+# Copyright FreeWnn Project 1999, 2000, 2001, 2003, 2009
#
-# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+# Maintainer: FreeWnn Project
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -42,8 +42,6 @@ WNNROMKANOBJ = $(top_builddir)/Wnn/romka
LINTLIBS =
INSTALL = @INSTALL@ $(INSTALLFLAGS)
-LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
-LT_CC = $(LIBTOOL) --mode=compile $(CC)
SRC1= jl.c js.c wnnerrmsg.c
OBJ1= jl.o js.o wnnerrmsg.o
@@ -93,7 +91,7 @@ lint:
kankana: kankana.o
$(RM) $@
- $(LIBTOOL) --mode=link $(CCLINK) -o $@ $(LDOPTIONS) kankana.o $(WNNJLIB) @LIBS@
+ $(LT_LD) -o $@ $(LDOPTIONS) kankana.o $(WNNJLIB)
clean::
$(RM) kankana
@@ -101,7 +99,7 @@ clean::
all:: libwnn.la
libwnn.la: $(OBJS) $(EXTRALIBRARYDEPS)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION)
+ $(LT_LD) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION) @LIBS@
lintlib:: llib-lwnn.ln

31
inputmethod/ja-freewnn-lib/patches/patch-Wnn_jserver_Makefile.in
View File

@@ -1,31 +0,0 @@
$NetBSD: patch-Wnn_jserver_Makefile.in,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/jserver/Makefile.in.orig 2004-05-21 16:39:32.000000000 +0000
+++ Wnn/jserver/Makefile.in
@@ -10,9 +10,9 @@
# 1987, 1988, 1989, 1990, 1991, 1992
# Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
# Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
-# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2003, 2004, 2010
#
-# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+# Maintainer: FreeWnn Project
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -102,9 +102,9 @@ clean::
instserver:: install
install:: jserver
- @if [ -d $(DESTDIR)$(JWNNBINDIR) ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNBINDIR)); fi
- $(LIBTOOL) --mode=install $(INSTALL) $(INSTPGMFLAGS) $(INSTUIDFLAGS) $(LOCAL_INSTFLAGS) jserver $(DESTDIR)$(JWNNBINDIR)/jserver
+ @if [ -d $(DESTDIR)$(JWNNSBINDIR) ]; then set +x; \
+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNSBINDIR)); fi
+ $(LT_INSTALL) $(INSTPGMFLAGS) $(INSTUIDFLAGS) $(LOCAL_INSTFLAGS) jserver $(DESTDIR)$(JWNNSBINDIR)/`echo jserver | sed '$(transform)'`
$(OBJ0) : $(SRC0)
$(CC) -c $(CFLAGS) $(SERVERINITDEF) $(SOLINGERDEFS) $(srcdir)/`basename $@ .o`.c

109
inputmethod/ja-freewnn-lib/patches/patch-Wnn_jserver_de__header.h
View File

@@ -1,109 +0,0 @@
$NetBSD: patch-Wnn_jserver_de__header.h,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/jserver/de_header.h.orig 2004-12-29 17:45:32.000000000 +0000
+++ Wnn/jserver/de_header.h
@@ -10,9 +10,10 @@
* 1987, 1988, 1989, 1990, 1991, 1992
* Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
* Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
- * Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2003, 2004
+ * Copyright FreeWnn Project
+ * 1999, 2000, 2001, 2002, 2003, 2004, 2010, 2011
*
- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+ * Maintainer: FreeWnn Project
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -218,13 +219,13 @@ extern int b_index_add (struct JT *jt, w
extern void b_index_delete (struct JT *jt, int serial);
#endif
/* bnsetu_kai.c */
-extern int sbn_kai ();
-extern int j_max ();
-extern int getgiji ();
-extern int is_g_eisuu ();
-extern int getgiji_f ();
-extern int check_bar_katakana ();
-extern int kan_ckvt ();
+extern int sbn_kai (int, int, int, int, struct SYO_BNSETSU **, int, struct SYO_BNSETSU *);
+extern int j_max (struct ICHBNP *, int);
+extern int getgiji (int, int, struct SYO_BNSETSU *, struct ICHBNP *, int, int);
+extern int is_g_eisuu (w_char);
+extern int getgiji_f (int, struct SYO_BNSETSU *);
+extern int check_bar_katakana (int, int);
+extern int kan_ckvt (unsigned short, int);
/* daibn_kai.c */
extern int dbn_kai ();
extern int get_status ();
@@ -512,7 +513,7 @@ extern int fread_cur ();
extern int xgetc_cur ();
extern void xungetc_cur ();
extern void fwrite_cur ();
-extern void xputc_cur ();
+extern void xputc_cur (unsigned char);
extern void fclose_cur ();
/* w_string.c */
extern void Sreverse ();
@@ -534,27 +535,27 @@ extern char *wnn_get_hinsi_name ();
extern int wnn_get_fukugou_component_body ();
extern int wnn_get_fukugou_component ();
/* bdic.c */
-extern void check_backup ();
-extern void delete_tmp_file ();
-extern char *make_backup_file ();
-extern char *make_tmp_file ();
-extern void move_tmp_to_org ();
-extern int output_file_header ();
-extern int input_file_header ();
-extern int output_file_uniq (struct wnn_file_uniq* funiq, FILE* ofpter);
-extern int check_inode ();
-extern int change_file_uniq ();
-extern int f_uniq_cmp ();
-extern void Get_knj2 ();
-extern void get_kanji_str ();
-extern void Get_kanji_str_r ();
-extern unsigned char *kanjiaddr ();
-extern int create_null_dic ();
-extern int create_hindo_file ();
-extern int input_header_jt ();
-extern int output_header_jt ();
-extern int input_header_hjt ();
-extern int output_header_hjt ();
+extern void check_backup (char*);
+extern void delete_tmp_file (char*);
+extern char *make_backup_file (char*);
+extern char *make_tmp_file (char*, int, FILE**);
+extern void move_tmp_to_org (char*, char*, int);
+extern int output_file_header (FILE*, struct wnn_file_head*);
+extern int input_file_header (FILE*, struct wnn_file_head*);
+extern int output_file_uniq (struct wnn_file_uniq*, FILE*);
+extern int check_inode (FILE*, struct wnn_file_head*);
+extern int change_file_uniq (struct wnn_file_head*, char*);
+extern int f_uniq_cmp (struct wnn_file_uniq*, struct wnn_file_uniq*);
+extern void Get_knj2 (unsigned char*, int, w_char*, w_char*, w_char*);
+extern void get_kanji_str (unsigned char*, w_char*, w_char*, w_char*);
+extern void Get_kanji_str_r (unsigned char*, w_char**, w_char**, w_char**);
+extern unsigned char kanjiaddr (unsigned char*, w_char*, w_char*, w_char*);
+extern int create_null_dic (char*, w_char*, char*, char*, int);
+extern int create_hindo_file (struct wnn_file_uniq*, char*, w_char*, char*, int);
+extern int input_header_jt (FILE*, struct JT*);
+extern int output_header_jt (FILE*, struct JT*);
+extern int input_header_hjt (FILE*, struct HJT*);
+extern int output_header_hjt (FILE*, struct HJT*);
/* dic_atojis.c */
extern void Get_kanji ();
extern void Get_knj1 ();
@@ -565,8 +566,8 @@ extern int revdic ();
extern int asshuku ();
extern int motoni2 ();
/* pwd.c */
-extern int new_pwd ();
-extern int check_pwd ();
+extern void new_pwd (char*, char*);
+extern int check_pwd (char*, char*);
#endif /* JSERVER_DE_HEADER_H */

27
inputmethod/ja-freewnn-lib/patches/patch-Wnn_jserver_renbn__kai.c
View File

@@ -1,27 +0,0 @@
$NetBSD: patch-Wnn_jserver_renbn__kai.c,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/jserver/renbn_kai.c.orig 2002-09-01 17:13:11.000000000 +0000
+++ Wnn/jserver/renbn_kai.c
@@ -6,9 +6,9 @@
* 1987, 1988, 1989, 1990, 1991, 1992
* Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
* Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
- * Copyright FreeWnn Project 1999, 2000, 2002
+ * Copyright FreeWnn Project 1999, 2000, 2002, 2011
*
- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+ * Maintainer: FreeWnn Project
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -321,7 +321,7 @@ tan_syo (int yomi_sno, /* ²òÀÏʸ»úÎó st
_status = 0;
if (chk_yomi_endvect (yomi_sno, yomi_eno, endvect, endvect1) < 0)
return (-1);
- if (sbn_kai (yomi_sno, yomi_eno, endvect, endvect1, &rsbnptr, 1, 0) < 0)
+ if (sbn_kai (yomi_sno, yomi_eno, endvect, endvect1, &rsbnptr, 1, (struct SYO_BNSETSU *) 0) < 0)
{
init_work_areas ();
return (-1); /* ERROR */

60
inputmethod/ja-freewnn-lib/patches/patch-Wnn_jutil_Makefile.in
View File

@@ -1,60 +0,0 @@
$NetBSD: patch-Wnn_jutil_Makefile.in,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/jutil/Makefile.in.orig 2004-08-15 09:38:22.000000000 +0000
+++ Wnn/jutil/Makefile.in
@@ -10,9 +10,9 @@
# 1987, 1988, 1989, 1990, 1991, 1992
# Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
# Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
-# Copyright FreeWnn Project 1999, 2000, 2001, 2004
+# Copyright FreeWnn Project 1999, 2000, 2001, 2004, 2010, 2011
#
-# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+# Maintainer: FreeWnn Project
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -39,17 +39,20 @@ LT_INSTALL = $(LIBTOOL) --mode=inst
LT_LD = $(LIBTOOL) --mode=link $(CCLINK)
LOCAL_INSTFLAGS = -o $(WNNOWNER)
- INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir)
+ INCLUDES = -I$(top_builddir) @EXTWNNJINC@ -I$(WNNINCLUDESRC)
DEFINES = $(WNNDEFINES) $(WNNLANGDEF)
HINSIDEFINE = -DHINSIDATA_FILE=\"/$(JWNNLANG)/hinsi.data\"
-CLIENTPROGRAMS = wnnstat wnnkill wddel wdreg
+CLIENTPROGRAMS = wddel wdreg
+
+# Server status / kill programs
+CLIENT_SV_PROGRAMS = wnnstat wnnkill
DICUTIL2PROGRAMS = atod atof wnntouch
DICUTILPROGRAMS = oldatonewa dtoa
-PROGRAMS = $(CLIENTPROGRAMS) $(DICUTILPROGRAMS) $(DICUTIL2PROGRAMS)
+PROGRAMS = $(CLIENTPROGRAMS) $(CLIENT_SV_PROGRAMS) $(DICUTILPROGRAMS) $(DICUTIL2PROGRAMS)
SRC1= $(WNNETCSRC)/bdic.c
OBJ1= bdic.o
@@ -190,10 +193,15 @@ clean::
install:: $(PROGRAMS)
@if [ -d $(DESTDIR)$(JWNNBINDIR) ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNBINDIR)); fi
+ @if [ -d $(DESTDIR)$(JWNNSBINDIR) ]; then set +x; \
+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNSBINDIR)); fi
@for flag in ${MAKEFLAGS} ''; do \
case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \
- for i in $(PROGRAMS); do \
- (set -x; $(LT_INSTALL) $(INSTBINFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(JWNNBINDIR)); \
+ for i in $(CLIENTPROGRAMS) $(DICUTILPROGRAMS) $(DICUTIL2PROGRAMS); do \
+ (set -x; $(LT_INSTALL) $(INSTBINFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(JWNNBINDIR)/`echo $$i | sed '$(transform)'`); \
+ done; \
+ for i in $(CLIENT_SV_PROGRAMS); do \
+ (set -x; $(LT_INSTALL) $(INSTBINFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(JWNNSBINDIR)/`echo $$i | sed '$(transform)'`); \
done
$(OBJ1) : $(SRC1)

31
inputmethod/ja-freewnn-lib/patches/patch-Wnn_jutil_ujisf.c
View File

@@ -1,31 +0,0 @@
$NetBSD: patch-Wnn_jutil_ujisf.c,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/jutil/ujisf.c.orig 2002-07-14 04:26:57.000000000 +0000
+++ Wnn/jutil/ujisf.c
@@ -10,9 +10,9 @@
* 1987, 1988, 1989, 1990, 1991, 1992
* Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
* Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
- * Copyright FreeWnn Project 1999, 2000, 2002
+ * Copyright FreeWnn Project 1999, 2000, 2002, 2010
*
- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+ * Maintainer: FreeWnn Project
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -68,8 +68,10 @@ static void sisheng_num (), read_kanji_s
#define max(a, b) ((a < b)? b:a)
#endif
-extern unsigned char kanjiaddr ();
-extern void Print_entry ();
+extern unsigned char kanjiaddr (unsigned char *d0, w_char* kanji, w_char* yomi, w_char* comment);
+extern void Print_entry (w_char* yomi, w_char* kstr, w_char* cstr,
+ int hindo, int ima, int hinsi, int serial,
+ FILE* ofpter, int esc_exp);
extern int wnn_find_hinsi_by_name ();
#ifdef CHINESE
extern void cwnn_zy_str_analysis (), cwnn_py_str_analysis ();

69
inputmethod/ja-freewnn-lib/patches/patch-Wnn_man_2.env_wnn_2b__romkan.man
View File

@@ -1,69 +0,0 @@
$NetBSD: patch-Wnn_man_2.env_wnn_2b__romkan.man,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/man/2.env/wnn/2b_romkan.man.orig 2001-06-14 18:08:31.000000000 +0000
+++ Wnn/man/2.env/wnn/2b_romkan.man
@@ -9,9 +9,9 @@
.\" 1987, 1988, 1989, 1990, 1991, 1992
.\" Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
.\" Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
-.\" Copyright FreeWnn Project 1999, 2000
+.\" Copyright FreeWnn Project 1999, 2000, 2010
.\"
-.\" Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+.\" Maintainer: FreeWnn Project
.\"
.\" This program is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
@@ -82,6 +82,7 @@ uum(1) 起動時に解釈され、ローマ字変換用<E68F9B>
ローマ字変換デフォルト設定
(括弧内のものは、カタカナモードの時に限り適用される変換を示す。)
+.nf
A あ KA か SA さ TA た
I い KI き SI し TI ち
U う KU く SU す TU つ
@@ -145,28 +146,31 @@ uum(1) 起動時に解釈され、ローマ字変換用<E68F9B>
N ん
N' ん
- XA ぁ \A ぁ XYA ゃ \YA ゃ
- XI ぃ \I ぃ
- XU ぅ \U ぅ XYU ゅ \YU ゅ
- XE ぇ \E ぇ
- XO ぉ \O ぉ XYO ょ \YO ょ
-
- XTU っ \TU っ XTI てぃ XWI うぃ
- XTSU っ \TSU っ XDI でぃ XWE うぇ
- XWA ゎ \WA ゎ XDU どぅ XWO うぉ
- XKA ( ヵ ) \KA ( ヵ ) XDE でぇ
- XKE ( ヶ ) \KE ( ヶ ) XDO どぉ
+ XA ぁ \eA ぁ XYA ゃ \eYA ゃ
+ XI ぃ \eI ぃ
+ XU ぅ \eU ぅ XYU ゅ \eYU ゅ
+ XE ぇ \eE ぇ
+ XO ぉ \eO ぉ XYO ょ \eYO ょ
+
+ XTU っ \eTU っ XTI てぃ XWI うぃ
+ XTSU っ \eTSU っ XDI でぃ XWE うぇ
+ XWA ゎ \eWA ゎ XDU どぅ XWO うぉ
+ XKA ( ヵ ) \eKA ( ヵ ) XDE でぇ
+ XKE ( ヶ ) \eKE ( ヶ ) XDO どぉ
- ー / ・ Z. …
, 、 [ 「 Z- ～
. 。 ] 」
+.fi
母音の次に長音がきた場合、次のように確定する。
+.nf
A^ ああ A~ ああ
I^ いい I~ いい
U^ うう U~ うう
E^ えい E~ えい
O^ おう O~ おう
+.fi
M の次に B M P のいずれかがきた場合、M を"ん"に確定する。

79
inputmethod/ja-freewnn-lib/patches/patch-Wnn_man_4.cmd_Makefile.in
View File

@@ -1,79 +0,0 @@
$NetBSD: patch-Wnn_man_4.cmd_Makefile.in,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/man/4.cmd/Makefile.in.orig 2001-08-14 13:43:21.000000000 +0000
+++ Wnn/man/4.cmd/Makefile.in
@@ -10,9 +10,9 @@
# 1987, 1988, 1989, 1990, 1991, 1992
# Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
# Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
-# Copyright FreeWnn Project 1999, 2000, 2001
+# Copyright FreeWnn Project 1999, 2000, 2001, 2010
#
-# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+# Maintainer: FreeWnn Project
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,41 +29,30 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-include @top_srcdir@/makerule.mk
-top_builddir = ../../..
+include @top_builddir@/makerule.mk
+top_builddir = @top_builddir@
+ srcdir = @srcdir@
INSTALL = @INSTALL@ $(INSTALLFLAGS)
MANSUFFIX = 1
-install.man:: jserver.man
- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
- $(RM) $(DESTDIR)$(MANDIR)/jserver.$(MANSUFFIX)*
- $(INSTALL) $(INSTMANFLAGS) jserver.man \
- $(DESTDIR)$(MANDIR)/jserver.$(MANSUFFIX)
- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/jserver.$(MANSUFFIX)
-
-install.man:: uum.man
- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
- $(RM) $(DESTDIR)$(MANDIR)/uum.$(MANSUFFIX)*
- $(INSTALL) $(INSTMANFLAGS) uum.man \
- $(DESTDIR)$(MANDIR)/uum.$(MANSUFFIX)
- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/uum.$(MANSUFFIX)
-
-install.man:: wnnkill.man
- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
- $(RM) $(DESTDIR)$(MANDIR)/wnnkill.$(MANSUFFIX)*
- $(INSTALL) $(INSTMANFLAGS) wnnkill.man \
- $(DESTDIR)$(MANDIR)/wnnkill.$(MANSUFFIX)
- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/wnnkill.$(MANSUFFIX)
+SERVER_MAN = jserver.man
+CLIENT_MAN = uum.man
+SVTOOL_MAN = wnnkill.man wnnstat.man
+ MANUALS = $(SERVER_MAN) $(CLIENT_MAN) $(SVTOOL_MAN)
-install.man:: wnnstat.man
+# Probably we don't need $(MANUALS) as dependency ...
+install.man::
@if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
- $(RM) $(DESTDIR)$(MANDIR)/wnnstat.$(MANSUFFIX)*
- $(INSTALL) $(INSTMANFLAGS) wnnstat.man \
- $(DESTDIR)$(MANDIR)/wnnstat.$(MANSUFFIX)
- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/wnnstat.$(MANSUFFIX)
+ for m in $(MANUALS); do \
+ manname=`basename $$m .man | sed '$(transform)'`; \
+ $(RM) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX)*; \
+ $(INSTALL) $(INSTMANFLAGS) $(srcdir)/$$m \
+ $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX); \
+ done
+ -for m in $(MANUALS); do \
+ manname=`basename $$m .man | sed '$(transform)'`; \
+ $(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX); \
+ done

112
inputmethod/ja-freewnn-lib/patches/patch-Wnn_man_6.jutil_Makefile.in
View File

@@ -1,112 +0,0 @@
$NetBSD: patch-Wnn_man_6.jutil_Makefile.in,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/man/6.jutil/Makefile.in.orig 2001-08-14 13:43:21.000000000 +0000
+++ Wnn/man/6.jutil/Makefile.in
@@ -10,9 +10,9 @@
# 1987, 1988, 1989, 1990, 1991, 1992
# Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
# Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
-# Copyright FreeWnn Project 1999, 2000, 2001
+# Copyright FreeWnn Project 1999, 2000, 2001, 2010
#
-# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+# Maintainer: FreeWnn Project
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,65 +29,39 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-include @top_srcdir@/makerule.mk
-top_builddir = ../../..
+include @top_builddir@/makerule.mk
+top_builddir = @top_builddir@
+ srcdir = @srcdir@
INSTALL = @INSTALL@ $(INSTALLFLAGS)
MANSUFFIX = 1
-install.man:: atod.man
- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
- $(RM) $(DESTDIR)$(MANDIR)/atod.$(MANSUFFIX)*
- $(INSTALL) $(INSTMANFLAGS) atod.man \
- $(DESTDIR)$(MANDIR)/atod.$(MANSUFFIX)
- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/atod.$(MANSUFFIX)
-
-install.man:: atof.man
- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
- $(RM) $(DESTDIR)$(MANDIR)/atof.$(MANSUFFIX)*
- $(INSTALL) $(INSTMANFLAGS) atof.man \
- $(DESTDIR)$(MANDIR)/atof.$(MANSUFFIX)
- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/atof.$(MANSUFFIX)
-
-install.man:: dtoa.man
- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
- $(RM) $(DESTDIR)$(MANDIR)/dtoa.$(MANSUFFIX)*
- $(INSTALL) $(INSTMANFLAGS) dtoa.man \
- $(DESTDIR)$(MANDIR)/dtoa.$(MANSUFFIX)
- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/dtoa.$(MANSUFFIX)
-
-install.man:: wddel.man
- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
- $(RM) $(DESTDIR)$(MANDIR)/wddel.$(MANSUFFIX)*
- $(INSTALL) $(INSTMANFLAGS) wddel.man \
- $(DESTDIR)$(MANDIR)/wddel.$(MANSUFFIX)
- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/wddel.$(MANSUFFIX)
-
-install.man:: wdreg.man
- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
- $(RM) $(DESTDIR)$(MANDIR)/wdreg.$(MANSUFFIX)*
- $(INSTALL) $(INSTMANFLAGS) wdreg.man \
- $(DESTDIR)$(MANDIR)/wdreg.$(MANSUFFIX)
- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/wdreg.$(MANSUFFIX)
-
-install.man:: wnntouch.man
- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
- $(RM) $(DESTDIR)$(MANDIR)/wnntouch.$(MANSUFFIX)*
- $(INSTALL) $(INSTMANFLAGS) wnntouch.man \
- $(DESTDIR)$(MANDIR)/wnntouch.$(MANSUFFIX)
- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/wnntouch.$(MANSUFFIX)
+MANUALS = atod.man dtoa.man atof.man wddel.man wdreg.man wnntouch.man
+# Omit oldtonew.man (See below.)
-install.man:: oldtonew.man
+# Probably we don't need $(MANUALS) as dependency ...
+install.man::
@if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
- $(RM) $(DESTDIR)$(MANDIR)/oldatonewa.$(MANSUFFIX)*
- $(INSTALL) $(INSTMANFLAGS) oldtonew.man \
- $(DESTDIR)$(MANDIR)/oldatonewa.$(MANSUFFIX)
- -$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/oldatonewa.$(MANSUFFIX)
+ for m in $(MANUALS); do \
+ manname=`basename $$m .man | sed '$(transform)'`; \
+ $(RM) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX)*; \
+ $(INSTALL) $(INSTMANFLAGS) $(srcdir)/$$m \
+ $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX); \
+ done
+ -for m in $(MANUALS); do \
+ manname=`basename $$m .man | sed '$(transform)'`; \
+ $(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX); \
+ done
+
+# Leave oldtonew.man (-> oldatonewa.1): need extra transformation
+install.man::
+ @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
+ manname=`echo oldatonewa | sed '$(transform)'`; \
+ $(RM) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX)*; \
+ $(INSTALL) $(INSTMANFLAGS) $(srcdir)/oldtonew.man \
+ $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX)
+ -manname=`echo oldatonewa | sed '$(transform)'`; \
+ $(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/$$manname.$(MANSUFFIX)

35
inputmethod/ja-freewnn-lib/patches/patch-Wnn_manual_2.env_wnn_2b__romkana
View File

@@ -1,35 +0,0 @@
$NetBSD: patch-Wnn_manual_2.env_wnn_2b__romkana,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/manual/2.env/wnn/2b_romkana.orig 2000-01-16 05:07:46.000000000 +0000
+++ Wnn/manual/2.env/wnn/2b_romkana
@@ -118,17 +118,17 @@
N ん
N' ん
- XA ぁ A ぁ XYA ゃ YA ゃ
- XI ぃ I ぃ
- XU ぅ U ぅ XYU ゅ YU ゅ
- XE ぇ E ぇ
- XO ぉ O ぉ XYO ょ YO ょ
-
- XTU っ TU っ XTI てぃ XWI うぃ
- XTSU っ TSU っ XDI でぃ XWE うぇ
- XWA ゎ WA ゎ XDU どぅ XWO うぉ
- XKA ( ヵ ) KA ( ヵ ) XDE でぇ
- XKE ( ヶ ) KE ( ヶ ) XDO どぉ
+ XA ぁ \A ぁ XYA ゃ YA ゃ
+ XI ぃ \I ぃ
+ XU ぅ \U ぅ XYU ゅ YU ゅ
+ XE ぇ \E ぇ
+ XO ぉ \O ぉ XYO ょ YO ょ
+
+ XTU っ \TU っ XTI てぃ XWI うぃ
+ XTSU っ \TSU っ XDI でぃ XWE うぇ
+ XWA ゎ \WA ゎ XDU どぅ XWO うぉ
+ XKA ( ヵ ) \KA ( ヵ ) XDE でぇ
+ XKE ( ヶ ) \KE ( ヶ ) XDO どぉ
- ー / ・ Z. …
, 、 [ 「 Z- ～

27
inputmethod/ja-freewnn-lib/patches/patch-Wnn_pubdicplus_Makefile.in
View File

@@ -1,27 +0,0 @@
$NetBSD: patch-Wnn_pubdicplus_Makefile.in,v 1.1 2011/09/13 07:23:17 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/pubdicplus/Makefile.in.orig 2004-04-24 18:56:40.000000000 +0000
+++ Wnn/pubdicplus/Makefile.in
@@ -10,9 +10,9 @@
# 1987, 1988, 1989, 1990, 1991, 1992
# Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
# Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
-# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2004
+# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2004, 2010
#
-# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+# Maintainer: FreeWnn Project
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -422,7 +422,7 @@ fzk.master-.c: fzk.master
$(LN) $? $@
std.fzk: fzk.master-.c $(FZK_SRC)
- $(CPP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
+ $(FZK_PP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
full.fzk: $(FZK_SRC)
$(MAKE) FZK_FLAG=-DKANSAI std.fzk

43
inputmethod/ja-freewnn-lib/patches/patch-Wnn_romkan_Makefile.in
View File

@@ -1,43 +0,0 @@
$NetBSD: patch-Wnn_romkan_Makefile.in,v 1.1 2011/09/13 07:23:18 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/romkan/Makefile.in.orig 2002-03-30 09:34:45.000000000 +0000
+++ Wnn/romkan/Makefile.in
@@ -10,9 +10,9 @@
# 1987, 1988, 1989, 1990, 1991, 1992
# Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
# Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
-# Copyright FreeWnn Project 1999, 2000, 2001
+# Copyright FreeWnn Project 1999, 2000, 2001, 2006
#
-# Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+# Maintainer: FreeWnn Project
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,10 +29,12 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-include ../../makerule.mk
-top_builddir = ../..
+include @top_builddir@/makerule.mk
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+top_builddir = @top_builddir@
- INCLUDES = -I$(WNNINCLUDESRC) -I$(TOP)
+ INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir)
DEFINES = $(WNNDEFINES) -DWNNDEFAULT $(WNNLANGDEF)
LINTLIBS =
@@ -46,7 +48,7 @@ includes::
.c.o:
$(RM) $@
- $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $<
+ $(LT_CC) -c $(CFLAGS) $(_NOOP_) $<
clean::
$(RM) -r .libs

56
inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_Makefile.in
View File

@@ -1,56 +0,0 @@
$NetBSD: patch-Wnn_uum_Makefile.in,v 1.1 2011/09/13 07:23:18 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/uum/Makefile.in.orig 2005-11-20 16:10:28.000000000 +0000
+++ Wnn/uum/Makefile.in
@@ -10,7 +10,8 @@
# 1987, 1988, 1989, 1990, 1991, 1992
# Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
# Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
-# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2005
+# Copyright FreeWnn Project
+# 1999, 2000, 2001, 2002, 2005, 2006, 2007, 2010, 2011
#
# Maintainer: FreeWnn Project
#
@@ -34,13 +35,17 @@ include @top_builddir@/makerule.mk
top_builddir = @top_builddir@
VPATH = @srcdir@
-INSTALL = @INSTALL@ $(INSTALLFLAGS)
-LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER)
+INSTALL = @INSTALL@
+LOCAL_INSTFLAGS = $(INSTUUMFLAGS)
- UUMOWNER = root
- INCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANSRC) -I$(top_builddir)
+ INCLUDES = -I$(top_builddir) @EXTWNNJINC@ -I$(WNNINCLUDESRC) -I$(WNNROMKANSRC)
DEFINES = $(WNNDEFINES) $(WNNLANGDEF)
+# todo: should update configure to switch both WNNJLIB and WNNCONVLIB
+# according to --with-wnn-libraries
LOCAL_LIBRARIES = $(WNNJLIB) $(WNNCONVLIB) @LIBS@
+# FIXME: libspt: need configure support ...
+# LIBSPT_CFLAGS = @LIBSPT_CFLAGS@
+# LIBSPT_LIBS = @LIBSPT_LIBS@
SRC1= epilogue.c header.c kensaku.c kuten.c jis_in.c prologue.c touroku.c jikouho.c jutil.c w_string.c printf.c termio.c hinsi.c termcap.c ttyfdslot.c setutmp.c redraw.c history.c key_bind.c screen.c basic_op.c uif.c cursor.c jhlp.c select_ele.c inspect.c wnnrc_op.c functions.c
@@ -63,7 +68,7 @@ all:: uum
uum: $(OBJS) @DEPWNNJLIB@ $(WNNCONVLIB)
$(RM) $@
- $(LIBTOOL) --mode=link $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(WNNTERM_LIB)
+ $(LT_LD) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LIBSPT_LIBS) @TERMLIB@
clean::
$(RM) -r .libs
@@ -74,7 +79,7 @@ instclient:: install
install:: uum
@if [ -d $(DESTDIR)$(JWNNBINDIR) ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNBINDIR)); fi
- $(LIBTOOL) --mode=install $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) uum $(DESTDIR)$(JWNNBINDIR)/uum
+ $(LT_INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) uum $(DESTDIR)$(JWNNBINDIR)/`echo uum | sed '$(transform)'`
$(OBJ2) : $(SRC2)
$(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c

33
inputmethod/ja-freewnn-lib/patches/patch-Wnn_uum_basic__op.c
View File

@@ -1,33 +0,0 @@
$NetBSD: patch-Wnn_uum_basic__op.c,v 1.1 2011/09/13 07:23:18 mef Exp $
(Almost) Automatic generation to sourceforge cvs Repository 2011/05/31
--- Wnn/uum/basic_op.c.orig 2002-05-12 22:51:17.000000000 +0000
+++ Wnn/uum/basic_op.c
@@ -10,9 +10,9 @@
* 1987, 1988, 1989, 1990, 1991, 1992
* Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
* Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
- * Copyright FreeWnn Project 1999, 2000, 2002
+ * Copyright FreeWnn Project 1999, 2000, 2002, 2006
*
- * Maintainer: FreeWnn Project <freewnn@tomo.gr.jp>
+ * Maintainer: FreeWnn Project
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -43,10 +43,14 @@ bufferの使い方とかbufferの内容がどのよう
#include <stdio.h>
#if STDC_HEADERS
# include <stdlib.h>
+# include <string.h>
#else
# if HAVE_MALLOC_H
# include <malloc.h>
# endif
+# if HAVE_STRINGS_H
+# include <strings.h>
+# endif
#endif /* STDC_HEADERS */
#include "jllib.h"
#include "commonhd.h"

Some files were not shown because too many files have changed in this diff Show More