[pkgsrc/trunk]: pkgsrc/inputmethod/uim Fix build and uim-elisp

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5acd8922166a
branches:  trunk
changeset: 343525:5acd8922166a
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Tue Nov 05 17:13:10 2019 +0000

description:
Fix build and uim-elisp

* Restore UIM_VERSION. It is used uim-elisp package
* Fix segfault of uim-module-manager during build.
* Remove an unused patch.

diffstat:

 inputmethod/uim/Makefile                          |   7 ++++++-
 inputmethod/uim/Makefile.common                   |   5 +++--
 inputmethod/uim/patches/patch-sigscheme_configure |  13 -------------
 3 files changed, 9 insertions(+), 16 deletions(-)

diffs (61 lines):

diff -r 00ff0bce9213 -r 5acd8922166a inputmethod/uim/Makefile
--- a/inputmethod/uim/Makefile  Tue Nov 05 15:37:51 2019 +0000
+++ b/inputmethod/uim/Makefile  Tue Nov 05 17:13:10 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.154 2019/11/01 16:21:11 nia Exp $
+# $NetBSD: Makefile,v 1.155 2019/11/05 17:13:10 ryoon Exp $
 
 .include "../../inputmethod/uim/Makefile.common"
 
@@ -10,6 +10,9 @@
 GNU_CONFIGURE= YES
 USE_LIBTOOL=   YES
 
+# Do not segfault uim-module-manager during build
+BUILDLINK_TRANSFORM+=  opt:-O2:-O1
+
 USE_TOOLS+=    gmake pkg-config
 USE_TOOLS+=    intltool msgfmt msgmerge xgettext
 USE_LANGUAGES= c99 c++03
@@ -49,6 +52,8 @@
 PKG_SYSCONFSUBDIR=     uim
 INSTALLATION_DIRS+=    share/doc/uim
 
+NOT_PAX_MPROTECT_SAFE+=        bin/uim-module-manager
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/uim
        ${INSTALL_DATA} ${WRKSRC}/doc/COMPATIBILITY ${DESTDIR}${PREFIX}/share/doc/uim
diff -r 00ff0bce9213 -r 5acd8922166a inputmethod/uim/Makefile.common
--- a/inputmethod/uim/Makefile.common   Tue Nov 05 15:37:51 2019 +0000
+++ b/inputmethod/uim/Makefile.common   Tue Nov 05 17:13:10 2019 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.14 2019/11/01 16:21:11 nia Exp $
+# $NetBSD: Makefile.common,v 1.15 2019/11/05 17:13:10 ryoon Exp $
 #
 # used by inputmethod/uim/Makefile
 # used by inputmethod/uim-elisp/Makefile
 
-DISTNAME=      uim-1.8.8
+UIM_VERSION=   1.8.8
+DISTNAME=      uim-${UIM_VERSION}
 CATEGORIES=    inputmethod
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=uim/}
 GITHUB_RELEASE=        ${DISTNAME:S/^uim-//1}
diff -r 00ff0bce9213 -r 5acd8922166a inputmethod/uim/patches/patch-sigscheme_configure
--- a/inputmethod/uim/patches/patch-sigscheme_configure Tue Nov 05 15:37:51 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$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