CVS commit: pkgsrc/www/c-icap

["Stephen Borrill" <sborrill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Mon Apr 24 14:35:02 UTC 2017

Modified Files:
        pkgsrc/www/c-icap: distinfo
        pkgsrc/www/c-icap/patches: patch-configure
Added Files:
        pkgsrc/www/c-icap/patches: patch-os_unix_shared_mem.c

Log Message:
Link-test shm_* functions rather than just compile test as this ignores
missing functions.
Define MAP_ANONYMOUS as a synonym of MAP_ANON if the former doesn't exist.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/c-icap/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/c-icap/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/www/c-icap/patches/patch-os_unix_shared_mem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/c-icap/distinfo
diff -u pkgsrc/www/c-icap/distinfo:1.10 pkgsrc/www/c-icap/distinfo:1.11
--- pkgsrc/www/c-icap/distinfo:1.10     Thu Feb  9 00:17:07 2017
+++ pkgsrc/www/c-icap/distinfo  Mon Apr 24 14:35:01 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2017/02/09 00:17:07 joerg Exp $
+$NetBSD: distinfo,v 1.11 2017/04/24 14:35:01 sborrill Exp $
 
 SHA1 (c_icap-0.4.4.tar.gz) = c2cf919215812a40053652f9501c1b8d3c40c684
 RMD160 (c_icap-0.4.4.tar.gz) = a69c5832951db9c424a3ea748d4512ec1ce313a2
@@ -6,4 +6,5 @@ SHA512 (c_icap-0.4.4.tar.gz) = b98ddbe6d
 Size (c_icap-0.4.4.tar.gz) = 636947 bytes
 SHA1 (patch-Makefile.in) = 103129c1bd438885290c3712c53b8e9d3cc3b1ab
 SHA1 (patch-cfg__param.c) = 005d22a2d0cc0f64b38a14477b1d21c28e361018
-SHA1 (patch-configure) = 0a4e857ef4f6277ba27d3ec33b2797978932f3e5
+SHA1 (patch-configure) = 409424011f1c44ad545c46c8f316a0452fe0db02
+SHA1 (patch-os_unix_shared_mem.c) = eeb40bf55224788743b53be08309c3d3f3fd143d

Index: pkgsrc/www/c-icap/patches/patch-configure
diff -u pkgsrc/www/c-icap/patches/patch-configure:1.7 pkgsrc/www/c-icap/patches/patch-configure:1.8
--- pkgsrc/www/c-icap/patches/patch-configure:1.7       Thu Feb  9 00:17:07 2017
+++ pkgsrc/www/c-icap/patches/patch-configure   Mon Apr 24 14:35:01 2017
@@ -1,11 +1,12 @@
-$NetBSD: patch-configure,v 1.7 2017/02/09 00:17:07 joerg Exp $
+$NetBSD: patch-configure,v 1.8 2017/04/24 14:35:01 sborrill Exp $
 
 Detect Berkeley DB.
 Link against librt on NetBSD, too.
+Link-test for shm_* functions.
 
---- configure.orig     2016-09-21 12:09:36.000000000 +0000
-+++ configure
-@@ -13210,12 +13210,11 @@ rm -f core conftest.err conftest.$ac_obj
+--- /pkg_comp/obj/pkgsrc/www/c-icap/default/c_icap-0.4.4/configure.orig        2016-09-21 12:09:36.000000000 +0000
++++ /pkg_comp/obj/pkgsrc/www/c-icap/default/c_icap-0.4.4/configure     2017-04-24 14:23:58.000000000 +0000
+@@ -13210,12 +13210,11 @@
       OLDCFLAGS=$CFLAGS
       OLDLDFLAGS=$LDFLAGS
       OLDLIBS=$LIBS
@@ -20,7 +21,7 @@ Link against librt on NetBSD, too.
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -13229,7 +13228,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -13229,7 +13228,7 @@
  
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
@@ -29,7 +30,28 @@ Link against librt on NetBSD, too.
  else
    libdb="no"; echo "no";
  
-@@ -14585,7 +14584,7 @@ if test a"$POSIX_SHARED_MEM" = "a1"; the
+@@ -14546,6 +14545,11 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if posix shared mem works" >&5
+ $as_echo_n "checking if posix shared mem works... " >&6; }
++case "$target_os" in
++linux*|netbsd*)
++      LIBS="-lrt  $LIBS"
++      ;;
++esac
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -14566,7 +14570,7 @@
+   return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
++if ac_fn_c_try_link "$LINENO"; then :
+ 
+ $as_echo "#define HAVE_POSIX_SHARED_MEM 1" >>confdefs.h
+ 
+@@ -14585,7 +14589,7 @@
  # Linux and solaris define the shm_open in -rt library.
  # This library already included in LIBS for solaris
  case "$target_os" in

Added files:

Index: pkgsrc/www/c-icap/patches/patch-os_unix_shared_mem.c
diff -u /dev/null pkgsrc/www/c-icap/patches/patch-os_unix_shared_mem.c:1.1
--- /dev/null   Mon Apr 24 14:35:02 2017
+++ pkgsrc/www/c-icap/patches/patch-os_unix_shared_mem.c        Mon Apr 24 14:35:01 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-os_unix_shared_mem.c,v 1.1 2017/04/24 14:35:01 sborrill Exp $
+
+Support MAP_ANON as a synonym of MAP_ANONYMOUS
+
+--- /pkg_comp/obj/pkgsrc/www/c-icap/default/c_icap-0.4.4/os/unix/shared_mem.c.orig     2017-04-24 14:00:54.000000000 +0000
++++ /pkg_comp/obj/pkgsrc/www/c-icap/default/c_icap-0.4.4/os/unix/shared_mem.c  2017-04-24 14:00:57.000000000 +0000
+@@ -29,6 +29,9 @@
+ #endif
+ #if defined(USE_POSIX_MAPPED_FILES)
+ #include <sys/mman.h>
++#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
++#define MAP_ANONYMOUS MAP_ANON
++#endif
+ #endif
+ #include <fcntl.h>
+ #include <errno.h>