Sun Mar 7 18:30:13 2021 UTC ()
Pullup ticket #6432 - requested by mlelstv
www/squid4: build fix

(via patch)

building squid4 requires 64bit atomics. In pkgsrc-HEAD there is
mk/atomics64.mk with the necessary dependencies and www/squid4 includes
it.

In release 2020Q4 this is missing, so a simple pullup of the package
isn't sufficient unless mk/atomics64.mk is also pulled up.


(bsiegert)
diff -r1.13 -r1.13.4.1 pkgsrc/www/squid4/Makefile
cvs diff -r1.13 -r1.13.4.1 pkgsrc/www/squid4/Makefile (expand / switch to unified diff)

--- pkgsrc/www/squid4/Makefile 2020/08/31 18:13:16 1.13
+++ pkgsrc/www/squid4/Makefile 2021/03/07 18:30:13 1.13.4.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.13 2020/08/31 18:13:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.13.4.1 2021/03/07 18:30:13 bsiegert Exp $
2 2
3DISTNAME= squid-4.13 3DISTNAME= squid-4.13
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://www.squid-cache.org/Versions/v4/ 6MASTER_SITES= http://www.squid-cache.org/Versions/v4/
7MASTER_SITES+= ftp://ftp.squid-cache.org/pub/squid/ 7MASTER_SITES+= ftp://ftp.squid-cache.org/pub/squid/
8MASTER_SITES+= ftp://ftp.squid-cache.org/pub/archive/4/ 8MASTER_SITES+= ftp://ftp.squid-cache.org/pub/archive/4/
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.squid-cache.org/ 12HOMEPAGE= http://www.squid-cache.org/
13COMMENT= Post-Harvest_cached WWW proxy cache and accelerator 13COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
@@ -25,26 +25,33 @@ CONFIGURE_ARGS+= --enable-cachemgr-hostn @@ -25,26 +25,33 @@ CONFIGURE_ARGS+= --enable-cachemgr-hostn
25CONFIGURE_ARGS+= --enable-delay-pools 25CONFIGURE_ARGS+= --enable-delay-pools
26CONFIGURE_ARGS+= --enable-icap-client 26CONFIGURE_ARGS+= --enable-icap-client
27CONFIGURE_ARGS+= --enable-icmp 27CONFIGURE_ARGS+= --enable-icmp
28CONFIGURE_ARGS+= --enable-poll 28CONFIGURE_ARGS+= --enable-poll
29CONFIGURE_ARGS+= --enable-removal-policies=lru,heap 29CONFIGURE_ARGS+= --enable-removal-policies=lru,heap
30CONFIGURE_ARGS+= --enable-storeio=${SQUID_BACKENDS:Q} 30CONFIGURE_ARGS+= --enable-storeio=${SQUID_BACKENDS:Q}
31CONFIGURE_ARGS+= --with-aio 31CONFIGURE_ARGS+= --with-aio
32CONFIGURE_ARGS+= --with-default-user=${SQUID_USER} 32CONFIGURE_ARGS+= --with-default-user=${SQUID_USER}
33CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run/squid.pid 33CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run/squid.pid
34 34
35# Let 'purge' find correct config file by default. 35# Let 'purge' find correct config file by default.
36CPPFLAGS+= -DDEFAULT_SQUID_CONF=\"${PKG_SYSCONFDIR}/squid.conf\" 36CPPFLAGS+= -DDEFAULT_SQUID_CONF=\"${PKG_SYSCONFDIR}/squid.conf\"
37 37
 38.if ${MACHINE_ARCH} == "i386"
 39. if empty(CFLAGS:M*march=*)
 40CFLAGS+= -march=i586
 41CXXFLAGS+= -march=i586
 42. endif
 43.endif
 44
38BUILDLINK_TRANSFORM+= rm:-Werror 45BUILDLINK_TRANSFORM+= rm:-Werror
39 46
40MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} 47MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
41MAKE_ENV+= PKG_PREFIX=${PREFIX} VARBASE=${VARBASE} 48MAKE_ENV+= PKG_PREFIX=${PREFIX} VARBASE=${VARBASE}
42REPLACE_PERL+= contrib/url-normalizer.pl contrib/user-agents.pl \ 49REPLACE_PERL+= contrib/url-normalizer.pl contrib/user-agents.pl \
43 scripts/AnnounceCache.pl scripts/access-log-matrix.pl \ 50 scripts/AnnounceCache.pl scripts/access-log-matrix.pl \
44 scripts/cache-compare.pl scripts/cachetrace.pl \ 51 scripts/cache-compare.pl scripts/cachetrace.pl \
45 scripts/calc-must-ids.pl scripts/check_cache.pl \ 52 scripts/calc-must-ids.pl scripts/check_cache.pl \
46 scripts/fileno-to-pathname.pl scripts/find-alive.pl \ 53 scripts/fileno-to-pathname.pl scripts/find-alive.pl \
47 scripts/flag_truncs.pl scripts/icp-test.pl \ 54 scripts/flag_truncs.pl scripts/icp-test.pl \
48 scripts/icpserver.pl scripts/tcp-banger.pl \ 55 scripts/icpserver.pl scripts/tcp-banger.pl \
49 scripts/trace-job.pl scripts/trace-master.pl \ 56 scripts/trace-job.pl scripts/trace-master.pl \
50 scripts/udp-banger.pl scripts/upgrade-1.0-store.pl \ 57 scripts/udp-banger.pl scripts/upgrade-1.0-store.pl \
@@ -78,15 +85,18 @@ SUBST_STAGE.confs= pre-configure @@ -78,15 +85,18 @@ SUBST_STAGE.confs= pre-configure
78SUBST_FILES.confs= src/cf.data.pre 85SUBST_FILES.confs= src/cf.data.pre
79SUBST_SED.confs= -e "s/@DEFAULT_CACHE_EFFECTIVE_USER@/${SQUID_USER}/" 86SUBST_SED.confs= -e "s/@DEFAULT_CACHE_EFFECTIVE_USER@/${SQUID_USER}/"
80SUBST_MESSAGE.confs= Fixing configuration files. 87SUBST_MESSAGE.confs= Fixing configuration files.
81 88
82post-build: 89post-build:
83 cd ${WRKSRC}/src && ${CP} -pf squid.conf.documented squid.conf.default 90 cd ${WRKSRC}/src && ${CP} -pf squid.conf.documented squid.conf.default
84 91
85post-install: 92post-install:
86.for f in ${EGFILES} 93.for f in ${EGFILES}
87 ${INSTALL_DATA} ${WRKSRC}/${f} \ 94 ${INSTALL_DATA} ${WRKSRC}/${f} \
88 ${DESTDIR}${PREFIX}/${EGDIR}/`basename ${f} .default` 95 ${DESTDIR}${PREFIX}/${EGDIR}/`basename ${f} .default`
89.endfor 96.endfor
90 97
 98.if ${MACHINE_ARCH} == "powerpc"
 99. include "../../devel/libatomic/buildlink3.mk"
 100.endif
91.include "../../devel/libltdl/buildlink3.mk" 101.include "../../devel/libltdl/buildlink3.mk"
92.include "../../mk/bsd.pkg.mk" 102.include "../../mk/bsd.pkg.mk"