Mk/Uses/apache.mk: Port from Mk/bsd.apache.mk

[brnrd]

Summary

Mk/Uses/apache.mk: Port from Mk/bsd.apache.mk

 - Move to new Uses framework

Differential_Revision: 
Reviewed_by:
Approved by:

Test Plan

This has been running on my system for a while now (bar the 22/24 -> 2.2/2.4 fix in bsd.ports.mk) during active porting of mod_h2-devel and mod_md-devel.

Just rebuilt all my Apache and PHP ports, these were all OK
See also D12398 for the PHP 7.1 rework

[mat]

Please deprecate all the USE_APACHE*.

[brnrd]

In D12308#255661, @mat wrote:

Please deprecate all the USE_APACHE*.

Isn't that what line 86 does, or am I missing something?

[mat]

In D12308#255758, @brnrd wrote:

In D12308#255661, @mat wrote:

Please deprecate all the USE_APACHE*.

Isn't that what line 86 does, or am I missing something?

Well, all deprecation happen in Mk/bsd.sanitiy.mk, don't start putting some in other places.

[brnrd]

Move warnings to Mk/bsd.sanity.mk

• Warnings don't belong in Mk/Uses/*.mk
• The APACHE_PORT directive has long been replaced by DEFAULT_VERSIONS
• the www/apache-<mpm>-mpm ports have been deleted

[mat]

Mk/Uses/apache.mk

429–430 ↗

(On Diff #33037)

This code will never be used, you never set _USES_POST+=apache. See Mk/Uses/libtool.mk for an example of how to write a USES with b.p.post.m support.

Mk/bsd.port.mk

891–892 ↗

(On Diff #33037)

why this change ?

1891–1893 ↗

(On Diff #33037)

Are there any ports that have a USE_APACHE* defined after bsd.port.pre.mk ?
Because you cannot set USES after bsd.port.pre.mk, so this bit should rather go away, and the ports be fixed.

[brnrd]

Fix _POST usage

• Revert spurious change on USE_LDCONFIG
• Find ports with USE_APACHE after bsd.port.pre.mk

Open item: Check list of ports with incorrect USE_APACHE behavior

[brnrd]

Mk/Uses/apache.mk

429–430 ↗

(On Diff #33037)

Looking at Mk/Uses/libtool.mk makes it clearer how that works

Mk/bsd.port.mk

891–892 ↗

(On Diff #33037)

Stale file in my tree? Fixed!

1891–1893 ↗

(On Diff #33037)

lang/php70
lang/php56
lang/php71
www/blogsum
www/otrs
security/shibboleth2-sp

Will investigate

[brnrd]

Mk/bsd.port.mk

1891–1893 ↗

(On Diff #33037)

The PHP ports are actually 3-in-1. The main port, the mod_php port and the extensions. So the USE_APACHE isn't out of order
I've updated PHP 7.1 port nonetheless as there were some improvements possible with Options framework, saved about 100 lines of Makefile.

www/blogsum: Misinterpreted, order OK
www/otrs: Pending mainainer approval
security/shibboleth-sp: Pending maintainer approval

[brnrd]

Mk/bsd.port.mk

1891–1893 ↗

(On Diff #33037)

These are now fixed/commited/closed

[brnrd]

Further checks and simplification

• common22 is an alias for server,2.2
• Re-order argumnents-checks (run,2.2+ returned an error)
• apache_ARGS are already split in bsd.port.mk
• Remove duplicate incorrect USES usage check
• Remove conditional slated for removal in 2012
• Remove duplicate MIN/MAX version determination
• Simplify MIN/MAX determination

[brnrd]

• WITH(OUT)_MODULES should've long been removed in favor of OPTIONS framework
• Simplify STATIC handling

Mk/Uses/apache.mk

79 ↗

(On Diff #33802)

Left-over from testing with an additional httpd-trunk port, removed locally

[brnrd]

Several ports directly include Mk/bsd.apache.mk

• Mk/Uses/php.mk
• lang/php56
• lang/php70
• lang/php71

[brnrd]

Any remarks?
I've done a full exp-run on the ports tree and haven't found failures due to this change.

[brnrd]

Add CHANGES and direct includes changes

[brnrd]

Add missing Mk/bsd.port.mk

[brnrd]

Add lang/php72

[antoine]

The php stuff may work but it's only by luck. Setting USE_APACHE=22+ or USE_APACHE_RUN=22+ before including ${PORTSDIR}/Mk/Uses/apache.mk doesn't have any effect (${PORTSDIR}/Mk/Uses/apache.mk doesn't do anything from those variables)

[mat]

Also, has anyone from apache@ reviewed this ?

Mk/Uses/apache.mk

132 ↗

(On Diff #33802)

Would probably be a good idea to make it fatal. At one point, old glue should be removed.

Mk/bsd.port.mk

1395–1399 ↗

(On Diff #33802)

:S/

[brnrd]

In D12308#274191, @mat wrote:

Also, has anyone from apache@ reviewed this ?

Nope. The apache@ team seems to have insufficient time to fix things.
NB: I'm part of apache@

[mat]

In D12308#275864, @brnrd wrote:

In D12308#274191, @mat wrote:

Also, has anyone from apache@ reviewed this ?

Nope. The apache@ team seems to have insufficient time to fix things.
NB: I'm part of apache@

It would be nice if someone else from apache@ had a look.

[brnrd]

Rework patches

Mk/bsd.sanity.mk

• APACHE_PORT is fatal

Mk/bsd.port.mk

• Properly transform versions 2.2-24 is now 2.2-2.4

Mk/Uses/apache.mk

• DEFAULT_APACHE_VER is now fatal
• Version checks updated and fixed
• Version selection improved
• Properly default to APACHE_DEFAULT
• Prep for version 2.5

[brnrd]

In D12308#276609, @mat wrote:

In D12308#275864, @brnrd wrote:

In D12308#274191, @mat wrote:

Also, has anyone from apache@ reviewed this ?

Nope. The apache@ team seems to have insufficient time to fix things.
NB: I'm part of apache@

It would be nice if someone else from apache@ had a look.

Can't agree more, but I haven't had sufficient rapport on my requests for review sofar. See https://lists.freebsd.org/pipermail/freebsd-apache/2017-November/004408.html
I've had this in use for quite some time now and have

Mk/Uses/apache.mk

79 ↗

(On Diff #33802)

Re-added for addition of www/apache25-devel (see D13111)

Mk/bsd.port.mk

1395–1399 ↗

(On Diff #33802)

Got it. Improved for use-case of USE_APACHE= 22-24 using :C

[brnrd]

Add ports checkning APACHE_VERSION to diff

[brnrd]

Mk/Uses/apache.mk

280 ↗

(On Diff #36458)

Must appear before the previous APACHE_VERSION check

390 ↗

(On Diff #36458)

This must be the .else clause _APACHE_PORT_IS_MODULE is no longer used

[brnrd]

Update diff after bulk build

• Define APACHE_VERSION before using it
• Use .else not .elif for do-build target

[brnrd]

Bulk build of modules OK now, see https://keg.brnrd.eu/build.html?mastername=111amd64-default&build=2017-12-13_12h50m22s

[brnrd]

In D12308#273985, @antoine wrote:

The php stuff may work but it's only by luck. Setting USE_APACHE=22+ or USE_APACHE_RUN=22+ before including ${PORTSDIR}/Mk/Uses/apache.mk doesn't have any effect (${PORTSDIR}/Mk/Uses/apache.mk doesn't do anything from those variables)

Hi Antoine,

This has been long resolved, but the review is still blocked on this. The bulk run was successful, how do we proceed?

[joneum]

I started testing today and do a test on all ports (amd64/i386 FreeBSD 11.1) this weekend

[joneum]

private exp-run startet today:

http://joneumbox.org/build.html?mastername=11-1-AMD64-apache-ports&build=2018-02-25_14h03m35s

http://joneumbox.org/build.html?mastername=11-1-i386-apache-ports&build=2018-02-25_14h03m35s

[brnrd]

This can be closed. Fixed in #464175
Forgot to add the DiffRev to the commit message :'(

[brnrd]

Abandoning as I can't close it and no response