cvs commit: ports/www/apache2

[Oliver Eikemeier]

Trevor Johnson wrote:

> Clement Laforet wrote:
> 
>>Oliver Eikemeier <eikemeier at fillmore-labs.com> wrote:
>>
>>>WITH_HTTP_PORT, WITHOUT_CGI, WITHOUT_ICONS wouldn't be that bad...
> 
> [...]
> 
>>You're right... I'll correct it with PORTREVISION 1, with future changes
>>in Makefile.modules.
> 
> I had thought of the same thing, but I was in a hurry.  How's this:
> <URL:http://people.freebsd.org/~trevor/ports/apache2-cosmetic.diff>?

I really don't want to be portlint, but hey, you asked for it:

> +CONFLICTS=	apache+ipv6-1.* \
> +		apache+modssl-1.* \
> +		apache+ssl-1.* \
> +		apache-1.* \
> +		apache_fp-1.* \
> +		caudium-devel-1.* \
> +		caudium10-1.* \
> +		caudium12-* \
> +		ru-apache+mod_ssl-1.* \
> +		ru-apache-1.* \
> +		thttpd-2.*
> +

I can't find any conflicts with the caudium* ports, and www/mini_httpd
is missing. How about:

+CONFLICTS=	apache+ipv6-1.* \
+		apache+modssl-1.* \
+		apache+ssl-1.* \
+		apache-1.* \
+		apache_fp-1.* \
+		mini_httpd-1.* \
+		ru-apache+mod_ssl-1.* \
+		ru-apache-1.* \
+		thttpd-2.*


> +#	WITH_PORT                default: 80

I'm fine with that, even though WITH_HTTP_PORT seems more appealing to me.


> +#	WITHOUT_ERROR:            Do not install www/error

I would make this the default ;-) Honestly: there must be a better name
for it. Do we need that many options?


> .if defined(WITH_LDAP)
> USE_LDAP=	YES

That doesn't seem to work, it's USE_OPENLDAP as far as I can remember.


> +	@${ECHO}
> +	@${ECHO_MSG} "*** To see all available knobs, type:  make show-options"
> +	@${ECHO}
Mixing ECHO and ECHO_MSG is strange, how about using ECHO here?


> show-options:
> 	@${EGREP} '^##' ${.CURDIR}/Makefile | ${SED} 's/##//'

Not that I particularly like this, but how about using:
	@${SED} -ne 's/^##//p' ${.CURDIR}/Makefile