Received: by mail.netbsd.org (Postfix, from userid 605) id 4B75684E7E; Sat, 20 Jun 2020 07:50:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C6DF484DB1 for ; Sat, 20 Jun 2020 07:50:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Gl8xLEwNzekH for ; Sat, 20 Jun 2020 07:50:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 379EE84D66 for ; Sat, 20 Jun 2020 07:50:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 35441FB28; Sat, 20 Jun 2020 07:50:45 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1592639445214800" MIME-Version: 1.0 Date: Sat, 20 Jun 2020 07:50:45 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/x11/mlterm To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20200620075045.35441FB28@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. --_----------=_1592639445214800 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Sat Jun 20 07:50:45 UTC 2020 Modified Files: pkgsrc/x11/mlterm: PLIST options.mk Log Message: x11/mlterm: fix pkglint warnings To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 pkgsrc/x11/mlterm/PLIST cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/mlterm/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1592639445214800 Content-Disposition: inline Content-Length: 3508 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/mlterm/PLIST diff -u pkgsrc/x11/mlterm/PLIST:1.44 pkgsrc/x11/mlterm/PLIST:1.45 --- pkgsrc/x11/mlterm/PLIST:1.44 Mon Apr 27 15:45:43 2020 +++ pkgsrc/x11/mlterm/PLIST Sat Jun 20 07:50:45 2020 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.44 2020/04/27 15:45:43 tsutsui Exp $ +@comment $NetBSD: PLIST,v 1.45 2020/06/20 07:50:45 rillig Exp $ bin/mlcc bin/mlclient bin/mlclientx @@ -17,23 +17,23 @@ lib/mef/libmef_zh.la lib/mlterm/libathena.la ${PLIST.bidi}lib/mlterm/libctl_bidi.la ${PLIST.ind}lib/mlterm/libctl_iscii.la -${PLIST.canna}lib/mlterm/libim-canna.la ${PLIST.fbfiles}${PLIST.canna}lib/mlterm/libim-canna-fb.la +${PLIST.canna}lib/mlterm/libim-canna.la ${PLIST.fbfiles}${PLIST.fcitx}lib/mlterm/libim-fcitx-fb.la ${PLIST.fcitx}lib/mlterm/libim-fcitx.la -${PLIST.ibus}lib/mlterm/libim-ibus.la ${PLIST.fbfiles}${PLIST.ibus}lib/mlterm/libim-ibus-fb.la -lib/mlterm/libim-kbd.la +${PLIST.ibus}lib/mlterm/libim-ibus.la ${PLIST.fbfiles}lib/mlterm/libim-kbd-fb.la -${PLIST.m17nlib}lib/mlterm/libim-m17nlib.la +lib/mlterm/libim-kbd.la ${PLIST.fbfiles}${PLIST.m17nlib}lib/mlterm/libim-m17nlib-fb.la +${PLIST.m17nlib}lib/mlterm/libim-m17nlib.la ${PLIST.scim}lib/mlterm/libim-scim.la -${PLIST.skk}lib/mlterm/libim-skk.la ${PLIST.fbfiles}${PLIST.skk}lib/mlterm/libim-skk-fb.la -${PLIST.uim}lib/mlterm/libim-uim.la +${PLIST.skk}lib/mlterm/libim-skk.la ${PLIST.fbfiles}${PLIST.uim}lib/mlterm/libim-uim-fb.la -${PLIST.wnn}lib/mlterm/libim-wnn.la +${PLIST.uim}lib/mlterm/libim-uim.la ${PLIST.fbfiles}${PLIST.wnn}lib/mlterm/libim-wnn-fb.la +${PLIST.wnn}lib/mlterm/libim-wnn.la ${PLIST.ind}lib/mlterm/libind_assamese.la ${PLIST.ind}lib/mlterm/libind_bengali.la ${PLIST.ind}lib/mlterm/libind_gujarati.la Index: pkgsrc/x11/mlterm/options.mk diff -u pkgsrc/x11/mlterm/options.mk:1.18 pkgsrc/x11/mlterm/options.mk:1.19 --- pkgsrc/x11/mlterm/options.mk:1.18 Mon Apr 27 15:45:43 2020 +++ pkgsrc/x11/mlterm/options.mk Sat Jun 20 07:50:45 2020 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.18 2020/04/27 15:45:43 tsutsui Exp $ +# $NetBSD: options.mk,v 1.19 2020/06/20 07:50:45 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mlterm PKG_SUPPORTED_OPTIONS= cairo canna fcitx fribidi gdk_pixbuf2 ibus libind m17nlib mlterm-fb mlterm-x68kgrf otl scim skk uim wnn4 xft2 @@ -12,22 +12,22 @@ PKG_SUGGESTED_OPTIONS+= mlterm-fb PLIST_VARS+= bidi cairo canna fb fbfiles fcitx ibus ind m17nlib otl scim skk uim wscons wnn x68kgrf xft2 .if !empty(PKG_OPTIONS:Mmlterm-fb) -. if ${OPSYS} == "NetBSD" -. if ${MACHINE_ARCH} == "m68k" +. if ${OPSYS} == "NetBSD" +. if ${MACHINE_ARCH} == "m68k" PKG_SUGGESTED_OPTIONS+= mlterm-x68kgrf CONFIGURE_ARGS+= --with-gui=xlib,wscons,x68kgrf SPECIAL_PERMS+= ${PREFIX:Q}/bin/mlterm-x68kgrf ${SETUID_ROOT_PERMS} PLIST.x68kgrf= yes -. else # NetBSD && !m68k +. else # NetBSD && !m68k CONFIGURE_ARGS+= --with-gui=xlib,wscons -. endif # NetBSD +. endif SPECIAL_PERMS+= ${PREFIX:Q}/bin/mlterm-wscons ${SETUID_ROOT_PERMS} PLIST.wscons= yes -. else # !NetBSD (i.e. FreeBSD or Linux) +. else # !NetBSD (i.e. FreeBSD or Linux) CONFIGURE_ARGS+= --with-gui=xlib,fb SPECIAL_PERMS+= ${PREFIX:Q}/bin/mlterm-fb ${SETUID_ROOT_PERMS} PLIST.fb= yes -. endif +. endif CONF_FILES+= ${EGDIR}/font-fb ${PKG_SYSCONFDIR}/font-fb PLIST.fbfiles= yes .endif @@ -35,7 +35,6 @@ PLIST.fbfiles= yes .if !empty(PKG_OPTIONS:Mcairo) .include "../../graphics/cairo/buildlink3.mk" PLIST.cairo= yes -.else .endif .if !empty(PKG_OPTIONS:Mcanna) --_----------=_1592639445214800--