CVS commit: pkgsrc/x11/mlterm

["Rin Okuyama" <rin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rin
Date:           Thu Jul  7 12:59:51 UTC 2022

Modified Files:
        pkgsrc/x11/mlterm: Makefile PLIST options.mk

Log Message:
x11/mlterm: Make GTK support optional (default: on).


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 pkgsrc/x11/mlterm/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/x11/mlterm/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/mlterm/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/mlterm/Makefile
diff -u pkgsrc/x11/mlterm/Makefile:1.172 pkgsrc/x11/mlterm/Makefile:1.173
--- pkgsrc/x11/mlterm/Makefile:1.172    Thu Jul  7 00:04:42 2022
+++ pkgsrc/x11/mlterm/Makefile  Thu Jul  7 12:59:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.172 2022/07/07 00:04:42 rin Exp $
+# $NetBSD: Makefile,v 1.173 2022/07/07 12:59:51 rin Exp $
 
 DISTNAME=      mlterm-3.9.2
 DIST_SUBDIR=   ${PKGNAME_NOREV}        # for re-tagged 3.9.2
@@ -23,7 +23,7 @@ USE_PKGLOCALEDIR=     yes
 
 PKG_SYSCONFSUBDIR=     mlterm
 EGDIR=                 ${PREFIX}/share/examples/mlterm
-.for f in aafont color font key main menu taafont termcap tfont vaafont vfont \
+.for f in aafont color font key main taafont termcap tfont vaafont vfont \
        xim
 CONF_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
@@ -84,7 +84,6 @@ post-install:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"

Index: pkgsrc/x11/mlterm/PLIST
diff -u pkgsrc/x11/mlterm/PLIST:1.45 pkgsrc/x11/mlterm/PLIST:1.46
--- pkgsrc/x11/mlterm/PLIST:1.45        Sat Jun 20 07:50:45 2020
+++ pkgsrc/x11/mlterm/PLIST     Thu Jul  7 12:59:51 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.45 2020/06/20 07:50:45 rillig Exp $
+@comment $NetBSD: PLIST,v 1.46 2022/07/07 12:59:51 rin Exp $
 bin/mlcc
 bin/mlclient
 bin/mlclientx
@@ -49,14 +49,14 @@ lib/mlterm/libmotif.la
 lib/mlterm/libmozmodern.la
 lib/mlterm/libnext.la
 ${PLIST.otl}lib/mlterm/libotl.la
-lib/mlterm/libpixmap_engine.la
+${PLIST.gtk}lib/mlterm/libpixmap_engine.la
 lib/mlterm/libsample.la
 ${PLIST.cairo}lib/mlterm/libtype_cairo.la
 ${PLIST.xft2}lib/mlterm/libtype_xft.la
 lib/mlterm/libzmodem.la
-libexec/mlterm/mlconfig
+${PLIST.gtk}libexec/mlterm/mlconfig
 libexec/mlterm/mlimgloader
-libexec/mlterm/mlterm-menu
+${PLIST.gtk}libexec/mlterm/mlterm-menu
 man/man1/mlcc.1
 man/man1/mlclient.1
 man/man1/mlterm.1
@@ -85,29 +85,29 @@ share/examples/mlterm/font
 share/examples/mlterm/font-fb
 share/examples/mlterm/key
 share/examples/mlterm/main
-share/examples/mlterm/menu
+${PLIST.gtk}share/examples/mlterm/menu
 share/examples/mlterm/taafont
 share/examples/mlterm/termcap
 share/examples/mlterm/tfont
 share/examples/mlterm/vaafont
 share/examples/mlterm/vfont
 share/examples/mlterm/xim
-share/locale/ar/LC_MESSAGES/mlconfig.mo
-share/locale/de/LC_MESSAGES/mlconfig.mo
-share/locale/ja/LC_MESSAGES/mlconfig.mo
-share/locale/vi/LC_MESSAGES/mlconfig.mo
-share/locale/zh_TW/LC_MESSAGES/mlconfig.mo
+${PLIST.gtk}share/locale/ar/LC_MESSAGES/mlconfig.mo
+${PLIST.gtk}share/locale/de/LC_MESSAGES/mlconfig.mo
+${PLIST.gtk}share/locale/ja/LC_MESSAGES/mlconfig.mo
+${PLIST.gtk}share/locale/vi/LC_MESSAGES/mlconfig.mo
+${PLIST.gtk}share/locale/zh_TW/LC_MESSAGES/mlconfig.mo
 ${PLIST.fbfiles}share/mlterm/kbd/kbd.six
 ${PLIST.fbfiles}share/mlterm/kbd/pressed_kbd.six
-share/mlterm/scrollbars/sample3/bg_body.png
-share/mlterm/scrollbars/sample3/bg_bottom.png
-share/mlterm/scrollbars/sample3/bg_top.png
-share/mlterm/scrollbars/sample3/button_down.png
-share/mlterm/scrollbars/sample3/button_down_pressed.png
-share/mlterm/scrollbars/sample3/button_up.png
-share/mlterm/scrollbars/sample3/button_up_pressed.png
-share/mlterm/scrollbars/sample3/rc
-share/mlterm/scrollbars/sample3/slider_body.png
-share/mlterm/scrollbars/sample3/slider_bottom.png
-share/mlterm/scrollbars/sample3/slider_knob.png
-share/mlterm/scrollbars/sample3/slider_top.png
+${PLIST.gtk}share/mlterm/scrollbars/sample3/bg_body.png
+${PLIST.gtk}share/mlterm/scrollbars/sample3/bg_bottom.png
+${PLIST.gtk}share/mlterm/scrollbars/sample3/bg_top.png
+${PLIST.gtk}share/mlterm/scrollbars/sample3/button_down.png
+${PLIST.gtk}share/mlterm/scrollbars/sample3/button_down_pressed.png
+${PLIST.gtk}share/mlterm/scrollbars/sample3/button_up.png
+${PLIST.gtk}share/mlterm/scrollbars/sample3/button_up_pressed.png
+${PLIST.gtk}share/mlterm/scrollbars/sample3/rc
+${PLIST.gtk}share/mlterm/scrollbars/sample3/slider_body.png
+${PLIST.gtk}share/mlterm/scrollbars/sample3/slider_bottom.png
+${PLIST.gtk}share/mlterm/scrollbars/sample3/slider_knob.png
+${PLIST.gtk}share/mlterm/scrollbars/sample3/slider_top.png

Index: pkgsrc/x11/mlterm/options.mk
diff -u pkgsrc/x11/mlterm/options.mk:1.21 pkgsrc/x11/mlterm/options.mk:1.22
--- pkgsrc/x11/mlterm/options.mk:1.21   Sat Jul  2 03:11:43 2022
+++ pkgsrc/x11/mlterm/options.mk        Thu Jul  7 12:59:51 2022
@@ -1,15 +1,15 @@
-# $NetBSD: options.mk,v 1.21 2022/07/02 03:11:43 rin Exp $
+# $NetBSD: options.mk,v 1.22 2022/07/07 12:59:51 rin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mlterm
-PKG_SUPPORTED_OPTIONS= cairo canna fcitx fribidi gdk_pixbuf2 ibus libind m17nlib mlterm-fb otl scim skk uim wnn4 xft2 debug
-PKG_SUGGESTED_OPTIONS= cairo fribidi gdk_pixbuf2 m17nlib otl xft2
+PKG_SUPPORTED_OPTIONS= cairo canna fcitx fribidi gdk_pixbuf2 gtk ibus libind m17nlib mlterm-fb otl scim skk uim wnn4 xft2 debug
+PKG_SUGGESTED_OPTIONS= cairo fribidi gdk_pixbuf2 gtk 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
+PLIST_VARS+=           bidi cairo canna fb fbfiles fcitx gtk ibus ind m17nlib otl scim skk uim wscons wnn x68kgrf xft2
 
 .if !empty(PKG_OPTIONS:Mmlterm-fb)
 .  if ${OPSYS} == "NetBSD"
@@ -57,6 +57,15 @@ CONFIGURE_ARGS+=     --with-imagelib=gdk-pix
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .endif
 
+.if !empty(PKG_OPTIONS:Mgtk)
+.include "../../x11/gtk3/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-gtk=3
+CONF_FILES+=           ${EGDIR}/menu ${PKG_SYSCONFDIR}/menu
+PLIST.gtk=             yes
+.else
+CONFIGURE_ARGS+=       --with-gtk=no
+.endif
+
 .if !empty(PKG_OPTIONS:Mfcitx)
 .include "../../inputmethod/fcitx/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-fcitx