From f39c447eb7d451a76a5526e604419331dd4cf0fd Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Sun, 29 Jul 2012 10:11:17 +0000
Subject: Changes 0.2.1: * Bug fixes

---
 www/c-icap/patches/patch-Makefile.in    |  4 ++--
 www/c-icap/patches/patch-configure      | 10 +++++-----
 www/c-icap/patches/patch-include_util.h | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 www/c-icap/patches/patch-include_util.h

(limited to 'www/c-icap/patches')

diff --git a/www/c-icap/patches/patch-Makefile.in b/www/c-icap/patches/patch-Makefile.in
index 6f7bc0fa065..d8d2e8f7165 100644
--- a/www/c-icap/patches/patch-Makefile.in
+++ b/www/c-icap/patches/patch-Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.in,v 1.1.1.1 2011/05/11 04:29:18 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2012/07/29 10:11:17 adam Exp $
 
 Handle configuration files.
 
 --- Makefile.in.orig	2011-03-28 19:22:39.000000000 +0000
 +++ Makefile.in
-@@ -1560,11 +1560,9 @@ doc:
+@@ -1581,11 +1581,9 @@ doc:
  	$(DOXYGEN) c-icap.dox
  
  install-data-local:
diff --git a/www/c-icap/patches/patch-configure b/www/c-icap/patches/patch-configure
index 9753a816942..b0da59d3047 100644
--- a/www/c-icap/patches/patch-configure
+++ b/www/c-icap/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.1.1.1 2011/05/11 04:29:18 adam Exp $
+$NetBSD: patch-configure,v 1.2 2012/07/29 10:11:17 adam Exp $
 
 Detect Berkeley DB.
 
 --- configure.orig	2011-05-05 12:27:48.000000000 +0000
 +++ configure
-@@ -11647,11 +11647,11 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11658,11 +11658,11 @@ rm -f core conftest.err conftest.$ac_obj
  #  Save old CFLAGS/LDFLAGS
       OLDCFLAGS=$CFLAGS
       OLDLDFLAGS=$LDFLAGS
@@ -13,12 +13,12 @@ Detect Berkeley DB.
          if test -d $libdbpath/include/db$DBVER; then
             echo -n "checking for Berleley DB under $libdbpath/include/db$DBVER and $libdbpath/lib/db$DBVER... "
             CFLAGS="-I$libdbpath/include/db$DBVER $OLDCFLAGS"
--           LDFLAGS="-L $libdbpath/lib/db$DBVER -ldb $OLDLDFLAGS"
-+           LDFLAGS="-L $libdbpath/lib -ldb$DBVER $OLDLDFLAGS"
+-           LDFLAGS="-L$libdbpath/lib/db$DBVER -ldb $OLDLDFLAGS"
++           LDFLAGS="-L$libdbpath/lib -ldb$DBVER $OLDLDFLAGS"
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -11665,7 +11665,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11676,7 +11676,7 @@ rm -f core conftest.err conftest.$ac_obj
  
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
diff --git a/www/c-icap/patches/patch-include_util.h b/www/c-icap/patches/patch-include_util.h
new file mode 100644
index 00000000000..35c84a3289e
--- /dev/null
+++ b/www/c-icap/patches/patch-include_util.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-include_util.h,v 1.1 2012/07/29 10:11:17 adam Exp $
+
+On Mac OS X, strnstr declaration is different
+
+--- include/util.h.orig	2012-05-27 20:30:13.000000000 +0000
++++ include/util.h
+@@ -42,8 +42,12 @@ CI_DECLARE_FUNC(struct tm*) gmtime_r(con
+ #endif
+ 
+ #ifndef HAVE_STRNSTR
++#ifdef __APPLE__
++CI_DECLARE_FUNC(char *) strnstr(const char *s, const char *find, size_t slen);
++#else
+ CI_DECLARE_FUNC(const char *) strnstr(const char *s, const char *find, size_t slen);
+ #endif
++#endif
+ 
+ #ifndef HAVE_STRNCASESTR
+ CI_DECLARE_FUNC(const char *) strncasestr(const char *s, const char *find, size_t slen);
-- 
cgit v1.2.3