diff options
| author | ryoon <ryoon@pkgsrc.org> | 2019-11-05 17:13:10 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2019-11-05 17:13:10 +0000 |
| commit | 78617302679e59222bf8be2ccb2db11046dd39b1 (patch) | |
| tree | a906dd92b3b274e913b689d615ab3cdb766bf024 | |
| parent | 042ac48e987aa94dba47f12a1b7c8cf223e1aa6c (diff) | |
| download | pkgsrc-78617302679e59222bf8be2ccb2db11046dd39b1.tar.gz | |
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.
| -rw-r--r-- | inputmethod/uim/Makefile | 7 | ||||
| -rw-r--r-- | inputmethod/uim/Makefile.common | 5 | ||||
| -rw-r--r-- | inputmethod/uim/patches/patch-sigscheme_configure | 13 |
3 files changed, 9 insertions, 16 deletions
diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile index 75729bdfde3..6904062b938 100644 --- a/inputmethod/uim/Makefile +++ b/inputmethod/uim/Makefile @@ -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 @@ CONFLICTS+= uim-qt4-immodule-[0-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 @@ CONF_FILES+= ${EGDIR}/installed-modules.scm \ 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 --git a/inputmethod/uim/Makefile.common b/inputmethod/uim/Makefile.common index c85f498efdd..4d184eb11f5 100644 --- a/inputmethod/uim/Makefile.common +++ b/inputmethod/uim/Makefile.common @@ -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 --git a/inputmethod/uim/patches/patch-sigscheme_configure b/inputmethod/uim/patches/patch-sigscheme_configure deleted file mode 100644 index 94c10d24b5c..00000000000 --- a/inputmethod/uim/patches/patch-sigscheme_configure +++ /dev/null @@ -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 |