 @@ -1,49 +1,49 @@
-@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
 bin/mlfc
 bin/mlterm
 ${PLIST.fb}bin/mlterm-fb
 ${PLIST.wscons}bin/mlterm-wscons
 ${PLIST.x68kgrf}bin/mlterm-x68kgrf
 lib/libmef.la
 lib/libmlterm_${CORE}.la
 lib/libpobl.la
 lib/mef/libmef_8bits.la
 lib/mef/libmef_jajp.la
 lib/mef/libmef_kokr.la
 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
 ${PLIST.ind}lib/mlterm/libind_hindi.la
 ${PLIST.ind}lib/mlterm/libind_iitkeyb.la
 ${PLIST.ind}lib/mlterm/libind_inscript.la
 ${PLIST.ind}lib/mlterm/libind_kannada.la
 ${PLIST.ind}lib/mlterm/libind_malayalam.la
 ${PLIST.ind}lib/mlterm/libind_oriya.la
 ${PLIST.ind}lib/mlterm/libind_punjabi.la
 ${PLIST.ind}lib/mlterm/libind_telugu.la
 lib/mlterm/libmotif.la
 lib/mlterm/libmozmodern.la

 @@ -1,51 +1,50 @@
-# $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
 PKG_SUGGESTED_OPTIONS=	cairo fribidi gdk_pixbuf2 m17nlib otl xft2
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=	mlterm-fb
 .endif
 .include "../../mk/bsd.options.mk"
 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 ${OPSYS} == "NetBSD"
-.  if ${MACHINE_ARCH} == "m68k"
+.    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
 .if !empty(PKG_OPTIONS:Mcairo)
 .include "../../graphics/cairo/buildlink3.mk"
 PLIST.cairo=		yes
 .else
 .endif
 .if !empty(PKG_OPTIONS:Mcanna)
 .include "../../inputmethod/canna-lib/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-canna
 PLIST.canna=		yes
 .else
 CONFIGURE_ARGS+=	--disable-canna
 .endif
 .if !empty(PKG_OPTIONS:Mfribidi)
 .include "../../converters/fribidi/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-fribidi