summaryrefslogtreecommitdiff
path: root/www/apache22
diff options
context:
space:
mode:
authorrillig <rillig>2009-02-15 23:14:40 +0000
committerrillig <rillig>2009-02-15 23:14:40 +0000
commit4070caba9249d9f708e17314a5716ea8466e7da1 (patch)
tree672c9448f3e775a45a3c99216460a0a076f7b765 /www/apache22
parent5e744d352dc2c7a406251b19b933e2edbb983815 (diff)
downloadpkgsrc-4070caba9249d9f708e17314a5716ea8466e7da1.tar.gz
QNX needs a little compatibility patch.
Diffstat (limited to 'www/apache22')
-rw-r--r--www/apache22/distinfo3
-rw-r--r--www/apache22/patches/patch-aw15
2 files changed, 17 insertions, 1 deletions
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index 50a26599c16..298353a8ba3 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2009/01/25 09:59:51 tron Exp $
+$NetBSD: distinfo,v 1.17 2009/02/15 23:14:40 rillig Exp $
SHA1 (httpd-2.2.11.tar.bz2) = 7af256d53b79342f82222bd7b86eedbd9ac21d9a
RMD160 (httpd-2.2.11.tar.bz2) = b2012af716a459f666e0e41eb04808bd0f7fc28d
@@ -15,3 +15,4 @@ SHA1 (patch-aq) = 27a0093fc75dcafc673abc25e9ebe80167f52ac1
SHA1 (patch-as) = 7880eae75b702563bff8bca833ca81fb3dc4444c
SHA1 (patch-au) = d4c623bb953ac45cb4c8d95fc1d3c2788452d9a1
SHA1 (patch-av) = faf8fe2c72c7830daa407907b8161b56300afeaf
+SHA1 (patch-aw) = ca53d67beeb2c2c4d9adb04d3d79e24a8c427fd4
diff --git a/www/apache22/patches/patch-aw b/www/apache22/patches/patch-aw
new file mode 100644
index 00000000000..cf6884f729b
--- /dev/null
+++ b/www/apache22/patches/patch-aw
@@ -0,0 +1,15 @@
+$NetBSD: patch-aw,v 1.1 2009/02/15 23:14:40 rillig Exp $
+
+--- modules/metadata/mod_mime_magic.c.orig 2006-10-03 14:47:35.000000000 +0200
++++ modules/metadata/mod_mime_magic.c 2009-02-14 09:23:40.000000000 +0100
+@@ -106,6 +106,10 @@
+ #include <utime.h>
+ #endif
+
++#ifdef __QNX__ /* naming conflict with <malloc.h> */
++#define mcheck mod_mime_magic_mcheck
++#endif
++
+ /*
+ * data structures and related constants
+ */