Thu Feb 5 16:39:18 2009 UTC ()
Re-introduce support for APACHE_CUSTOM_CFLAGS in mk.conf


(sborrill)
diff -r1.37 -r1.38 pkgsrc/www/apache22/Makefile
cvs diff -r1.37 -r1.38 pkgsrc/www/apache22/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache22/Attic/Makefile 2009/01/24 21:55:31 1.37
+++ pkgsrc/www/apache22/Attic/Makefile 2009/02/05 16:39:18 1.38
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.37 2009/01/24 21:55:31 darcy Exp $ 1# $NetBSD: Makefile,v 1.38 2009/02/05 16:39:18 sborrill Exp $
2 2
3DISTNAME= httpd-2.2.11 3DISTNAME= httpd-2.2.11
4PKGREVISION= 1 4PKGREVISION= 1
5PKGNAME= ${DISTNAME:S/httpd/apache/} 5PKGNAME= ${DISTNAME:S/httpd/apache/}
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ 7MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
8 ${MASTER_SITE_APACHE:=httpd/old/} 8 ${MASTER_SITE_APACHE:=httpd/old/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= tron@NetBSD.org 11MAINTAINER= tron@NetBSD.org
12HOMEPAGE= http://httpd.apache.org/ 12HOMEPAGE= http://httpd.apache.org/
13COMMENT= Apache HTTP (Web) server, version 2 13COMMENT= Apache HTTP (Web) server, version 2
14 14
@@ -17,26 +17,29 @@ PKG_DESTDIR_SUPPORT= user-destdir @@ -17,26 +17,29 @@ PKG_DESTDIR_SUPPORT= user-destdir
17CONFLICTS= apache-{,*ssl}-[0-9]* apache6-[0-9]* 17CONFLICTS= apache-{,*ssl}-[0-9]* apache6-[0-9]*
18 18
19BUILD_DEFS+= IPV6_READY 19BUILD_DEFS+= IPV6_READY
20BUILD_DEFS+= VARBASE 20BUILD_DEFS+= VARBASE
21 21
22USE_TOOLS+= pax perl perl:run pkg-config 22USE_TOOLS+= pax perl perl:run pkg-config
23USE_LIBTOOL= yes 23USE_LIBTOOL= yes
24GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
25CONFIGURE_ARGS+= --enable-layout=NetBSD 25CONFIGURE_ARGS+= --enable-layout=NetBSD
26CONFIGURE_ARGS+= --with-port=80 26CONFIGURE_ARGS+= --with-port=80
27CONFIGURE_ARGS+= --enable-so 27CONFIGURE_ARGS+= --enable-so
28CONFIGURE_ENV+= perlbin=${PERL5:Q} 28CONFIGURE_ENV+= perlbin=${PERL5:Q}
29CONFIGURE_ENV+= ac_cv_path_RSYNC=/nonexistent 29CONFIGURE_ENV+= ac_cv_path_RSYNC=/nonexistent
 30CONFIGURE_ARGS+= CFLAGS=${APACHE_CUSTOM_CFLAGS:Q}
 31
 32BUILD_DEFS+= APACHE_CUSTOM_CFLAGS
30 33
31# Apache Portable Runtime library configure options 34# Apache Portable Runtime library configure options
32CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr} 35CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr}
33CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util} 36CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util}
34 37
35CHECK_INTERPRETER_SKIP+= lib/httpd/httpd.exp 38CHECK_INTERPRETER_SKIP+= lib/httpd/httpd.exp
36CHECK_PORTABILITY_SKIP+= srclib/pcre/* \ 39CHECK_PORTABILITY_SKIP+= srclib/pcre/* \
37 srclib/apr-util/* \ 40 srclib/apr-util/* \
38 srclib/apr/* 41 srclib/apr/*
39 42
40# the following must be set before bsd.prefs.mk in order to make += work 43# the following must be set before bsd.prefs.mk in order to make += work
41# in mk.conf; however, it isn't expanded until referenced, so we can 44# in mk.conf; however, it isn't expanded until referenced, so we can
42# define DFLT_APACHE_MODULES later 45# define DFLT_APACHE_MODULES later