From owner-dev-commits-ports-main@freebsd.org Thu Sep 2 18:10:27 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 65A7B6633F3; Thu, 2 Sep 2021 18:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H0pr31Wjwz3qyr; Thu, 2 Sep 2021 18:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1C3891D2DA; Thu, 2 Sep 2021 18:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 182IARW1051699; Thu, 2 Sep 2021 18:10:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 182IARgY051698; Thu, 2 Sep 2021 18:10:27 GMT (envelope-from git) Date: Thu, 2 Sep 2021 18:10:27 GMT Message-Id: <202109021810.182IARgY051698@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: 58f45200bc83 - main - many: Depend on vim instead of vim-console MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58f45200bc83594c793dab6d1bb65347f061c6bf Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Sep 2021 18:10:27 -0000 The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=58f45200bc83594c793dab6d1bb65347f061c6bf commit 58f45200bc83594c793dab6d1bb65347f061c6bf Author: Adam Weinberger AuthorDate: 2021-09-02 18:09:29 +0000 Commit: Adam Weinberger CommitDate: 2021-09-02 18:09:29 +0000 many: Depend on vim instead of vim-console --- audio/fluida-lv2/Makefile | 2 +- audio/mamba/Makefile | 2 +- audio/spectacle-lv2/Makefile | 2 +- databases/xtrabackup8/Makefile | 2 +- devel/fb-adb/Makefile | 2 +- mail/rubygem-vmail/Makefile | 2 +- science/kim-api/Makefile | 2 +- science/openkim-models/Makefile | 2 +- science/plumed/Makefile | 2 +- sysutils/amtc/Makefile | 2 +- sysutils/vimpager/Makefile | 6 ++---- 11 files changed, 12 insertions(+), 14 deletions(-) diff --git a/audio/fluida-lv2/Makefile b/audio/fluida-lv2/Makefile index c86e3ba026f0..536b0e0593c2 100644 --- a/audio/fluida-lv2/Makefile +++ b/audio/fluida-lv2/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= lv2>0:audio/lv2 \ - xxd:editors/vim-console + xxd:editors/vim LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth USES= compiler:c++11-lang gettext-runtime gmake gnome localbase pkgconfig xorg diff --git a/audio/mamba/Makefile b/audio/mamba/Makefile index b954b7931242..a048822a6841 100644 --- a/audio/mamba/Makefile +++ b/audio/mamba/Makefile @@ -10,7 +10,7 @@ COMMENT= Virtual MIDI keyboard LICENSE= BSD0CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= xxd:editors/vim-console +BUILD_DEPENDS= xxd:editors/vim LIB_DEPENDS= libasound.so:audio/alsa-lib \ libfluidsynth.so:audio/fluidsynth \ libjack.so:audio/jack \ diff --git a/audio/spectacle-lv2/Makefile b/audio/spectacle-lv2/Makefile index 567b65177bac..12a553fc6052 100644 --- a/audio/spectacle-lv2/Makefile +++ b/audio/spectacle-lv2/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= lv2>0:audio/lv2 \ bash:shells/bash \ ${LOCALBASE}/include/fftw3.h:math/fftw3 \ - xxd:editors/vim-console + xxd:editors/vim LIB_DEPENDS= libfftw3f.so:math/fftw3-float USES= compiler:c++0x gl gmake gnome pkgconfig shebangfix xorg diff --git a/databases/xtrabackup8/Makefile b/databases/xtrabackup8/Makefile index dc4ff4a569c3..dd5bd8aa1fbc 100644 --- a/databases/xtrabackup8/Makefile +++ b/databases/xtrabackup8/Makefile @@ -15,7 +15,7 @@ COMMENT= Open-source backup tool for InnoDB and XtraDB LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= xxd:editors/vim-console \ +BUILD_DEPENDS= xxd:editors/vim \ boost-libs>=1.72.0:devel/boost-libs \ protobuf>=3.0:devel/protobuf \ rapidjson>=1.1.0:devel/rapidjson \ diff --git a/devel/fb-adb/Makefile b/devel/fb-adb/Makefile index 3fc11f0602b8..787b825581de 100644 --- a/devel/fb-adb/Makefile +++ b/devel/fb-adb/Makefile @@ -30,7 +30,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 IGNORE_DragonFly= requires linuxulator for Android NDK -BUILD_DEPENDS= xxd:editors/vim-console \ +BUILD_DEPENDS= xxd:editors/vim \ ${BASH_CMD}:shells/${BASH_CMD:T} RUN_DEPENDS= adb:devel/android-tools-adb diff --git a/mail/rubygem-vmail/Makefile b/mail/rubygem-vmail/Makefile index 5a2f10bc6810..52f805a44e25 100644 --- a/mail/rubygem-vmail/Makefile +++ b/mail/rubygem-vmail/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= rubygem-highline1>=1.6.1:devel/rubygem-highline1 \ rubygem-sequel>=3.24.1:devel/rubygem-sequel \ rubygem-sqlite3>=1.3.3:databases/rubygem-sqlite3 \ rubygem-versionomy>=0.4.4:devel/rubygem-versionomy \ - vim:editors/vim-console + vim:editors/vim NO_ARCH= yes USE_RUBY= yes diff --git a/science/kim-api/Makefile b/science/kim-api/Makefile index 9861b7ef6e2f..40b5cc07cc7c 100644 --- a/science/kim-api/Makefile +++ b/science/kim-api/Makefile @@ -9,7 +9,7 @@ COMMENT= Framework for reliable, reproducible, portable molecular simulations LICENSE= CDDL LICENSE_FILE= ${WRKSRC}/LICENSE.CDDL -BUILD_DEPENDS= xxd:editors/vim-console +BUILD_DEPENDS= xxd:editors/vim USES= cmake:noninja fortran tar:txz USE_LDCONFIG= yes diff --git a/science/openkim-models/Makefile b/science/openkim-models/Makefile index 7964a55f28bd..97268aa0eb93 100644 --- a/science/openkim-models/Makefile +++ b/science/openkim-models/Makefile @@ -9,7 +9,7 @@ COMMENT= Open Knowledgebase of Interatomic Models LICENSE= CDDL LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= xxd:editors/vim-console +BUILD_DEPENDS= xxd:editors/vim LIB_DEPENDS= libkim-api.so:science/kim-api USES= cmake:noninja compiler:c++11-lang fortran tar:txz diff --git a/science/plumed/Makefile b/science/plumed/Makefile index bd3a40406dbf..f5a4192bf5e9 100644 --- a/science/plumed/Makefile +++ b/science/plumed/Makefile @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER BROKEN_i386= undefined reference to `__atomic_load' BUILD_DEPENDS= bash:shells/bash \ - xxd:editors/vim-console + xxd:editors/vim RUN_DEPENDS= bash:shells/bash USES= autoreconf compiler:c++11-lang gmake pkgconfig shebangfix diff --git a/sysutils/amtc/Makefile b/sysutils/amtc/Makefile index 61731243d3a7..84ff84272e40 100644 --- a/sysutils/amtc/Makefile +++ b/sysutils/amtc/Makefile @@ -7,7 +7,7 @@ COMMENT= Threaded Intel AMT/vPro mass management tool LICENSE= CC-BY-3.0 -BUILD_DEPENDS= xxd:editors/vim-console +BUILD_DEPENDS= xxd:editors/vim LIB_DEPENDS+= libgcrypt.so:security/libgcrypt \ libcurl.so:ftp/curl diff --git a/sysutils/vimpager/Makefile b/sysutils/vimpager/Makefile index 2dc65ff41f11..111fdb1e882f 100644 --- a/sysutils/vimpager/Makefile +++ b/sysutils/vimpager/Makefile @@ -22,14 +22,12 @@ OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= BACKEND OPTIONS_DEFAULT=VIM -OPTIONS_SINGLE_BACKEND= NEOVIM VIM VIMCONSOLE +OPTIONS_SINGLE_BACKEND= NEOVIM VIM BACKEND_DESC= Choose your Vim backend NEOVIM_DESC= NeoVim -VIM_DESC= Full Vim (vim) -VIMCONSOLE_DESC=Console-only Vim (vim-console) +VIM_DESC= Vim NEOVIM_RUN_DEPENDS= nvim:editors/neovim VIM_RUN_DEPENDS= vim:editors/vim -VIMCONSOLE_RUN_DEPENDS= vim:editors/vim-console .include