devel/geany and plugins: add flavors for gtk2 and gtk3

[madpilot]

Summary

In bug report 226523 Greg V. proposed switching geany to gtk3 using an option. This was no possible due to not being able to force gtk3 in geany from the plugins.

I have built this patch set to leverage flavors, so that correct dependency chains can be enforced by pkg.

The devel/geany-plugins-l10n could actually be unflavored, but I am unable to find a way to make it unflavored and not break or pollute the dependency chain.

Test Plan

Geany and all plugins build fine in poudriere for both flavors on all supported versions.

They both run correctly on head.

[antoine]

Gtk 2 is legacy, Gtk 3 should be used always.

[madpilot]

In D18018#385291, @antoine wrote:

Gtk 2 is legacy, Gtk 3 should be used always.

I agree on that, but this project is still in the middle of migrating.

Some plugins work only when using gtk2. Jumping unconditionally to gtk3 would force me to delete those. The plugins not working with gtk3 are listed in the UPDATING entry in the patch.

I was planning to move to flavors for now, switch to gtk3 as default flavor at a later time, hoping in the while all plugin have been migrated.

Otherwise I could make gtk3 the default flavor now and plan removing the gtk2 one soon if no user complains about the missing plugins.

[madpilot]

Made the default flavor the gtk3 one.

Also fixed plugins not working with gtk3 to not have a gtk3 flavor (which would fail)

[mat]

devel/geany-plugin-debugger/Makefile

11

Having only one flavor makes no sense. Simply set FLAVORS= so that it stays empty afterwards.

devel/geany-plugin-markdown/Makefile

16–20

Please use flavors helpers.

devel/geany-plugins/files/Makefile.common

23–24

FLAVOR only make sense to the current port, it is not transitive, it CANNOT be used in a _DEPENDS line. This is why framework generated flavors have their own flavors to add dependencies.

Please use static flavors in the depends names.

32

That is awful.

[madpilot]

I marked the accepted comments as done. I'll followup with an updated diff including such changes after testing.

The while bunch of geany plugins Makefiles is a mess. If and when we get subpackages the whole bunch can be converted to one port with subpackages, since all plugins can be built together and then file picked for each generating separate packages.

I don't see an immediate way to overhaul them which would simplify things without bringing a lot of duplication.

UPDATING

30

Also going to sort these.

devel/geany-plugins/files/Makefile.common

32

It actually is. I don't even know what possessed me when I wrote this.

58–59

This one also needs to be made a constant, then.

[madpilot]

I'm also seeing a problem with the options in the geany-plugins port. I'm planning to use groups to distinguish the ones actually available only with gtk2 and gtk3, leaving them all enabled by default, but making the gtk2 ones ineffective when the gtk3 ports are compiled.

I could also make the appear and disappear depending on the flavor, but I don't like that idea.

devel/geany-plugin-debugger/Makefile

11

Testing shows this creates problems later in Makefile.common, where a flavor is expected to be defined.

Since this happpens only for gtk2 flavor, I can fix it by changine the

.if ${FLAVOR} == gtk2
.elif ${FLAVOR} == gtk3
.endif

to

.if ${FLAVOR} == gtk3
.else
.endif

since I don't plan adding any more flavors to these ports.

[madpilot]

Solved the reported issues.

I also changed some RUN_DEPENDS+BUILD_DEPENDS to LIB_DEPENDS, which is what they actually are.

The OPTIONS in the devel/geany-plugins meta port are also now working correctly and subdivided using GROUPs.

[val_packett.cool]

UPDATING

17

"disinstall" doesn't sound like a word :) "deinstall" or "uninstall"

20

same here

[madpilot]

Change "disinstall" to "deinstall".

[madpilot]

UPDATING

17

Thanks for pointing this out!

Not being a native English speaker, thia was an "italianism" from my part.

"disinstallare" is the Italian word that fooled me.

[mat]

devel/geany-plugin-markdown/Makefile

16–18

Wrong place in the Makefile. See Chapter 15. Order of Variables in Port Makefiles.

16–18

Wrong place in the Makefile. See Chapter 15. Order of Variables in Port Makefiles.

devel/geany-plugin-vc/Makefile

18–20

same.

[madpilot]

Fix variable order.

[mat]

devel/geany-plugin-markdown/Makefile

11–12

Why +=? (Also, there should probably be a blank lines between the depends section and the flavors section.)

devel/geany-plugin-vc/Makefile

10–11

Why +=?

devel/geany-plugin-webhelper/Makefile

14–16

wrong place.

[madpilot]

devel/geany-plugin-markdown/Makefile

11–12

Was += because gtk[23]_LIB_DEPENDS is already populated in Makefile.common included below. Now that it's sorted back the += needs to be moved there really.

Thanks for noticing!

[madpilot]

Move += where appropriate, and add empty lines.

[mat]

Looks ok, make sure it all builds, and does not break INDEX before committing ;-)