ports/56290: ports/www/apache13 should allow building with included expat-lite

[Helge Oldach]

>Number:         56290
>Category:       ports
>Synopsis:       ports/www/apache13 should allow building with included expat-lite
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 01 11:50:17 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Helge Oldach
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
bit-wise, full-duplex
>Environment:
System: FreeBSD sep.oldach.net 4.8-STABLE FreeBSD 4.8-STABLE #1565: Sat Aug 23 21:50:03 CEST 2003 root at localhost:/usr/obj/usr/src/sys/GENERIC i386

Please note that the mail address above will expire for spam avoidance
reasons. (FreeBSD unfortunately publishes mail addresses as food for
mail address harvesters.) Please pick an up-to-date address from my
website.

	
>Description:

ports/www/apache13 was changed early this year to allow compilation
either with *no* expat library, or with an external library
(ports/textproc/expat2). The built-in expat-lite cannot be addressed any
longer by the port's configuration. However this would be sufficient for
many purposes, including mod_dav.

I would *not* like to be required to install ports/textproc/expat2
(which also requires ports/devel/libtool13) to avoid unnecessary ports
bloat.

>How-To-Repeat:
	
>Fix:

--- Makefile.ORIG	Mon Aug 18 09:10:12 2003
+++ Makefile	Mon Sep  1 20:42:06 2003
@@ -25,7 +25,9 @@
 DOCUMENT_ROOT=${DATADIR}/data
 DEFAULT_PATH=/bin:/usr/bin:${PREFIX}/bin
 
-.if defined(WITHOUT_APACHE_EXPAT) && ${WITHOUT_APACHE_EXPAT} == yes
+.if defined(WITH_APACHE_EXPAT) && ${WITH_APACHE_EXPAT} == yes
+EXPAT_CONF+=    --enable-rule=EXPAT
+.elif defined(WITH_APACHE_EXPAT)
 EXPAT_CONF+=    --disable-rule=EXPAT
 .else
 LIB_DEPENDS+=   expat.4:${PORTSDIR}/textproc/expat2
@@ -107,7 +109,7 @@
 
 CONFIGURE_ENV=  OPTIM='${OPTIM}' LD_SHLIB='${CC}' LIBS='${LIBS}'
 
-.if !defined(WITHOUT_APACHE_EXPAT) || ${WITHOUT_APACHE_EXPAT} != yes
+.if !defined(WITH_APACHE_EXPAT)
 CONFIGURE_ENV+= \
 		INCLUDES=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
>Release-Note:
>Audit-Trail:
>Unformatted: