Import of pkgsrc-2015Q1

2015-04-22 14:34:26 +02:00
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions
--- a/inputmethod/uim/DEINSTALL
+++ b/inputmethod/uim/DEINSTALL
@@ -1,7 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1 2014/01/20 13:26:54 ryoon Exp $
-
-case ${STAGE} in
-DEINSTALL)
-	${PREFIX}/bin/uim-module-manager --unregister-all
-	;;
-esac
--- a/inputmethod/uim/INSTALL
+++ b/inputmethod/uim/INSTALL
@@ -1,10 +0,0 @@
-# $NetBSD: INSTALL,v 1.1 2014/01/20 13:26:54 ryoon Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	cd ${PREFIX}/share/uim/pkgsrc
-	for m in *
-		do ${PREFIX}/bin/uim-module-manager --register ${m}
-	done
-	;;
-esac
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.91 2014/02/12 23:18:05 tron Exp $
+# $NetBSD: Makefile,v 1.102 2014/11/07 19:39:36 adam Exp $
 #

 .include "../../inputmethod/uim/Makefile.common"

-PKGREVISION=		8
+PKGREVISION=		18
 COMMENT=		Multilingual input method library
 #LICENSE=		See ${WRKSRC}/COPYING

@@ -17,29 +17,25 @@ PKGCONFIG_OVERRIDE+=	${WRKSRC}/uim.pc.in
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-emacs
 CONFIGURE_ARGS+=	--with-libgcroots=installed
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}

-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	SunOS_LDFLAGS="-shared -mimpure-text"
+LDFLAGS.SunOS+=	-mimpure-text
 CFLAGS.SunOS+=	-std=c99 -D__EXTENSIONS__
-.endif

 .include "options.mk"

-INSTALLATION_DIRS+=	share/doc/uim share/examples/uim
+PKG_SYSCONFSUBDIR=	uim
+INSTALLATION_DIRS+=	share/doc/uim
+
+INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples

 EGDIR=			${PREFIX}/share/examples/uim
-CONF_FILES=		${EGDIR}/loader.scm.example \
-			${PREFIX}/share/uim/loader.scm
-CONF_FILES+=		${EGDIR}/installed-modules.scm.example \
-			${PREFIX}/share/uim/installed-modules.scm
+CONF_FILES=		${EGDIR}/loader.scm \
+			${PKG_SYSCONFDIR}/loader.scm
+CONF_FILES+=		${EGDIR}/installed-modules.scm \
+			${PKG_SYSCONFDIR}/installed-modules.scm

 post-install:
-# Register uim module infomation
-	${MKDIR} ${DESTDIR}${PREFIX}/share/uim/pkgsrc
-.for m in ${UIM_MODULES}
-	${TOUCH} ${DESTDIR}${PREFIX}/share/uim/pkgsrc/${m}
-.endfor
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/COMPATIBILITY ${DESTDIR}${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/CUSTOM ${DESTDIR}${PREFIX}/share/doc/uim
@@ -50,11 +46,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/PLUGIN ${DESTDIR}${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/UIM-SCM ${DESTDIR}${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/UIM-SH ${DESTDIR}${PREFIX}/share/doc/uim
-# loader.scm and installed-modules.scm is updated by uim-module-manager.
-	${MV} ${DESTDIR}${PREFIX}/share/uim/loader.scm \
-		${DESTDIR}${EGDIR}/loader.scm.example
-	${MV} ${DESTDIR}${PREFIX}/share/uim/installed-modules.scm \
-		${DESTDIR}${EGDIR}/installed-modules.scm.example
+_BUILDING_UIM=	YES
+.include "modules.mk"

 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
--- a/inputmethod/uim/Makefile.common
+++ b/inputmethod/uim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2013/08/11 07:50:51 obache Exp $
+# $NetBSD: Makefile.common,v 1.12 2014/04/20 06:40:00 ryoon Exp $
 #
 # used by inputmethod/uim/Makefile
 # used by inputmethod/uim-elisp/Makefile
@@ -14,3 +14,9 @@ HOMEPAGE=		http://code.google.com/p/uim/

 DISTINFO_FILE=		${.CURDIR}/../../inputmethod/uim/distinfo
 PATCHDIR=		${.CURDIR}/../../inputmethod/uim/patches
+
+USE_TOOLS+=		automake
+
+pre-configure:
+	set -e; cd ${WRKSRC}; \
+	aclocal -I m4; autoheader; automake -a --foreign -i; autoconf
--- a/inputmethod/uim/PLIST
+++ b/inputmethod/uim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2014/01/20 13:26:54 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.23 2014/05/31 14:22:38 obache Exp $
 ${PLIST.qt3}bin/uim-chardict-qt
 ${PLIST.qt}bin/uim-chardict-qt4
 ${PLIST.uim-dict-gtk}bin/uim-dict-gtk
@@ -158,7 +158,7 @@ share/uim/im-switcher.scm
 share/uim/im.scm
 share/uim/init.scm
 share/uim/input-parse.scm
-share/examples/uim/installed-modules.scm.example
+share/examples/uim/installed-modules.scm
 share/uim/ipa-x-sampa.scm
 share/uim/iso-639-1.scm
 share/uim/japanese-act.scm
@@ -183,7 +183,7 @@ share/uim/lib/srfi-95.scm
 share/uim/lib/unittest.scm
 share/uim/light-record.scm
 share/uim/load-action.scm
-share/examples/uim/loader.scm.example
+share/examples/uim/loader.scm
 share/uim/lolevel.scm
 share/uim/look-custom.scm
 share/uim/look.scm
@@ -363,27 +363,6 @@ share/uim/pixmaps/zm.svg
 share/uim/pixmaps/zm_dark_background.png
 share/uim/pixmaps/zm_dark_background.svg
 share/uim/plugin.scm
-share/uim/pkgsrc/ajax-ime
-${PLIST.anthy}share/uim/pkgsrc/anthy
-share/uim/pkgsrc/baidu-olime-jp
-share/uim/pkgsrc/byeoru
-${PLIST.canna}share/uim/pkgsrc/canna
-share/uim/pkgsrc/elatin
-share/uim/pkgsrc/google-cgiapi-jp
-share/uim/pkgsrc/look
-share/uim/pkgsrc/ipa-x-sampa
-share/uim/pkgsrc/latin
-${PLIST.m17nlib}share/uim/pkgsrc/m17nlib
-${PLIST.prime}share/uim/pkgsrc/prime
-share/uim/pkgsrc/pyload
-${PLIST.sj3}share/uim/pkgsrc/sj3
-share/uim/pkgsrc/skk
-share/uim/pkgsrc/social-ime
-share/uim/pkgsrc/tutcode
-share/uim/pkgsrc/viqr
-${PLIST.wnn}share/uim/pkgsrc/wnn
-share/uim/pkgsrc/xmload
-${PLIST.expat}share/uim/pkgsrc/yahoo-jp
 share/uim/predict-custom.scm
 share/uim/predict-google-suggest.scm
 share/uim/predict-look-skk.scm
--- a/inputmethod/uim/distinfo
+++ b/inputmethod/uim/distinfo
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.26 2014/02/02 10:47:24 obache Exp $
+$NetBSD: distinfo,v 1.30 2014/05/31 22:41:32 ryoon Exp $

 SHA1 (uim-1.8.6.tar.bz2) = 43b9dbdead6797880e6cfc9c032ecb2d37d42777
 RMD160 (uim-1.8.6.tar.bz2) = 5f94218d82475ac463534ec681769f34547e5707
 Size (uim-1.8.6.tar.bz2) = 6500739 bytes
-SHA1 (patch-ab) = 56a7d5aadd2339f5bacae80b28ce520e6df3d1ab
-SHA1 (patch-ac) = 7c36bc67764925c9d87ad0aa963a53cfd1948224
-SHA1 (patch-ad) = 9c47fa28b6478bf2e720c1c0e7bf7793eb71fbab
-SHA1 (patch-ae) = 59944fc9c7256056125fa3a623aecf6a2e9dfe42
 SHA1 (patch-af) = 9f543b90bfefc5f560e1eaac97d60af70ffed5cc
 SHA1 (patch-fep_escseq.c) = 6c25c344e5b694542a3c5bc137ae1a1d36a8c835
+SHA1 (patch-scm_Makefile.am) = c3af52e2d9d06736911c0efd9a25e0aee2c62219
+SHA1 (patch-sigscheme_configure) = 2af99374a3af542d25124737bf8cd3b67f191c03
+SHA1 (patch-sigscheme_configure.in) = 9c5c48a477ea03263488e15565e4a568ba55a125
+SHA1 (patch-sigscheme_doc_Makefile.am) = 998b9a0844853c7996f333155dfe38a183c266f4
+SHA1 (patch-sigscheme_include_sigscheme_Makefile.am) = d54b38982c199b321c6ac0d8700bfe9c29084eee
+SHA1 (patch-uim_Makefile.am) = 6e3a37ee3ed2a68354b59e6dd7816017a95f15fd
+SHA1 (patch-uim_uim-module-manager.c) = 8c81edd3af3de7a2f7b7158d8c66e2082327b931
--- a/inputmethod/uim/files/modules.tmpl
+++ b/inputmethod/uim/files/modules.tmpl
@@ -0,0 +1,22 @@
+# $NetBSD: modules.tmpl,v 1.1 2014/05/31 14:22:38 obache Exp $
+#
+# Manager UIM modules
+#
+
+case ${STAGE} in
+POST-INSTALL)
+	if [ "${PKGBASE}" = "uim" ]; then
+		cd @UIM_MODULE_LIST_DIR@ &&	\
+			@UIM_MODULE_MANAGER@ --register *
+	else
+		@UIM_MODULE_MANAGER@ --register @UIM_MODULES@ 
+	fi
+	;;
+DEINSTALL)
+	if [ "${PKGBASE}" = "uim" ]; then
+		@UIM_MODULE_MANAGER@ --unregister-all
+	else
+		@UIM_MODULE_MANAGER@ --unregister @UIM_MODULES@
+	fi
+	;;
+esac
--- a/inputmethod/uim/modules.mk
+++ b/inputmethod/uim/modules.mk
@@ -0,0 +1,47 @@
+# $NetBSD: modules.mk,v 1.1 2014/05/31 14:22:38 obache Exp $
+#
+# This Makefile fragment is intended to be included by packages that install
+# UIM modules.  It takes care of update the corresponding databases
+# at (de)installation time.
+#
+# The following variables can be defined:
+#    UIM_MODULES - Set to list of UIM module names installed by the package.
+
+.if !defined(UIM_MODULES_MK)
+UIM_MODULES_MK=	# defined
+
+.if (defined(UIM_MODULES) && !empty(UIM_MODULES)) || defined(_BUILDING_UIM)
+
+.  if defined(_BUILDING_UIM)
+BUILDLINK_PREFIX.uim=	${PREFIX}
+.  else
+EVAL_PREFIX+=	BUILDLINK_PREFIX.uim=uim
+DEPENDS+=	uim-[0-9]*:../../inputmethod/uim
+.  endif
+
+UIM_MODULE_MANAGER=	${BUILDLINK_PREFIX.uim}/bin/uim-module-manager
+UIM_MODULE_LIST_DIR=	${BUILDLINK_PREFIX.uim}/share/uim/pkgsrc
+
+FILES_SUBST+=		UIM_MODULE_MANAGER=${UIM_MODULE_MANAGER:Q}
+FILES_SUBST+=		UIM_MODULE_LIST_DIR=${UIM_MODULE_LIST_DIR:Q}
+FILES_SUBST+=		UIM_MODULES=${UIM_MODULES:Q}
+INSTALL_TEMPLATES+=	../../inputmethod/uim/files/modules.tmpl
+DEINSTALL_TEMPLATES+=	../../inputmethod/uim/files/modules.tmpl
+
+GENERATE_PLIST+=	for m in ${UIM_MODULES}; do \
+			echo ${UIM_MODULE_LIST_DIR:S,^${BUILDLINK_PREFIX.uim}/,,}/$${m}; \
+			done
+
+post-install: uim-add-module-names
+uim-add-module-names: .PHONY 
+	${INSTALL_DATA_DIR} ${DESTDIR}${UIM_MODULE_LIST_DIR}
+	${RUN}cd ${DESTDIR}${UIM_MODULE_LIST_DIR};		\
+		for m in ${UIM_MODULES}; do			\
+			${INSTALL_DATA} /dev/null $${m};	\
+		done
+
+.endif
+
+TOOLS_NOOP+=		uim-module-manager
+
+.endif			# UIM_MODULES_MK
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.29 2014/01/20 13:26:54 ryoon Exp $
+# $NetBSD: options.mk,v 1.32 2014/12/26 08:43:27 obache Exp $

 PKG_OPTIONS_VAR=	PKG_OPTIONS.uim
 PKG_SUPPORTED_OPTIONS=	anthy canna curl eb expat ffi gnome gnome3 gtk gtk3 m17nlib openssl prime sj3 sqlite uim-fep wnn4 xim
@@ -81,7 +81,7 @@ CONFIGURE_ARGS+=	--disable-fep
 .  include "../../inputmethod/anthy/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-anthy-utf8
 PLIST.anthy=		yes
-UIM_MODULES+=		anthy
+UIM_MODULES+=		anthy anthy-utf8
 .else
 CONFIGURE_ARGS+=	--without-anthy
 .endif
@@ -100,7 +100,7 @@ PLIST.curl=		yes
 .if !empty(PKG_OPTIONS:Meb)
 .include "../../textproc/eb/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-eb
-CONFIGURE_ARGS+=	--with-eb-conf=${PKG_SYSCONFDIR}/eb.conf
+CONFIGURE_ARGS+=	--with-eb-conf=${PKG_SYSCONFBASE}/eb.conf
 PLIST.eb=		yes
 .endif

@@ -182,7 +182,7 @@ CONFIGURE_ARGS+=	--disable-kde4-applet

 .if !empty(PKG_OPTIONS:Mm17nlib)
 .  include "../../devel/m17n-lib/buildlink3.mk"
-DEPENDS+=		m17n-contrib-[0-9]*:../../misc/m17n-contrib
+DEPENDS+=		{m17n-db>=1.6.5,m17n-contrib-[0-9]*}:../../misc/m17n-db
 PLIST.m17nlib=		yes
 INSTALL_TEMPLATES+=	INSTALL.m17nlib
 DEINSTALL_TEMPLATES+=	DEINSTALL.m17nlib
--- a/inputmethod/uim/patches/patch-ab
+++ b/inputmethod/uim/patches/patch-ab
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2013/03/06 11:06:56 obache Exp $
-
-Avoid to install of header files of sigscheme, conflict with lang/sigscheme.
-
--- sigscheme/src/Makefile.in.orig	2012-12-30 06:12:17.000000000 +0000
-+++ sigscheme/src/Makefile.in
-@@ -39,7 +39,7 @@ am__make_dryrun = \
-     test $$am__dry = yes; \
-   }
- pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-+pkgincludedir =
- pkglibdir = $(libdir)/@PACKAGE@
- pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--- a/inputmethod/uim/patches/patch-ac
+++ b/inputmethod/uim/patches/patch-ac
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2013/03/06 11:06:56 obache Exp $
-
-Avoid to install of document files of sigscheme, conflict with lang/sigscheme.
-
--- sigscheme/doc/Makefile.in.orig	2012-12-30 06:12:16.000000000 +0000
-+++ sigscheme/doc/Makefile.in
-@@ -210,7 +210,7 @@ build_vendor = @build_vendor@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-docdir = @docdir@
-+docdir = 
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
--- a/inputmethod/uim/patches/patch-ad
+++ b/inputmethod/uim/patches/patch-ad
@@ -1,42 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2013/03/06 11:06:56 obache Exp $
-
-* Fix for SunOS, Add $(SunOS_LDFLAGS) where $(LDFLALGS) requested
-
--- uim/Makefile.in.orig	2012-12-30 06:12:26.000000000 +0000
-+++ uim/Makefile.in
-@@ -184,7 +184,7 @@ libuim_custom_enabler_la_OBJECTS =  \
- 	$(am_libuim_custom_enabler_la_OBJECTS)
- libuim_custom_enabler_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libuim_custom_enabler_la_LDFLAGS) $(LDFLAGS) -o $@
-+	$(libuim_custom_enabler_la_LDFLAGS) $(LDFLAGS) $(SunOS_LDFLAGS) -o $@
- libuim_custom_la_DEPENDENCIES = libuim-scm.la libuim.la
- am_libuim_custom_la_OBJECTS = libuim_custom_la-uim-custom.lo
- libuim_custom_la_OBJECTS = $(am_libuim_custom_la_OBJECTS)
-@@ -237,7 +237,7 @@ am_libuim_lolevel_la_OBJECTS = libuim_lo
- libuim_lolevel_la_OBJECTS = $(am_libuim_lolevel_la_OBJECTS)
- libuim_lolevel_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libuim_lolevel_la_LDFLAGS) $(LDFLAGS) -o $@
-+	$(libuim_lolevel_la_LDFLAGS) $(LDFLAGS) $(SunOS_LDFLAGS) -o $@
- libuim_look_la_DEPENDENCIES = libuim-scm.la libuim.la \
- 	libuim-bsdlook.la
- am_libuim_look_la_OBJECTS = libuim_look_la-look.lo
-@@ -300,7 +300,7 @@ am_libuim_scm_la_OBJECTS = libuim_scm_la
- libuim_scm_la_OBJECTS = $(am_libuim_scm_la_OBJECTS)
- libuim_scm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libuim_scm_la_CFLAGS) \
-	$(CFLAGS) $(libuim_scm_la_LDFLAGS) $(LDFLAGS) -o $@
-+	$(CFLAGS) $(libuim_scm_la_LDFLAGS) $(LDFLAGS) $(SunOS_LDFLAGS) -o $@
- libuim_skk_la_DEPENDENCIES = libuim-scm.la libuim.la libuim-bsdlook.la
- am_libuim_skk_la_OBJECTS = libuim_skk_la-skk.lo
- libuim_skk_la_OBJECTS = $(am_libuim_skk_la_OBJECTS)
-@@ -409,7 +409,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-+	$(LDFLAGS) $(SunOS_LDFLAGS) -o $@
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--- a/inputmethod/uim/patches/patch-ae
+++ b/inputmethod/uim/patches/patch-ae
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2012/09/15 12:05:00 obache Exp $
-
-* Fix for SunOS
-
--- sigscheme/configure.orig	2011-09-13 15:53:22.544782355 +0200
-+++ sigscheme/configure	2011-09-13 15:56:13.848433241 +0200
-@@ -16000,7 +16000,7 @@ if test "x$ac_cv_func_strdup" = xyes; th
- _ACEOF
- 
-     # Overrides _POSIX_C_SOURCE
-    $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
-+    $as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h
- 
- 
- fi
--- a/inputmethod/uim/patches/patch-scm_Makefile.am
+++ b/inputmethod/uim/patches/patch-scm_Makefile.am
@@ -0,0 +1,17 @@
+$NetBSD: patch-scm_Makefile.am,v 1.1 2014/04/20 06:40:00 ryoon Exp $
+
+https://github.com/uim/uim/pull/41
+
+--- scm/Makefile.am.orig	2013-06-30 04:26:20.000000000 +0000
+++ scm/Makefile.am
+@@ -1,8 +1,9 @@
+ scmdir = $(pkgdatadir)
+uimconfdir = $(sysconfdir)/uim
+ 
+ MOSTLYCLEANFILES = $(GENERATED_SCM_FILES)
+ dist_scm_DATA = $(SCM_FILES)
+-scm_DATA = $(GENERATED_SCM_FILES)
+uimconf_DATA = $(GENERATED_SCM_FILES)
+ GENERATED_SCM_FILES = installed-modules.scm loader.scm
+ SCM_FILES = plugin.scm im.scm im-custom.scm lazy-load.scm init.scm \
+  im-switcher.scm \
--- a/inputmethod/uim/patches/patch-sigscheme_configure
+++ b/inputmethod/uim/patches/patch-sigscheme_configure
@@ -0,0 +1,13 @@
+$NetBSD: patch-sigscheme_configure,v 1.1 2014/04/20 14:51:41 ryoon Exp $
+
+--- sigscheme/configure.orig	2013-06-30 04:27:03.000000000 +0000
+++ sigscheme/configure
+@@ -16003,7 +16003,7 @@ if test "x$ac_cv_func_strdup" = xyes; th
+ _ACEOF
+ 
+     # Overrides _POSIX_C_SOURCE
+-    $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+    $as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h
+ 
+ 
+ fi
--- a/inputmethod/uim/patches/patch-sigscheme_configure.in
+++ b/inputmethod/uim/patches/patch-sigscheme_configure.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-sigscheme_configure.in,v 1.1 2014/04/20 06:40:00 ryoon Exp $
+
+* Fix for SunOS
+
+--- sigscheme/configure.in.orig	2013-06-30 04:26:58.000000000 +0000
+++ sigscheme/configure.in
+@@ -226,7 +226,7 @@ AC_CHECK_FUNCS(memalign)
+ AC_CHECK_FUNCS(strdup,
+   [
+     # Overrides _POSIX_C_SOURCE
+-    AC_DEFINE(_XOPEN_SOURCE, 500)
+    AC_DEFINE(_XOPEN_SOURCE, 600)
+   ])
+ AH_VERBATIM(_XOPEN_SOURCE,
+ [/* Define to 500 to enable strdup(3). */
--- a/inputmethod/uim/patches/patch-sigscheme_doc_Makefile.am
+++ b/inputmethod/uim/patches/patch-sigscheme_doc_Makefile.am
@@ -0,0 +1,21 @@
+$NetBSD: patch-sigscheme_doc_Makefile.am,v 1.1 2014/04/20 06:40:00 ryoon Exp $
+
+Avoid to install of document files of sigscheme, conflict with lang/sigscheme.
+
+--- sigscheme/doc/Makefile.am.orig	2013-06-30 04:26:48.000000000 +0000
+++ sigscheme/doc/Makefile.am
+@@ -11,10 +11,10 @@ ASCIIDOC_HTMLS = \
+ EXTRA_DIST =
+ 
+ # Suppress installing documents on combined-source configuration
+-if USE_LIBSSCM
+-dist_doc_DATA  = $(TXTS)
+-dist_html_DATA = $(ASCIIDOC_HTMLS)
+-endif
+#if USE_LIBSSCM
+#dist_doc_DATA  = $(TXTS)
+#dist_html_DATA = $(ASCIIDOC_HTMLS)
+#endif
+ 
+ MAINTAINERCLEANFILES = $(ASCIIDOC_HTMLS)
+ 
--- a/inputmethod/uim/patches/patch-sigscheme_include_sigscheme_Makefile.am
+++ b/inputmethod/uim/patches/patch-sigscheme_include_sigscheme_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-sigscheme_include_sigscheme_Makefile.am,v 1.1 2014/04/20 06:40:00 ryoon Exp $
+
+Avoid to install of header files of sigscheme, conflict with lang/sigscheme.
+
+--- sigscheme/include/sigscheme/Makefile.am.orig	2013-06-30 04:26:48.000000000 +0000
+++ sigscheme/include/sigscheme/Makefile.am
+@@ -4,6 +4,8 @@ BUILT_SOURCES = \
+         sigscheme.h \
+         storage-common.h storage-fatty.h storage-compact.h
+ 
+noinst_HEADERS = $(BUILT_SOURCES)
+
+ config.h: $(top_builddir)/src/config.h
+ 	rm -f $@
+ 	$(LN_S) $< $@
--- a/inputmethod/uim/patches/patch-uim_Makefile.am
+++ b/inputmethod/uim/patches/patch-uim_Makefile.am
@@ -0,0 +1,24 @@
+$NetBSD: patch-uim_Makefile.am,v 1.2 2014/05/31 22:41:32 ryoon Exp $
+
+https://github.com/uim/uim/pull/41
+
+--- uim/Makefile.am.orig	2013-06-30 04:26:20.000000000 +0000
+++ uim/Makefile.am
+@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign
+ 
+ EXTRA_DIST = encoding-table.c test-gc.c version.h.in
+ 
+-uim_defs = -DSCM_FILES=\"$(datadir)/uim\"
+uim_defs = -DSCM_FILES=\"$(sysconfdir)/uim:$(datadir)/uim\"
+ # FIXME: $(UIM_SCM_CFLAGS) should only affect on uim-scm.c
+ CFLAGS = @CFLAGS@ $(UIM_SCM_CFLAGS)
+ # FIXME: $(SCIM_CFLAGS) should only affect on scim.cpp
+@@ -320,7 +320,7 @@ if LIBEDIT
+ endif
+ 
+ uim_module_manager_LIBS =
+-uim_module_manager_CPPFLAGS = $(uim_defs) -I$(top_srcdir) -DUIM_DATADIR=\""$(datadir)/uim"\"
+uim_module_manager_CPPFLAGS = $(uim_defs) -I$(top_srcdir) -DUIM_DATADIR=\""$(datadir)/uim"\" -DUIM_CONFDIR=\""$(sysconfdir)/uim"\"
+ uim_module_manager_CFLAGS =
+ uim_module_manager_LDADD = libuim-scm.la libuim.la
+ uim_module_manager_SOURCES = uim-module-manager.c
--- a/inputmethod/uim/patches/patch-uim_uim-module-manager.c
+++ b/inputmethod/uim/patches/patch-uim_uim-module-manager.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-uim_uim-module-manager.c,v 1.1 2014/04/20 06:40:00 ryoon Exp $
+
+https://github.com/uim/uim/pull/41
+
+--- uim/uim-module-manager.c.orig	2013-06-30 04:26:09.000000000 +0000
+++ uim/uim-module-manager.c
+@@ -47,8 +47,8 @@
+ #include "uim-internal.h"
+ 
+ #define MODULE_LIST_FILENAME UIM_DATADIR"/modules"
+-#define LOADER_SCM_FILENAME  UIM_DATADIR"/loader.scm"
+-#define INSTALLED_MODULES_SCM_FILENAME  UIM_DATADIR"/installed-modules.scm"
+#define LOADER_SCM_FILENAME  UIM_CONFDIR"/loader.scm"
+#define INSTALLED_MODULES_SCM_FILENAME  UIM_CONFDIR"/installed-modules.scm"
+ 
+ static char *path;
+