ports/81183: apache13-modperl can not compile with ports expat

[Martin Nilsson]

>Number:         81183
>Category:       ports
>Synopsis:       apache13-modperl can not compile with ports expat
>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:   Wed May 18 06:10:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Martin Nilsson
>Release:        5.4-R
>Organization:
Svenska Butiker AB
>Environment:
FreeBSD euklides.gneto.com 5.4-STABLE FreeBSD 5.4-STABLE #0: Mon May  9 21:56:34 CEST 2005     root at euklides.gneto.com:/usr/obj/home/FreeBSD/RELENG_5/src/sys/EUKLIDES  i386

>Description:
Compiling www/apache13-modperl with expat from ports does not work.
This results in p5-SOAP-Lite segfaulting as apache includes its own outdated expat library. 
>How-To-Repeat:
Set in make.conf:
WITHOUT_APACHE_EXPAT=no
WITH_APACHE_INTERNAL_EXPAT=no

When compiling www/apache13 I get the following:
ldd /stable/usr/tmp/home/FreeBSD/FreeBSD-current/ports/www/apache13/work/apache_1.3.33/src/httpd
/stable/usr/tmp/home/FreeBSD/FreeBSD-current/ports/www/apache13/work/apache_1.3.33/src/httpd:
        libcrypt.so.2 => /lib/libcrypt.so.2 (0x280b3000)
        libexpat.so.5 => /usr/local/lib/libexpat.so.5 (0x280cc000)
        libc.so.5 => /lib/libc.so.5 (0x280ed000)

But not when compiling www/apache13-modperl:
euklides# ldd /stable/usr/tmp/home/FreeBSD/FreeBSD-current/ports/www/apache13-modperl/work/apache_1.3.33/src/httpd
/stable/usr/tmp/home/FreeBSD/FreeBSD-current/ports/www/apache13-modperl/work/apache_1.3.33/src/httpd:
        libcrypt.so.2 => /lib/libcrypt.so.2 (0x280f1000)
        libperl.so => /usr/local/lib/perl5/5.8.6/mach/CORE/libperl.so (0x2810a000)
        libm.so.3 => /lib/libm.so.3 (0x28211000)
        libutil.so.4 => /lib/libutil.so.4 (0x2822c000)
        libc.so.5 => /lib/libc.so.5 (0x28238000)

>Fix:
The following patch fixes the problem

--- Makefile.orig       Tue May 17 17:22:12 2005
+++ Makefile    Tue May 17 17:22:24 2005
@@ -48,10 +48,12 @@
 WRKSRC_MODPERL=        ${WRKDIR}/mod_perl-${VERSION_MODPERL}

 .if defined(WITHOUT_APACHE_EXPAT) && ${WITHOUT_APACHE_EXPAT} == yes
-EXPAT_CONF+=   --disable-rule=EXPAT
+EXPAT_CONF+=    --disable-rule=EXPAT
 .else
-LIB_DEPENDS+=  expat.5:${PORTSDIR}/textproc/expat2
-EXPAT_CONF+=   --enable-rule=EXPAT
+.if !defined(WITH_APACHE_INTERNAL_EXPAT) || ${WITH_APACHE_INTERNAL_EXPAT} != yes
+LIB_DEPENDS+=   expat.5:${PORTSDIR}/textproc/expat2
+.endif
+EXPAT_CONF+=    --enable-rule=EXPAT
 .endif

 .if defined(WITH_APACHE_SUEXEC) && ${WITH_APACHE_SUEXEC} == yes
@@ -124,11 +126,14 @@
 OPTIM+=                -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 .endif

-# For expat.
-CFLAGS+=       -I${LOCALBASE}/include
-LIBS+=         -L${LOCALBASE}/libs
-
 CONFIGURE_ENV= OPTIM='${OPTIM}' LIBS='${LIBS}'
+
+.if (!defined(WITHOUT_APACHE_EXPAT) || ${WITHOUT_APACHE_EXPAT} != yes) && \
+    (!defined(WITH_APACHE_INTERNAL_EXPAT) || ${WITH_APACHE_INTERNAL_EXPAT} != yes)
+CONFIGURE_ENV+= \
+                INCLUDES=-I${LOCALBASE}/include \
+                LDFLAGS=-L${LOCALBASE}/lib
+.endif

 MAN1=  dbmmanage.1 htdigest.1 htpasswd.1

>Release-Note:
>Audit-Trail:
>Unformatted: