In my previous commit 18c6e18 I missed some ports where RUBY was
optional. This commit fixes those missing ports and fixes INDEX build.
Approved by: portmgr
Fixes: 18c6e18 Mk/**ruby.mk: Switch from USE_RUBY=yes to USES=ruby
Commit b7f05445c0 has added WWW entries to port Makefiles based on
WWW: lines in pkg-descr files.
This commit removes the WWW: lines of moved-over URLs from these
pkg-descr files.
Approved by: portmgr (tcberner)
It has been common practice to have one or more URLs at the end of the
ports' pkg-descr files, one per line and prefixed with "WWW:". These
URLs should point at a project website or other relevant resources.
Access to these URLs required processing of the pkg-descr files, and
they have often become stale over time. If more than one such URL was
present in a pkg-descr file, only the first one was tarnsfered into
the port INDEX, but for many ports only the last line did contain the
port specific URL to further information.
There have been several proposals to make a project URL available as
a macro in the ports' Makefiles, over time.
This commit implements such a proposal and moves one of the WWW: entries
of each pkg-descr file into the respective port's Makefile. A heuristic
attempts to identify the most relevant URL in case there is more than
one WWW: entry in some pkg-descr file. URLs that are not moved into the
Makefile are prefixed with "See also:" instead of "WWW:" in the pkg-descr
files in order to preserve them.
There are 1256 ports that had no WWW: entries in pkg-descr files. These
ports will not be touched in this commit.
The portlint port has been adjusted to expect a WWW entry in each port
Makefile, and to flag any remaining "WWW:" lines in pkg-descr files as
deprecated.
Approved by: portmgr (tcberner)
Two changes here (along with bumping to the latest upstream patch):
1) In the previous Vim commit, support for the system-wide vimrc/gvimrc
was dropped because we went through contortions to fix loading order
and monkey around with various defaults.
However, many people used that file for their system. This commit
re-adds support for loading it. All work for untangling the mess of
loading defaults.vim and preventing circular loads is left to the
user. We just support loading that file; what you do with it is your
call.
2) vim-tiny is supposed to be the smallest possible Vim experience,
being just the binary and no runtime library. However, without a
viable defaults.vim, it's essentially just a larger, slower Vi.
The vim-tiny package now ships with defaults.vim, which is patched
to prevent errors from Vim loading the syntax library (which is not
installed).
Our FreeBSD vimrc has caused a lot of trouble. It seriously mangles
config loading order (see below PR for the 21 comments it took before
I could get my head around it), clobbers defaults, duplicates defaults,
and simply isn't how Vim does things.
In this patch, the system vimrc is dropped entirely. Instead,
$VIMRUNTIME/defaults.vim sources $VIMRUNTIME/defaults_freebsd.vim, which
contains only FreeBSD-specific settings (today, a convenience augroup
for port creation, and a flag to let syntax/sh.vim know that /bin/sh
isn't bash).
There is no perfect solution here, but by not clobbering anything
anymore, we at least don't *prevent* other solutions. You now get Vim's
defaults, and you are free to override them in your ~/.vimrc.
PR: 251420
Our vimrc duplicates settings from $VIMRUNTIME/defaults.vim, which
appears odd.
However, it's actually required because of vim-tiny. vim-tiny installs
an empty defaults.vim stub, meaning that it only gets the settings that
appear in our vimrc.
PR: 265502
This is a major release. The biggest new feature is vim9 script, a
backwards-incompatible dialect that improves some of the worst
headaches of classic vimscript.
Vim runtime's defaults.vim will clobber global vimrc settings. It's
fine for the settings we provide, but other edits to that file can
get lost.
To work around this, defaults.vim is now directly sourced and a flag
is set to stop that file from getting loaded a second time. Thanks go
to Anton Saietskii for that bit of magic.
PR: 251420
Vim no longer includes the Athena (Xaw) frontend, so drop the
athena flavor.
As requested by many (and based on a patch from scf), restore the x11
flavor. The x11 flavor is a bit odd; it doesn't actually include an X
GUI. As a result, when Vim got flavorized I dropped it as I thought
it was vestigial. What the x11 flavor actually provides is support for
some X interaction (mainly xclipboard), and is highly useful to people
who run console Vim within X.
The outcry was pretty swift, and I'd like to thank all the people who
took the time to email me about it, and especially scf who provided
the bulk of this patch.
I'm going to MFH this due to the athena build failure.
Remove x11 flavor. It adds xclip support but doesn't contain a GUI,
making it more confusing than helpful.
I doubt anyone really used it, but if so then vim-athena, the simplest
X GUI toolkit, is the one you're looking for.
While here, make sure gtk-update-icon-cache is only on run dependency
where added as a dependency
Enforce gtk3 to depend on gtk-update-icon-cache (previously it was
inheriting the dependency)
This commit completely rewires the vim ports. It includes the following:
* `vim' is now a TUI-only package. It is what the `vim-console' port
was.
* `vim-gtk3' includes the TUI binary (vim) and a GTk3-backed GUI. It is
what the `vim' port was.
* Each GUI toolkit has a separate package. There is vim-gtk3, -gtk2,
-motif, -athena, and -x11.
* `vim-tiny' is still the same thing, except it includes a defaults.vim
stub to silence a startup error message.
* Only the python3 language binding is included by default. Perl, Ruby,
TCL, Scheme, and Lua can still be enabled via options. But there are
very, very few plugins that require anything other than python.
* py27 support is removed entirely.
* CScope support is unconditionally enabled, but vim no longer depends
upon it. If cscope is installed, it'll be used.
* The default ctags is now the version included in base. It's very
rudimentary, but only a subset of users use ctags at all. Universal or
exuberant ctags can still be enabled via option knobs.
Vim will link against libcanberra if it's installed. It really doesn't
serve any particular purpose for a text editor, so it makes sense for
us to just disable it explicitly.
This change existed before, but was hidden in the GNOME option and got
removed when libgnomeui was purged.
PR: 257565
Reported by: Philipp Ost