Received: by mail.netbsd.org (Postfix, from userid 605) id C8DEF84D9C; Tue, 5 Nov 2019 17:13:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4DBC284D94 for ; Tue, 5 Nov 2019 17:13:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id eqFqI6KqPLLV for ; Tue, 5 Nov 2019 17:13:10 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id C84BA84D8B for ; Tue, 5 Nov 2019 17:13:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C1ED7FA93; Tue, 5 Nov 2019 17:13:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1572973990114890" MIME-Version: 1.0 Date: Tue, 5 Nov 2019 17:13:10 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/inputmethod/uim To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20191105171310.C1ED7FA93@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1572973990114890 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Tue Nov 5 17:13:10 UTC 2019 Modified Files: pkgsrc/inputmethod/uim: Makefile Makefile.common Removed Files: pkgsrc/inputmethod/uim/patches: patch-sigscheme_configure Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 pkgsrc/inputmethod/uim/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/inputmethod/uim/Makefile.common cvs rdiff -u -r1.1 -r0 \ pkgsrc/inputmethod/uim/patches/patch-sigscheme_configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1572973990114890 Content-Disposition: inline Content-Length: 1773 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/inputmethod/uim/Makefile diff -u pkgsrc/inputmethod/uim/Makefile:1.154 pkgsrc/inputmethod/uim/Makefile:1.155 --- pkgsrc/inputmethod/uim/Makefile:1.154 Fri Nov 1 16:21:11 2019 +++ pkgsrc/inputmethod/uim/Makefile Tue Nov 5 17:13:10 2019 @@ -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 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 Index: pkgsrc/inputmethod/uim/Makefile.common diff -u pkgsrc/inputmethod/uim/Makefile.common:1.14 pkgsrc/inputmethod/uim/Makefile.common:1.15 --- pkgsrc/inputmethod/uim/Makefile.common:1.14 Fri Nov 1 16:21:11 2019 +++ pkgsrc/inputmethod/uim/Makefile.common Tue Nov 5 17:13:10 2019 @@ -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} --_----------=_1572973990114890--