Page MenuHomeFreeBSD

Move bsd.gnome.mk and bsd.mate.mk to USES.
ClosedPublic

Authored by kwm on Sep 13 2015, 11:30 AM.

Details

Summary

Move the Mk bsd.gnome.mk and bsd.mate.mk to Mk/USES.
Only messed with the _INCLUDE_USES_GNOME_MK and POST defines.

Seems to work, needs more testing. Would like a review before I continue.
Add work around code to bsd.port.mk.

Test Plan

After review finished, do a exp-run, commit if the exp-run is fine.
"Convert" the ports tree per category, and remove the fallback code from
bsd.port.mk.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

kwm retitled this revision from to Move bsd.gnome.mk and bsd.mate.mk to USES..
kwm updated this object.
kwm edited the test plan for this revision. (Show Details)
mat added inline comments.
Mk/bsd.port.mk
1882–1889 ↗(On Diff #8715)

You can remove that, because:

  1. You can't add to USES after bsd.port.pre.mk
  2. The USES have their own way of dealing with before/after.
kwm edited edge metadata.

Remove the USE_GNOME/USE_MATE check for after port.pre.mk

kwm marked an inline comment as done.Sep 13 2015, 12:48 PM

Please ignore the libgxps change it is a left over from some testing.

Mk/bsd.port.mk
1881–1882 ↗(On Diff #8716)

Thanks, I wasn't sure what to do about it.

Some _USES_POST+=gnome seem to be missing?

kwm marked an inline comment as done.
kwm edited edge metadata.

Add _USES_POST and a check to make sure the gnome/mate USES doesn't have a
argument.

There may be other targets defined in mate.mk and gnome.mk, they should all be added to a _USES_xxx variable with a priority that will get the ran at the right time, see Mk/bsd.ports.mk lines 5560-5620 for priorities already there.

Mk/Uses/gnome.mk
677–679 ↗(On Diff #8721)

This should be:

_USES_patch+=  290:gnome-pre-patch
gnome-pre-patch:
685–687 ↗(On Diff #8721)

Same here

_USES_install+=    690:gnome-post-install
gnome-post-install:
kwm edited edge metadata.

Convert targets to _USES_${target} format. now with extra random priorities.

the pre-configure-script seems to be part of configure target.

kwm edited edge metadata.

Add CHANGES log and bsd.sanity.mk checks. Though the sanity bits probably
only will activaly when I go through the tree and "break" stuff.

kwm edited edge metadata.

manual update to latest

This revision was automatically updated to reflect the committed changes.