diff options
| -rw-r--r-- | pkgbuild.files/make.conf | 3 | ||||
| -rw-r--r-- | pkgbuild.h | 2 | ||||
| -rw-r--r-- | wsarch/wsarch.pkg | 1 | ||||
| -rw-r--r-- | wsbsd.files/make.conf | 3 | ||||
| -rw-r--r-- | wsbsd/wsbsd.pkg | 3 | ||||
| -rw-r--r-- | wscommon.h | 2 | ||||
| -rw-r--r-- | wslinux/wslinux.pkg | 1 |
7 files changed, 8 insertions, 7 deletions
diff --git a/pkgbuild.files/make.conf b/pkgbuild.files/make.conf index a6f63e0..fd9ff9d 100644 --- a/pkgbuild.files/make.conf +++ b/pkgbuild.files/make.conf @@ -13,8 +13,7 @@ DEFAULT_VERSIONS+= pgsql=11 bdb=5 # packages options devel_git_SET= SUBVERSION -editors_vim_SET= PERL PYTHON RUBY CONSOLE -editors_vim_UNSET= ATHENA GNOME GTK2 GTK3 MOTIF X11 +editors_vim_SET= PERL PYTHON RUBY shells_bash_SET= FDESCFS HELP www_lighttpd_SET= LDAP WEBDAV www_trac_UNSET= SVN @@ -1,7 +1,7 @@ // Basic packages bash bash-completion bind-tools cmdwatch git groff htop ldapvi lighttpd lsof ncdu portlint pstree py38-ranger rsync screen - subversion sudo texinfo tig tree vim w3m wget + subversion sudo texinfo tig tree vim@console w3m wget // Poudriere poudriere dialog4ports diff --git a/wsarch/wsarch.pkg b/wsarch/wsarch.pkg index 8d0e9db..c79926f 100644 --- a/wsarch/wsarch.pkg +++ b/wsarch/wsarch.pkg @@ -108,6 +108,7 @@ #define EMACS emacs emacs-python-mode #define LIBREOFFICE libreoffice-fresh libreoffice-fresh-sdk \ libreoffice-fresh-zh-TW +#define VIM vim #define VIM_GTK gvim // Electronics diff --git a/wsbsd.files/make.conf b/wsbsd.files/make.conf index 122f389..e0e92e9 100644 --- a/wsbsd.files/make.conf +++ b/wsbsd.files/make.conf @@ -84,8 +84,7 @@ dns_libpsl_UNSET= IDN editors_emacs_UNSET= ALSA editors_libreoffice_SET= GTK2 GTK3 JAVA KF5 MARIADB MMEDIA \ PGSQL SDK SYSTRAY QT5 WEBDAV -editors_vim_SET= GTK3 LUA PERL PYTHON RUBY -editors_vim_UNSET= GTK2 X11 +editors_vim_SET= LUA PERL PYTHON RUBY emulators_qemu_SET= GNUTLS SAMBA USBREDIR ftp_curl_SET= BROTLI HTTP2 METALINK PROXY PSL ftp_wget_SET= METALINK PSL diff --git a/wsbsd/wsbsd.pkg b/wsbsd/wsbsd.pkg index 8990e30..59a8c74 100644 --- a/wsbsd/wsbsd.pkg +++ b/wsbsd/wsbsd.pkg @@ -118,7 +118,8 @@ #define CTAGS ctags #define EMACS emacs@EMACS_FLAVOR python-mode.el #define LIBREOFFICE libreoffice zh_TW-libreoffice -#define VIM_GTK vim +#define VIM NULL // vim-gtk3 already provides the vim command +#define VIM_GTK vim-gtk3@gtk3 // Electronics // Fonts @@ -133,7 +133,7 @@ GCC_DOC // added by b01902062@csie.ntu.edu.tw // Editors #ifdef WSPKG_EDITORS CTAGS EMACS joe LIBREOFFICE nano -vim VIM_GTK +VIM VIM_GTK cscope global // added by b01902062@csie.ntu.edu.tw #endif diff --git a/wslinux/wslinux.pkg b/wslinux/wslinux.pkg index 5f60058..f0c8a8d 100644 --- a/wslinux/wslinux.pkg +++ b/wslinux/wslinux.pkg @@ -121,6 +121,7 @@ #define EMACS emacs python-mode #define LIBREOFFICE libreoffice \ libreoffice-l10n-zh-tw libreoffice-help-zh-tw +#define VIM vim #define VIM_GTK vim-gtk // Electronics |