[macports-ports] branch master updated (60125e8ce9f -> bf68f58d4a1)

[Christopher Nielsen]

Christopher Nielsen (mascguy) pushed a change to branch master
in repository macports-ports.

    from 60125e8ce9f neovim{,-devel}: Add conflicts line
     new 8eb840f0951 ffmpeg*: cleanup
     new bf68f58d4a1 ffmpeg-devel: libsdl2: support latest versions See: https://trac.macports.org/ticket/65703

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 multimedia/ffmpeg-devel/Portfile                   | 26 ++++++++++++++--------
 .../ffmpeg-devel/files/patch-libsdl2-version.diff  | 25 +++++++++++++++++++++
 multimedia/ffmpeg-upstream/Portfile                | 13 +++++++----
 multimedia/ffmpeg/Portfile                         | 19 +++++++++-------
 4 files changed, 62 insertions(+), 21 deletions(-)
 create mode 100644 multimedia/ffmpeg-devel/files/patch-libsdl2-version.diff