Drop stray empty line ...

In D39424#902434, @fsbruva_yahoo.com wrote:

@zirias Perhaps - but upstream has apparently an optional dependency on imagemagick...

Sure it has, but the port had the option removed that required it (for whatever reason, you'd probably have to ask its maintainer), so no need to add that dependency to the port.

Looks to me like this port should not have an ImageMagick dependency at all, because the option that once required it was removed. So, all fine there.

I will answer to just one of them:

Use ImageMagick6.

Rebase on newest version.

Bump ImageMagick ports, document in CHANGES

Fix package name for dependencies after flavorizing.

Typo fix committed, rebased the other commits for review.

Use FLAVORS_SUB helper, remove forgotten X11 option in ImageMagick6.

Make inline docs in magick.mk a bit more consistent and explicit.

This still had the problem that there's no way to enforce an x11-enabled version in USES (for ports actually depending on it), so I'm abandoning it in favor of a more complete solution based on "flavorized" ImageMagick ports, see https://reviews.freebsd.org/D39424

Rename patch file as suggested by sunpoet

@tcberner just checked, you're right.

Fix more hardcoded /usr/local after comment in PR 269584

In D38694#881222, @mat wrote:

Does this really have to be an extra patch? Does it break the build on other archs?

Rebase after committing the PORTVERSION fix separately

And also make portclippy happy, as it's almost for free here

Also remove substitutions that are now no-ops.