Skip to content

Commit

Permalink
editors/vim: Add XXD option
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@assistcontrol
assistcontrol committed Oct 3, 2023
1 parent feb3eca commit 9d1c9b8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 22 deletions.
13 changes: 7 additions & 6 deletions editors/vim/Makefile
View file
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down
14 changes: 0 additions & 14 deletions editors/vim/pkg-plist
View file
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions sysutils/xxd/Makefile
View file
Expand Up @@ -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
Expand Down

0 comments on commit 9d1c9b8

Please sign in to comment.