CVS commit: pkgsrc/www/squid4

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Mon Aug 15 08:51:16 UTC 2022

Modified Files:
        pkgsrc/www/squid4: distinfo
        pkgsrc/www/squid4/patches: patch-configure

Log Message:
www/squid4: trying to remove references to the build directory

Trying to remove references to the build directory related to PKG_CONF*.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/squid4/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/squid4/patches/patch-configure

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

Modified files:

Index: pkgsrc/www/squid4/distinfo
diff -u pkgsrc/www/squid4/distinfo:1.15 pkgsrc/www/squid4/distinfo:1.16
--- pkgsrc/www/squid4/distinfo:1.15     Tue Oct 26 11:31:08 2021
+++ pkgsrc/www/squid4/distinfo  Mon Aug 15 08:51:16 2022
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.15 2021/10/26 11:31:08 nia Exp $
+$NetBSD: distinfo,v 1.16 2022/08/15 08:51:16 taca Exp $
 
 BLAKE2s (squid-4.17.tar.xz) = 017ccf4d7df44393dafc40347e66d3b6d7498c5aef9654ae6401d5a1a5b6f883
 SHA512 (squid-4.17.tar.xz) = cea36de10f128f5beb51bdc89604c16af3a820a5ac27284b2aa181ac87144930489688e1d85ce357fe1ed8a4e96e300277b95034a2475cbf86c9d6923ddf7c0a
 Size (squid-4.17.tar.xz) = 2464204 bytes
 SHA1 (patch-compat_compat.h) = 839381a5e1f46e7d9b822bbb53d82a53c996ddc0
-SHA1 (patch-configure) = d19dcb189447f9693d29bf477ebb6c5a7d479ec8
+SHA1 (patch-configure) = b8c6d66a59d8fd1e5b042889a36c32e15e9629c4
 SHA1 (patch-errors_Makefile.in) = 84cbf5c836f02ed5fbfff140888c6d3aadeac326
 SHA1 (patch-src_Makefile.in) = afc5aefd97c46d1ffab43e97aeaeade3a5a8c648
 SHA1 (patch-src_acl_external_kerberos__ldap__group_support__resolv.cc) = 0ea41d55e32d689a16e012391a9eea67631daf3a

Index: pkgsrc/www/squid4/patches/patch-configure
diff -u pkgsrc/www/squid4/patches/patch-configure:1.7 pkgsrc/www/squid4/patches/patch-configure:1.8
--- pkgsrc/www/squid4/patches/patch-configure:1.7       Sun Oct 10 15:55:47 2021
+++ pkgsrc/www/squid4/patches/patch-configure   Mon Aug 15 08:51:16 2022
@@ -1,14 +1,25 @@
-$NetBSD: patch-configure,v 1.7 2021/10/10 15:55:47 taca Exp $
+$NetBSD: patch-configure,v 1.8 2022/08/15 08:51:16 taca Exp $
 
 * More support for OpenSSL 1.1; not only check SSL_Library_init() but
   also check OPENSSL_init_ssl().
 * Fix syntax error by accidental new line.
 * Utilize <stdlib.h> on BSD.
 * Do not override CFLAGS/CXXFLAGS except linux.
+* Prevent WRKDIR reference.
 
 --- configure.orig     2021-10-03 17:15:01.000000000 +0000
 +++ configure
-@@ -24425,10 +24425,12 @@ do
+@@ -1114,9 +1114,6 @@ CXXFLAGS
+ CCC
+ BUILDCXX
+ CPP
+-PKG_CONFIG
+-PKG_CONFIG_PATH
+-PKG_CONFIG_LIBDIR
+ LT_SYS_LIBRARY_PATH
+ CXXCPP
+ LIBXML2_CFLAGS
+@@ -24425,10 +24422,12 @@ do
  done
  
    # GLIBC 2.30 deprecates sysctl.h. Test with the same flags that (may) break includes later.
@@ -24,7 +35,7 @@ $NetBSD: patch-configure,v 1.7 2021/10/1
        ${TRUE}
        ;;
      mingw)
-@@ -24478,6 +24480,7 @@ then :
+@@ -24478,6 +24477,7 @@ then :
  fi
  
    ac_fn_cxx_check_header_compile "$LINENO" "net/if_arp.h" "ac_cv_header_net_if_arp_h" "
@@ -32,7 +43,7 @@ $NetBSD: patch-configure,v 1.7 2021/10/1
  #include <sys/types.h>
  #include <sys/socket.h>
  
-@@ -24488,6 +24491,7 @@ then :
+@@ -24488,6 +24488,7 @@ then :
  
  fi
  ac_fn_cxx_check_header_compile "$LINENO" "net/route.h" "ac_cv_header_net_route_h" "
@@ -40,7 +51,7 @@ $NetBSD: patch-configure,v 1.7 2021/10/1
  #include <sys/types.h>
  #include <sys/socket.h>
  
-@@ -25381,7 +25385,51 @@ then :
+@@ -25381,7 +25382,51 @@ then :
    LIBOPENSSL_LIBS="-lssl $LIBOPENSSL_LIBS"
  else $as_nop
  
@@ -93,7 +104,7 @@ $NetBSD: patch-configure,v 1.7 2021/10/1
  
  fi
  
-@@ -25482,7 +25530,51 @@ then :
+@@ -25482,7 +25527,51 @@ then :
    LIBOPENSSL_LIBS="-lssl $LIBOPENSSL_LIBS"
  else $as_nop
  
@@ -146,7 +157,7 @@ $NetBSD: patch-configure,v 1.7 2021/10/1
  
  fi
  
-@@ -42202,6 +42294,8 @@ else
+@@ -42202,6 +42291,8 @@ else
  # elif defined _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -155,7 +166,7 @@ $NetBSD: patch-configure,v 1.7 2021/10/1
  # else
  #  ifdef  __cplusplus
  extern "C"
-@@ -45149,6 +45243,9 @@ printf "%s\n" "#define USE_SOLARIS_IPFIL
+@@ -45149,6 +45240,9 @@ printf "%s\n" "#define USE_SOLARIS_IPFIL
  #if USE_SOLARIS_IPFILTER_MINOR_T_HACK
  #define minor_t fubar
  #endif