From nobody Tue Oct 03 02:14:36 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S01bw5hhnz4vY0J; Tue, 3 Oct 2023 02:14:36 +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 4S01bw50NKz4MqX; Tue, 3 Oct 2023 02:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696299276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TDV7+TXzFLigaX2viiPZmAZAg9uPC0QZuZx+3xmPljo=; b=TM4Zv/C1yo91c8VBkZ3jrm5ZG3R1aIa8TZIb1j6VPwnRHeZuasmtrOTwiMAS6Ef6GX/dUd ZUolJygh8AekgMuGogBOfvJL5zbA+0kHhln7Xn8eTXnaS2gWqBnEYjyR7+IFI1qNCTWef4 nNt584EUuLy/ruL8R3eTYQ9of25ToG4ZWlbHGJ5bxmh3lEk+N7SLOreYwobSH4qehd7jsR iY23claFDAEJ3FDqte+k1tBbE48WqOAiVDApwuLyojx/MSNMC5QqYXhRF13ZFFBTwTmeLq 4iNcwNfIIWVux6ezifiWU2S6oAwmcXbIqQQrtKjlfh8wFO3IOW1HYezMUeSsmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696299276; a=rsa-sha256; cv=none; b=amYTsJUWpdXP+Nrn2BgmoCIqOHBYtqF310FoPdKnFHhfAbJWMEUk7EJB5Ip5wbZhs9wn4s 4fKWYir6YI+jQ6lf1rp0WjlnxOdPcQQwzAkg9x4wa7S1EbRFI3ZXDA8mGqMmv+UaBhpI/i 6+8ZPohkZtRw4GGS54lAiqnWqxkSW4lGzaOiFYDvMiFaD/CGvSvdLGN/11A1EDYg0+EJxd qI74Izw8PmGXplfCm2DqCJeW10Y6RSSDrYOMlSg/DCGW2/6Czu/zlj4fBCET7S/8aPS2t4 Ld8weqQ/kgdI2W1wJFfr3sbQEWddDM3p2PxxyPKf+ULyAvZ3kv1oLuf0OHAF6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696299276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TDV7+TXzFLigaX2viiPZmAZAg9uPC0QZuZx+3xmPljo=; b=g28FrcdvHEyjSeSCWQguwzqWWRvUAOdBHDv36O/pYwYJ19F2p4HVxPWP+thCvdE0SNn8bm A5EUbUS9h48B3cRRmM0wsfL6YuXthsSuoag/FUEuGYOr0CZN4Wam4Qa/4g5TeUqhBCwcjB qKrgQZ3xWczI8ShVmhr1Awprlx9OzsEwjhz7OXybOTBBIc8zU/6pwPAysaKOSW0xONI38I SxjBVrZUt0MZUZFpvXT4xnXC/1oQpG8fCt28ZNCB2moZdMt++HTybiXzEAx4RvES2r8GkK f5UIuGAyQKUr7+VwMwIk6/UENc2UvEHhXuTGf23InO6+hCixmXSGZB+xDB4GGQ== 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 4S01bw3jMLzcdW; Tue, 3 Oct 2023 02:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3932Ea2p068109; Tue, 3 Oct 2023 02:14:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3932EaVQ068106; Tue, 3 Oct 2023 02:14:36 GMT (envelope-from git) Date: Tue, 3 Oct 2023 02:14:36 GMT Message-Id: <202310030214.3932EaVQ068106@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: 9d1c9b818dbb - main - editors/vim: Add XXD option List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: 9d1c9b818dbbe0274bdaf58321eec49766339470 Auto-Submitted: auto-generated The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d1c9b818dbbe0274bdaf58321eec49766339470 commit 9d1c9b818dbbe0274bdaf58321eec49766339470 Author: Adam Weinberger AuthorDate: 2023-10-03 02:03:43 +0000 Commit: Adam Weinberger CommitDate: 2023-10-03 02:14:31 +0000 editors/vim: Add XXD option Rather than conflicting with xxd (which presents a dependency problem for users who don't want to install vim), add an option to depend on xxd. So, the vim port will no longer install xxd, but the option is on by default so most users won't see a difference (other than the new dependency). PR: 274104 Reported by: corvink --- editors/vim/Makefile | 13 +++++++------ editors/vim/pkg-plist | 14 -------------- sysutils/xxd/Makefile | 2 -- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/editors/vim/Makefile b/editors/vim/Makefile index a60cdc044e41..dcbc9ee4ec11 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -45,10 +45,6 @@ CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:S/^/vim-/} ${f}_PKGNAMESUFFIX= -${f} .endfor -.for f in ${FLAVORS:Ntiny} -${f}_CONFLICTS_INSTALL= xxd -.endfor - # GUI flavors .if ${FLAVOR:U} == console GUI= no @@ -95,8 +91,8 @@ USE_XORG= ice sm x11 xmu xpm xt # Options {{{1 # The bulk of the OPTIONS are for normal (non-tiny) vim ### Make sure any new options are excluded below in CONSOLE/TINY -OPTIONS_DEFAULT= CTAGS_BASE PYTHON -OPTIONS_DEFINE= MAKE_JOBS NLS XTERM_SAVE +OPTIONS_DEFAULT= CTAGS_BASE PYTHON XXD +OPTIONS_DEFINE= MAKE_JOBS NLS XTERM_SAVE XXD OPTIONS_SINGLE= CTAGS OPTIONS_SINGLE_CTAGS= CTAGS_BASE CTAGS_EXUBERANT CTAGS_UNIVERSAL OPTIONS_GROUP= LANGBIND @@ -113,6 +109,7 @@ OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE:NMAKE_JOBS} \ MAKE_JOBS_DESC= Enable parallel build XTERM_SAVE_DESC= Restore xterm screen after exit +XXD_DESC= Install xxd hexdumper CTAGS_BASE_DESC= Use system ctags CTAGS_EXUBERANT_DESC= Use exctags instead of ctags @@ -127,6 +124,8 @@ MAKE_JOBS_VARS_OFF= MAKE_JOBS_UNSAFE=yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext +XXD_RUN_DEPENDS= xxd:sysutils/xxd + # LANGUAGE BINDINGS LANGBIND_DESC= Optional language bindings @@ -189,6 +188,8 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/defaults_freebsd.vim ${STAGEDIR}${DATADIR}/${VIM_VER} ${RM} ${STAGEDIR}${PREFIX}/bin/ex ${RM} ${STAGEDIR}${PREFIX}/bin/view + ${RM} ${STAGEDIR}${PREFIX}/bin/xxd + ${FIND} ${STAGEDIR}${PREFIX} -name xxd.1 -delete . for F in eview evim gview gvim gvimdiff rgview rgvim rview rvim vimdiff ${LN} -sf vim ${STAGEDIR}${PREFIX}/bin/$F . endfor diff --git a/editors/vim/pkg-plist b/editors/vim/pkg-plist index e793e1414091..f2951711a42f 100644 --- a/editors/vim/pkg-plist +++ b/editors/vim/pkg-plist @@ -11,7 +11,6 @@ bin/rvim bin/vim bin/vimdiff bin/vimtutor -bin/xxd %%GUI%%%%NLS%%man/da/man1/gview.1.gz %%GUI%%%%NLS%%man/da/man1/gvim.1.gz %%GUI%%%%NLS%%man/da/man1/gvimdiff.1.gz @@ -75,7 +74,6 @@ bin/xxd %%NLS%%man/fr/man1/vim.1.gz %%NLS%%man/fr/man1/vimdiff.1.gz %%NLS%%man/fr/man1/vimtutor.1.gz -%%NLS%%man/fr/man1/xxd.1.gz %%GUI%%%%NLS%%man/fr.ISO8859-1/man1/eview.1.gz %%NLS%%man/fr.ISO8859-1/man1/evim.1.gz %%GUI%%%%NLS%%man/fr.ISO8859-1/man1/gview.1.gz @@ -88,7 +86,6 @@ bin/xxd %%NLS%%man/fr.ISO8859-1/man1/vim.1.gz %%NLS%%man/fr.ISO8859-1/man1/vimdiff.1.gz %%NLS%%man/fr.ISO8859-1/man1/vimtutor.1.gz -%%NLS%%man/fr.ISO8859-1/man1/xxd.1.gz %%GUI%%%%NLS%%man/fr.UTF-8/man1/eview.1.gz %%NLS%%man/fr.UTF-8/man1/evim.1.gz %%GUI%%%%NLS%%man/fr.UTF-8/man1/gview.1.gz @@ -101,7 +98,6 @@ bin/xxd %%NLS%%man/fr.UTF-8/man1/vim.1.gz %%NLS%%man/fr.UTF-8/man1/vimdiff.1.gz %%NLS%%man/fr.UTF-8/man1/vimtutor.1.gz -%%NLS%%man/fr.UTF-8/man1/xxd.1.gz %%GUI%%%%NLS%%man/it/man1/eview.1.gz %%NLS%%man/it/man1/evim.1.gz %%GUI%%%%NLS%%man/it/man1/gview.1.gz @@ -114,7 +110,6 @@ bin/xxd %%NLS%%man/it/man1/vim.1.gz %%NLS%%man/it/man1/vimdiff.1.gz %%NLS%%man/it/man1/vimtutor.1.gz -%%NLS%%man/it/man1/xxd.1.gz %%GUI%%%%NLS%%man/it.ISO8859-1/man1/eview.1.gz %%NLS%%man/it.ISO8859-1/man1/evim.1.gz %%GUI%%%%NLS%%man/it.ISO8859-1/man1/gview.1.gz @@ -127,7 +122,6 @@ bin/xxd %%NLS%%man/it.ISO8859-1/man1/vim.1.gz %%NLS%%man/it.ISO8859-1/man1/vimdiff.1.gz %%NLS%%man/it.ISO8859-1/man1/vimtutor.1.gz -%%NLS%%man/it.ISO8859-1/man1/xxd.1.gz %%GUI%%%%NLS%%man/it.UTF-8/man1/eview.1.gz %%NLS%%man/it.UTF-8/man1/evim.1.gz %%GUI%%%%NLS%%man/it.UTF-8/man1/gview.1.gz @@ -140,7 +134,6 @@ bin/xxd %%NLS%%man/it.UTF-8/man1/vim.1.gz %%NLS%%man/it.UTF-8/man1/vimdiff.1.gz %%NLS%%man/it.UTF-8/man1/vimtutor.1.gz -%%NLS%%man/it.UTF-8/man1/xxd.1.gz %%GUI%%%%NLS%%man/ja/man1/eview.1.gz %%NLS%%man/ja/man1/evim.1.gz %%GUI%%%%NLS%%man/ja/man1/gview.1.gz @@ -153,7 +146,6 @@ bin/xxd %%NLS%%man/ja/man1/vim.1.gz %%NLS%%man/ja/man1/vimdiff.1.gz %%NLS%%man/ja/man1/vimtutor.1.gz -%%NLS%%man/ja/man1/xxd.1.gz %%GUI%%man/man1/eview.1.gz man/man1/evim.1.gz %%GUI%%man/man1/gview.1.gz @@ -166,7 +158,6 @@ man/man1/rvim.1.gz man/man1/vim.1.gz man/man1/vimdiff.1.gz man/man1/vimtutor.1.gz -man/man1/xxd.1.gz %%GUI%%%%NLS%%man/pl/man1/eview.1.gz %%NLS%%man/pl/man1/evim.1.gz %%GUI%%%%NLS%%man/pl/man1/gview.1.gz @@ -179,7 +170,6 @@ man/man1/xxd.1.gz %%NLS%%man/pl/man1/vim.1.gz %%NLS%%man/pl/man1/vimdiff.1.gz %%NLS%%man/pl/man1/vimtutor.1.gz -%%NLS%%man/pl/man1/xxd.1.gz %%GUI%%%%NLS%%man/pl.ISO8859-2/man1/eview.1.gz %%NLS%%man/pl.ISO8859-2/man1/evim.1.gz %%GUI%%%%NLS%%man/pl.ISO8859-2/man1/gview.1.gz @@ -192,7 +182,6 @@ man/man1/xxd.1.gz %%NLS%%man/pl.ISO8859-2/man1/vim.1.gz %%NLS%%man/pl.ISO8859-2/man1/vimdiff.1.gz %%NLS%%man/pl.ISO8859-2/man1/vimtutor.1.gz -%%NLS%%man/pl.ISO8859-2/man1/xxd.1.gz %%GUI%%%%NLS%%man/pl.UTF-8/man1/eview.1.gz %%NLS%%man/pl.UTF-8/man1/evim.1.gz %%GUI%%%%NLS%%man/pl.UTF-8/man1/gview.1.gz @@ -205,7 +194,6 @@ man/man1/xxd.1.gz %%NLS%%man/pl.UTF-8/man1/vim.1.gz %%NLS%%man/pl.UTF-8/man1/vimdiff.1.gz %%NLS%%man/pl.UTF-8/man1/vimtutor.1.gz -%%NLS%%man/pl.UTF-8/man1/xxd.1.gz %%GUI%%%%NLS%%man/ru.KOI8-R/man1/eview.1.gz %%NLS%%man/ru.KOI8-R/man1/evim.1.gz %%GUI%%%%NLS%%man/ru.KOI8-R/man1/gview.1.gz @@ -218,7 +206,6 @@ man/man1/xxd.1.gz %%NLS%%man/ru.KOI8-R/man1/vim.1.gz %%NLS%%man/ru.KOI8-R/man1/vimdiff.1.gz %%NLS%%man/ru.KOI8-R/man1/vimtutor.1.gz -%%NLS%%man/ru.KOI8-R/man1/xxd.1.gz %%GUI%%%%NLS%%man/ru.UTF-8/man1/eview.1.gz %%NLS%%man/ru.UTF-8/man1/evim.1.gz %%GUI%%%%NLS%%man/ru.UTF-8/man1/gview.1.gz @@ -231,7 +218,6 @@ man/man1/xxd.1.gz %%NLS%%man/ru.UTF-8/man1/vim.1.gz %%NLS%%man/ru.UTF-8/man1/vimdiff.1.gz %%NLS%%man/ru.UTF-8/man1/vimtutor.1.gz -%%NLS%%man/ru.UTF-8/man1/xxd.1.gz %%GUI%%%%NLS%%man/tr.ISO8859-9/man1/eview.1.gz %%NLS%%man/tr.ISO8859-9/man1/evim.1.gz %%GUI%%%%NLS%%man/tr.ISO8859-9/man1/gview.1.gz diff --git a/sysutils/xxd/Makefile b/sysutils/xxd/Makefile index a73a7c93500f..38993ffdb45c 100644 --- a/sysutils/xxd/Makefile +++ b/sysutils/xxd/Makefile @@ -12,8 +12,6 @@ LICENSE_NAME= VIM License LICENSE_FILE= ${WRKSRC}/../../runtime/doc/uganda.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -CONFLICTS_INSTALL= vim vim-gtk2 vim-gtk3 vim-motif vim-x11 - DISTINFO_FILE= ${VIM_PORT}/distinfo ALL_TARGET= ${PORTNAME} PORTSCOUT= ignore:1