CVS commit: pkgsrc/www/squid4

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Apr 27 04:00:10 UTC 2020

Modified Files:
        pkgsrc/www/squid4: Makefile

Log Message:
www/squid4: fix build for strict SUBST and configure checks


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/squid4/Makefile

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/Makefile
diff -u pkgsrc/www/squid4/Makefile:1.7 pkgsrc/www/squid4/Makefile:1.8
--- pkgsrc/www/squid4/Makefile:1.7      Thu Apr 23 13:52:24 2020
+++ pkgsrc/www/squid4/Makefile  Mon Apr 27 04:00:10 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2020/04/23 13:52:24 mef Exp $
+# $NetBSD: Makefile,v 1.8 2020/04/27 04:00:10 rillig Exp $
 
 DISTNAME=      squid-4.11
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  http://www.squid-cache.org/Versions/v4/
 MASTER_SITES+= ftp://ftp.squid-cache.org/pub/squid/
@@ -15,6 +16,7 @@ LICENSE=      gnu-gpl-v2
 USE_LANGUAGES=         c c++11
 USE_TOOLS+=            perl:run gmake
 GNU_CONFIGURE=         yes
+GNU_CONFIGURE_STRICT=  no # has sub-configure in libltdl
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --localstatedir=${SQUID_DATADIR}
 CONFIGURE_ARGS+=       --datarootdir=${PREFIX}/share/squid
@@ -73,7 +75,7 @@ RCD_SCRIPT_SRC.squid= files/squid.sh
 SUBST_CLASSES+=                confs
 SUBST_STAGE.confs=     pre-configure
 SUBST_FILES.confs=     src/cf.data.pre
-SUBST_SED.confs=       -e "s/@USER@/${SQUID_USER}/"
+SUBST_SED.confs=       -e "s/@DEFAULT_CACHE_EFFECTIVE_USER@/${SQUID_USER}/"
 SUBST_MESSAGE.confs=   Fixing configuration files.
 
 post-build: