Apache 2.x Modules depending on wrong Apache port

[Scot Hetzel]

>Submitter-Id:	current-users
>Originator:	Scot W. Hetzel
>Organization:	
>Confidential:	no
>Synopsis:	Apache 2.x Modules depending on wrong Apache port
>Severity:	serious
>Priority:	medium
>Category:	ports
>Class:		change-request
>Release:	FreeBSD 5.3-STABLE i386
>Environment:
System: FreeBSD bsd5x.hetzel.org 5.3-STABLE FreeBSD 5.3-STABLE #6: Sun
Jan 16 03:44:45 CST 2005
root at bsd5x.hetzel.org:/usr/obj/usr/src/5x/sys/GENERIC i386


>Description:

Ports that previously depended on www/apache2 now show as depending on
www/apache13.

This problem is occuring because of a recent change to www/apache2's
Makefile.modules.3rd file (revision 1.18).  This change made the
APACHE_PORT variable overrideable even when WITH_APACHE2 is defined.
Previously, it set the variable with APACHE_PORT=www/apache2.

The APACHE_PORT variable gets defined in <bsd.port.mk> to www/apache13
if it wasn't previously defined.

The affected ports include <bsd.port.pre.mk> before "Makefile.modules.3rd".

>How-To-Repeat:

Go to one of the Apache 2.* Module ports, and perform a "make
describe" or "make clean". For example:

cd /usr/ports/www/mod_frontpage2-rtr
make describe

mod_frontpage2-5.0.2.2635|/usr/ports/www/mod_frontpage2-rtr|/usr/local|Microsoft
mod_frontpage (by RTR) for Apache
2.0|/usr/ports/www/mod_frontpage2-rtr/pkg-descr|swhetzel at gmail.com|www||||/usr/ports/www/apache13|/usr/ports/www/apache13
/usr/ports/www/frontpage|http://www.rtr.com

>Fix

With the attached fix the www/mod_frontpage2-rtr port now shows:

mod_frontpage2-5.0.2.2635|/usr/ports/www/mod_frontpage2-rtr|/usr/local|Microsoft
mod_frontpage (by RTR) for Apache
2.0|/usr/ports/www/mod_frontpage2-rtr/pkg-descr|swhetzel at gmail.com|www||||/usr/ports/www/apache2|/usr/ports/www/apache2
/usr/ports/www/frontpage|http://www.rtr.com

The attached patch replaces <bsd.port.[pre,post].mk> with
<bsd.port.mk> for all of the ports except for www/mod_frontpage2-rtr.
Instead <bsd.port.pre.mk> is
moved after "Makefile.modules.3rd"

mod_access_identd/Makefile
mod_access_referer/Makefile 
mod_accesscookie/Makefile
mod_auth_any/Makefile
mod_auth_cookie_mysql/Makefile
mod_auth_cookie_mysql2/Makefile
mod_auth_external2/Makefile
mod_auth_imap/Makefile
mod_auth_imap2/Makefile
mod_auth_mysql/Makefile
mod_auth_useragent/Makefile
mod_cfg_ldap/Makefile
mod_chroot/Makefile
mod_dosevasive20/Makefile
mod_frontpage-rtr/Makefile - email change only
mod_frontpage2-rtr/Makefile - email change and moved <bsd.ports.pre.mk>
mod_log_config-st/Makefile
mod_log_mysql/Makefile
mod_log_sql2/Makefile
mod_macro/Makefile
mod_macro2/Makefile
mod_musicindex/Makefile
mod_rpaf/Makefile
mod_tidy/Makefile
mod_vdbh/Makefile
mod_vhs/Makefile