diff options
author | rillig <rillig@pkgsrc.org> | 2020-06-20 07:50:45 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2020-06-20 07:50:45 +0000 |
commit | adc1451c912e34c8e781aea8795815cd7a06f37f (patch) | |
tree | f167fd76af012026a87f6efb0651e66833f5c4ad /x11 | |
parent | 017a886bbc71b3ba1e0063fc99137fd2707866a3 (diff) | |
download | pkgsrc-adc1451c912e34c8e781aea8795815cd7a06f37f.tar.gz |
x11/mlterm: fix pkglint warnings
Diffstat (limited to 'x11')
-rw-r--r-- | x11/mlterm/PLIST | 16 | ||||
-rw-r--r-- | x11/mlterm/options.mk | 15 |
2 files changed, 15 insertions, 16 deletions
diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST index 4b1db04557d..b0ceb59374c 100644 --- a/x11/mlterm/PLIST +++ b/x11/mlterm/PLIST @@ -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 diff --git a/x11/mlterm/options.mk b/x11/mlterm/options.mk index 3d215273199..43c82e8a531 100644 --- a/x11/mlterm/options.mk +++ b/x11/mlterm/options.mk @@ -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) |