diff options
author | jlam <jlam> | 2002-02-28 18:28:14 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-02-28 18:28:14 +0000 |
commit | 348bff963b8798e9491873667d21308aa7825eef (patch) | |
tree | bd39dbf80c1cc5a8c13e75574c4068cc57712878 /www/ap-dav/patches | |
parent | 8a320ba8ef19ef51a577d274b1cc330788343863 (diff) | |
download | pkgsrc-348bff963b8798e9491873667d21308aa7825eef.tar.gz |
* Fix the build against expat as the apache xml headers are not correct for
the library routines we will use when loaded into httpd.
* This package won't work with apache-2.*, so ensure that it won't match
the apache dependency.
Diffstat (limited to 'www/ap-dav/patches')
-rw-r--r-- | www/ap-dav/patches/patch-aa | 39 | ||||
-rw-r--r-- | www/ap-dav/patches/patch-ab | 39 | ||||
-rw-r--r-- | www/ap-dav/patches/patch-ac | 13 |
3 files changed, 91 insertions, 0 deletions
diff --git a/www/ap-dav/patches/patch-aa b/www/ap-dav/patches/patch-aa new file mode 100644 index 00000000000..c59da60a782 --- /dev/null +++ b/www/ap-dav/patches/patch-aa @@ -0,0 +1,39 @@ +$NetBSD: patch-aa,v 1.1 2002/02/28 18:28:15 jlam Exp $ + +--- configure.in.orig Thu Oct 19 04:54:17 2000 ++++ configure.in +@@ -29,15 +29,6 @@ + CPPFLAGS="$CPPFLAGS -traditional-cpp" + fi + +-# +-# Check for /usr/pkg/{lib,include} which is where NetBSD puts binary +-# and source packages. This should be harmless on other OSs. +-# +-if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then +- CFLAGS="$CFLAGS -I/usr/pkg/include" +- LDFLAGS="$LDFLAGS -L/usr/pkg/lib" +-fi +- + AC_HEADER_STDC + + AC_MSG_CHECKING(for static Apache module support) +@@ -140,10 +131,17 @@ + default search.], + [ + if test "$withval" != "no" ; then +- if test -f "$withval/include/xmlparse.h" ; then ++ if test -f "$withval/include/expat.h" ; then + XML_DIR=$withval + XML_INCLUDE="$withval/include" + XML_LIB="$withval/lib" ++ fi ++ if test "$XML_DIR" = "" ; then ++ if test -f "$withval/include/xmlparse.h" ; then ++ XML_DIR=$withval ++ XML_INCLUDE="$withval/include" ++ XML_LIB="$withval/lib" ++ fi + fi + if test "$XML_DIR" = "" ; then + if test -f "$withval/include/xml/xmlparse.h" ; then diff --git a/www/ap-dav/patches/patch-ab b/www/ap-dav/patches/patch-ab new file mode 100644 index 00000000000..3a6efd9b7b2 --- /dev/null +++ b/www/ap-dav/patches/patch-ab @@ -0,0 +1,39 @@ +$NetBSD: patch-ab,v 1.1 2002/02/28 18:28:16 jlam Exp $ + +--- configure.orig Thu Oct 19 04:54:26 2000 ++++ configure +@@ -808,15 +808,6 @@ + CPPFLAGS="$CPPFLAGS -traditional-cpp" + fi + +-# +-# Check for /usr/pkg/{lib,include} which is where NetBSD puts binary +-# and source packages. This should be harmless on other OSs. +-# +-if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then +- CFLAGS="$CFLAGS -I/usr/pkg/include" +- LDFLAGS="$LDFLAGS -L/usr/pkg/lib" +-fi +- + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 + echo "configure:822: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. +@@ -1110,10 +1101,17 @@ + withval="$with_expat" + + if test "$withval" != "no" ; then +- if test -f "$withval/include/xmlparse.h" ; then ++ if test -f "$withval/include/expat.h" ; then ++ XML_DIR=$withval ++ XML_INCLUDE="$withval/include" ++ XML_LIB="$withval/lib" ++ fi ++ if test "$XML_DIR" = "" ; then ++ if test -f "$withval/include/xmlparse.h" ; then + XML_DIR=$withval + XML_INCLUDE="$withval/include" + XML_LIB="$withval/lib" ++ fi + fi + if test "$XML_DIR" = "" ; then + if test -f "$withval/include/xml/xmlparse.h" ; then diff --git a/www/ap-dav/patches/patch-ac b/www/ap-dav/patches/patch-ac new file mode 100644 index 00000000000..52772887946 --- /dev/null +++ b/www/ap-dav/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2002/02/28 18:28:16 jlam Exp $ + +--- dav_xmlparse.c.orig Tue Oct 17 04:48:16 2000 ++++ dav_xmlparse.c +@@ -18,7 +18,7 @@ + */ + + /* James Clark's Expat parser */ +-#include <xmlparse.h> ++#include <expat.h> + + #include "httpd.h" + #include "http_protocol.h" |