apache 2.2 ports

[olli hauer]

On 2014-09-06 17:24, Adam Weinberger wrote:
> apache team -
> 
> So it seems that setting USE_APACHE=22 doesn’t actually depend on apache-2.2. This means that every USE_APACHE=22 port is broken, and as of right now won’t have any 10.1 packages.
> 
> I’m happy to go through and add "DEFAULT_VERSIONS= APACHE=22” to this ports, but I wanted to check with you guys first. Is that the right way to fix it? Is there something else that can be done to make USE_APACHE=22 actually depend on apache-2.2?
> 
> # Adam
> 

Hi Adam,

could you give the patch below a try?
I've tested the patch with a small selection from USE_APACHE=(22|22+|24) ports and with the patch bsd.default-versions.mk does not overwrite the requirements.

// olli


Index: Mk/bsd.apache.mk
===================================================================
--- Mk/bsd.apache.mk    (revision 367503)
+++ Mk/bsd.apache.mk    (working copy)
@@ -288,8 +288,6 @@
 .      endif
 .elif defined(APACHE_PORT)
 _APACHE_VERSION!=      ${ECHO_CMD} ${APACHE_PORT} | ${SED} -ne 's,.*/apache\([0-9]*\).*,\1,p'
-.else
-_APACHE_VERSION:=      ${DEFAULT_APACHE_VERSION}
 .endif

 .if defined(USE_APACHE)