Bump PKGREVISION

Use loader.scm and installed-modules.scm from ${PREFIX}/etc/uim

They are changed by uim-module-manager during installation.
They should not be in ${PREFIX}/share.

I have changed hack for SunOS. My change may break SunOS build.
I will fix the breakage.

13 files changed, 131 insertions, 103 deletions

diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index f96518ce412..7c1a1f75789 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.93 2014/04/10 06:21:29 obache Exp $
+# $NetBSD: Makefile,v 1.94 2014/04/20 06:40:00 ryoon Exp $
 #
 
 .include "../../inputmethod/uim/Makefile.common"
 
-PKGREVISION=		10
+PKGREVISION=		11
 COMMENT=		Multilingual input method library
 #LICENSE=		See ${WRKSRC}/COPYING
 
@@ -18,21 +18,19 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-emacs
 CONFIGURE_ARGS+=	--with-libgcroots=installed
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	SunOS_LDFLAGS="-shared -mimpure-text"
+LDFLAGS.SunOS+=	-shared -mimpure-text
 CFLAGS.SunOS+=	-std=c99 -D__EXTENSIONS__
-.endif
 
 .include "options.mk"
 
+MAKE_DIRS+=		etc/uim
 INSTALLATION_DIRS+=	share/doc/uim share/examples/uim
 
 EGDIR=			${PREFIX}/share/examples/uim
 CONF_FILES=		${EGDIR}/loader.scm.example \
-			${PREFIX}/share/uim/loader.scm
+			${PKG_SYSCONFDIR}/uim/loader.scm
 CONF_FILES+=		${EGDIR}/installed-modules.scm.example \
-			${PREFIX}/share/uim/installed-modules.scm
+			${PKG_SYSCONFDIR}/uim/installed-modules.scm
 
 post-install:
 # Register uim module infomation
@@ -51,9 +49,9 @@ post-install:
 	${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 \
+	${MV} ${DESTDIR}${PREFIX}/etc/uim/loader.scm \
 		${DESTDIR}${EGDIR}/loader.scm.example
-	${MV} ${DESTDIR}${PREFIX}/share/uim/installed-modules.scm \
+	${MV} ${DESTDIR}${PREFIX}/etc/uim/installed-modules.scm \
 		${DESTDIR}${EGDIR}/installed-modules.scm.example
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/inputmethod/uim/Makefile.common b/inputmethod/uim/Makefile.common
index 2288d10cf9f..2d55444ed72 100644
--- 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
diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo
index 2e87511a01e..f71f061afed 100644
--- a/inputmethod/uim/distinfo
+++ b/inputmethod/uim/distinfo
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.26 2014/02/02 10:47:24 obache Exp $
+$NetBSD: distinfo,v 1.27 2014/04/20 06:40:00 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) = 5967417e15380e724826f17578a36e77b93bb978
+SHA1 (patch-sigscheme_configure.in) = 4b871ea0b935c0b14770fa4213893226fe1f1aff
+SHA1 (patch-sigscheme_doc_Makefile.am) = 2287e8a9ef2af5f6309ee0a68baefc0ef0e3349d
+SHA1 (patch-sigscheme_include_sigscheme_Makefile.am) = f27b85c23374c443f7b91237145743c0ac64bac5
+SHA1 (patch-uim_Makefile.am) = ff17e13379803305102eda52001c8f07fbba14e4
+SHA1 (patch-uim_uim-module-manager.c) = 574a2bfc99fc93b437afa5b2893c39ab3633d39a
diff --git a/inputmethod/uim/patches/patch-ab b/inputmethod/uim/patches/patch-ab
deleted file mode 100644
index 96559560fba..00000000000
--- a/inputmethod/uim/patches/patch-ab
+++ /dev/null
@@ -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
diff --git a/inputmethod/uim/patches/patch-ac b/inputmethod/uim/patches/patch-ac
deleted file mode 100644
index df8620518bd..00000000000
--- a/inputmethod/uim/patches/patch-ac
+++ /dev/null
@@ -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@
diff --git a/inputmethod/uim/patches/patch-ad b/inputmethod/uim/patches/patch-ad
deleted file mode 100644
index c499fcf1d4d..00000000000
--- a/inputmethod/uim/patches/patch-ad
+++ /dev/null
@@ -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) \
diff --git a/inputmethod/uim/patches/patch-ae b/inputmethod/uim/patches/patch-ae
deleted file mode 100644
index 07c9272068b..00000000000
--- a/inputmethod/uim/patches/patch-ae
+++ /dev/null
@@ -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
diff --git a/inputmethod/uim/patches/patch-scm_Makefile.am b/inputmethod/uim/patches/patch-scm_Makefile.am
new file mode 100644
index 00000000000..0324b8a3a27
--- /dev/null
+++ 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 \
diff --git a/inputmethod/uim/patches/patch-sigscheme_configure.in b/inputmethod/uim/patches/patch-sigscheme_configure.in
new file mode 100644
index 00000000000..2d0dc467168
--- /dev/null
+++ 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). */
diff --git a/inputmethod/uim/patches/patch-sigscheme_doc_Makefile.am b/inputmethod/uim/patches/patch-sigscheme_doc_Makefile.am
new file mode 100644
index 00000000000..de41b16df0c
--- /dev/null
+++ 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)
+ 
diff --git a/inputmethod/uim/patches/patch-sigscheme_include_sigscheme_Makefile.am b/inputmethod/uim/patches/patch-sigscheme_include_sigscheme_Makefile.am
new file mode 100644
index 00000000000..9b8c3b0d133
--- /dev/null
+++ 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) $< $@
diff --git a/inputmethod/uim/patches/patch-uim_Makefile.am b/inputmethod/uim/patches/patch-uim_Makefile.am
new file mode 100644
index 00000000000..caca5c0569f
--- /dev/null
+++ b/inputmethod/uim/patches/patch-uim_Makefile.am
@@ -0,0 +1,24 @@
+$NetBSD: patch-uim_Makefile.am,v 1.1 2014/04/20 06:40:00 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=\"$(datadir)/uim:$(sysconfdir)/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
diff --git a/inputmethod/uim/patches/patch-uim_uim-module-manager.c b/inputmethod/uim/patches/patch-uim_uim-module-manager.c
new file mode 100644
index 00000000000..14e853be0a4
--- /dev/null
+++ 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;
+