Tue Nov 5 17:13:10 2019 UTC ()
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.


(ryoon)
diff -r1.154 -r1.155 pkgsrc/inputmethod/uim/Makefile
diff -r1.14 -r1.15 pkgsrc/inputmethod/uim/Makefile.common
diff -r1.1 -r0 pkgsrc/inputmethod/uim/patches/patch-sigscheme_configure
cvs diff -r1.154 -r1.155 pkgsrc/inputmethod/uim/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim/Makefile 2019/11/01 16:21:11 1.154
+++ pkgsrc/inputmethod/uim/Makefile 2019/11/05 17:13:10 1.155
@@ -1,25 +1,28 @@ @@ -1,25 +1,28 @@
1# $NetBSD: Makefile,v 1.154 2019/11/01 16:21:11 nia Exp $ 1# $NetBSD: Makefile,v 1.155 2019/11/05 17:13:10 ryoon Exp $
2 2
3.include "../../inputmethod/uim/Makefile.common" 3.include "../../inputmethod/uim/Makefile.common"
4 4
5COMMENT= Multilingual input method library 5COMMENT= Multilingual input method library
6LICENSE= modified-bsd 6LICENSE= modified-bsd
7 7
8CONFLICTS+= uim-qt4-immodule-[0-9]* 8CONFLICTS+= uim-qt4-immodule-[0-9]*
9 9
10GNU_CONFIGURE= YES 10GNU_CONFIGURE= YES
11USE_LIBTOOL= YES 11USE_LIBTOOL= YES
12 12
 13# Do not segfault uim-module-manager during build
 14BUILDLINK_TRANSFORM+= opt:-O2:-O1
 15
13USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
14USE_TOOLS+= intltool msgfmt msgmerge xgettext 17USE_TOOLS+= intltool msgfmt msgmerge xgettext
15USE_LANGUAGES= c99 c++03 18USE_LANGUAGES= c99 c++03
16 19
17# Avoid finding mono tool and breaking. 20# Avoid finding mono tool and breaking.
18MAKE_FLAGS+= CSI= 21MAKE_FLAGS+= CSI=
19 22
20LDFLAGS.SunOS+= -mimpure-text 23LDFLAGS.SunOS+= -mimpure-text
21CFLAGS.SunOS+= -D__EXTENSIONS__ 24CFLAGS.SunOS+= -D__EXTENSIONS__
22 25
23UIM_MODULES= anthy-utf8 skk tutcode byeoru latin elatin xmload \ 26UIM_MODULES= anthy-utf8 skk tutcode byeoru latin elatin xmload \
24 pyload py pyunihan viqr ipa-x-sampa look ajax-ime \ 27 pyload py pyunihan viqr ipa-x-sampa look ajax-ime \
25 google-cgiapi-jp baidu-olime-jp 28 google-cgiapi-jp baidu-olime-jp
@@ -39,26 +42,28 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSC @@ -39,26 +42,28 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSC
39PKGCONFIG_OVERRIDE+= ${WRKSRC}/uim.pc.in 42PKGCONFIG_OVERRIDE+= ${WRKSRC}/uim.pc.in
40 43
41INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples 44INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
42 45
43EGDIR= ${PREFIX}/share/examples/uim 46EGDIR= ${PREFIX}/share/examples/uim
44CONF_FILES= ${EGDIR}/loader.scm \ 47CONF_FILES= ${EGDIR}/loader.scm \
45 ${PKG_SYSCONFDIR}/loader.scm 48 ${PKG_SYSCONFDIR}/loader.scm
46CONF_FILES+= ${EGDIR}/installed-modules.scm \ 49CONF_FILES+= ${EGDIR}/installed-modules.scm \
47 ${PKG_SYSCONFDIR}/installed-modules.scm 50 ${PKG_SYSCONFDIR}/installed-modules.scm
48 51
49PKG_SYSCONFSUBDIR= uim 52PKG_SYSCONFSUBDIR= uim
50INSTALLATION_DIRS+= share/doc/uim 53INSTALLATION_DIRS+= share/doc/uim
51 54
 55NOT_PAX_MPROTECT_SAFE+= bin/uim-module-manager
 56
52post-install: 57post-install:
53 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/uim 58 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/uim
54 ${INSTALL_DATA} ${WRKSRC}/doc/COMPATIBILITY ${DESTDIR}${PREFIX}/share/doc/uim 59 ${INSTALL_DATA} ${WRKSRC}/doc/COMPATIBILITY ${DESTDIR}${PREFIX}/share/doc/uim
55 ${INSTALL_DATA} ${WRKSRC}/doc/CUSTOM ${DESTDIR}${PREFIX}/share/doc/uim 60 ${INSTALL_DATA} ${WRKSRC}/doc/CUSTOM ${DESTDIR}${PREFIX}/share/doc/uim
56 ${INSTALL_DATA} ${WRKSRC}/doc/DOT-UIM ${DESTDIR}${PREFIX}/share/doc/uim 61 ${INSTALL_DATA} ${WRKSRC}/doc/DOT-UIM ${DESTDIR}${PREFIX}/share/doc/uim
57 ${INSTALL_DATA} ${WRKSRC}/doc/HELPER-CANDWIN ${DESTDIR}${PREFIX}/share/doc/uim 62 ${INSTALL_DATA} ${WRKSRC}/doc/HELPER-CANDWIN ${DESTDIR}${PREFIX}/share/doc/uim
58 ${INSTALL_DATA} ${WRKSRC}/doc/HELPER-PROTOCOL ${DESTDIR}${PREFIX}/share/doc/uim 63 ${INSTALL_DATA} ${WRKSRC}/doc/HELPER-PROTOCOL ${DESTDIR}${PREFIX}/share/doc/uim
59 ${INSTALL_DATA} ${WRKSRC}/doc/KEY ${DESTDIR}${PREFIX}/share/doc/uim 64 ${INSTALL_DATA} ${WRKSRC}/doc/KEY ${DESTDIR}${PREFIX}/share/doc/uim
60 ${INSTALL_DATA} ${WRKSRC}/doc/PLUGIN ${DESTDIR}${PREFIX}/share/doc/uim 65 ${INSTALL_DATA} ${WRKSRC}/doc/PLUGIN ${DESTDIR}${PREFIX}/share/doc/uim
61 ${INSTALL_DATA} ${WRKSRC}/doc/UIM-SCM ${DESTDIR}${PREFIX}/share/doc/uim 66 ${INSTALL_DATA} ${WRKSRC}/doc/UIM-SCM ${DESTDIR}${PREFIX}/share/doc/uim
62 ${INSTALL_DATA} ${WRKSRC}/doc/UIM-SH ${DESTDIR}${PREFIX}/share/doc/uim 67 ${INSTALL_DATA} ${WRKSRC}/doc/UIM-SH ${DESTDIR}${PREFIX}/share/doc/uim
63 68
64.include "options.mk" 69.include "options.mk"
cvs diff -r1.14 -r1.15 pkgsrc/inputmethod/uim/Makefile.common (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim/Makefile.common 2019/11/01 16:21:11 1.14
+++ pkgsrc/inputmethod/uim/Makefile.common 2019/11/05 17:13:10 1.15
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile.common,v 1.14 2019/11/01 16:21:11 nia Exp $ 1# $NetBSD: Makefile.common,v 1.15 2019/11/05 17:13:10 ryoon Exp $
2# 2#
3# used by inputmethod/uim/Makefile 3# used by inputmethod/uim/Makefile
4# used by inputmethod/uim-elisp/Makefile 4# used by inputmethod/uim-elisp/Makefile
5 5
6DISTNAME= uim-1.8.8 6UIM_VERSION= 1.8.8
 7DISTNAME= uim-${UIM_VERSION}
7CATEGORIES= inputmethod 8CATEGORIES= inputmethod
8MASTER_SITES= ${MASTER_SITE_GITHUB:=uim/} 9MASTER_SITES= ${MASTER_SITE_GITHUB:=uim/}
9GITHUB_RELEASE= ${DISTNAME:S/^uim-//1} 10GITHUB_RELEASE= ${DISTNAME:S/^uim-//1}
10EXTRACT_SUFX= .tar.bz2 11EXTRACT_SUFX= .tar.bz2
11 12
12MAINTAINER= VEG03617@nifty.com 13MAINTAINER= VEG03617@nifty.com
13HOMEPAGE= https://github.com/uim/uim/wiki 14HOMEPAGE= https://github.com/uim/uim/wiki
14 15
15DISTINFO_FILE= ${.CURDIR}/../../inputmethod/uim/distinfo 16DISTINFO_FILE= ${.CURDIR}/../../inputmethod/uim/distinfo
16PATCHDIR= ${.CURDIR}/../../inputmethod/uim/patches 17PATCHDIR= ${.CURDIR}/../../inputmethod/uim/patches
17 18
18USE_TOOLS+= autoreconf autoconf automake 19USE_TOOLS+= autoreconf autoconf automake
19 20
File Deleted: pkgsrc/inputmethod/uim/patches/Attic/patch-sigscheme_configure