Received: by mail.netbsd.org (Postfix, from userid 605) id 14E8B84EA1; Wed, 3 Jan 2018 15:55:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9366084D23 for ; Wed, 3 Jan 2018 15:55:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Q9if7hNjS2R2 for ; Wed, 3 Jan 2018 15:55:37 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 1D0C484CD8 for ; Wed, 3 Jan 2018 15:55:37 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1801BFBDE; Wed, 3 Jan 2018 15:55:37 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_15149949371460" MIME-Version: 1.0 Date: Wed, 3 Jan 2018 15:55:37 +0000 From: "Filip Hajny" Subject: CVS commit: pkgsrc/www/trafficserver To: pkgsrc-changes@NetBSD.org Reply-To: fhajny@netbsd.org X-Mailer: log_accum Message-Id: <20180103155537.1801BFBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_15149949371460 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: fhajny Date: Wed Jan 3 15:55:37 UTC 2018 Modified Files: pkgsrc/www/trafficserver: Makefile PLIST Log Message: Avoid identifying inotify on modern SunOS platforms, fixes build. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/trafficserver/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/trafficserver/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_15149949371460 Content-Disposition: inline Content-Length: 1823 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/trafficserver/Makefile diff -u pkgsrc/www/trafficserver/Makefile:1.4 pkgsrc/www/trafficserver/Makefile:1.5 --- pkgsrc/www/trafficserver/Makefile:1.4 Mon Jan 1 21:18:56 2018 +++ pkgsrc/www/trafficserver/Makefile Wed Jan 3 15:55:36 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2018/01/01 21:18:56 adam Exp $ +# $NetBSD: Makefile,v 1.5 2018/01/03 15:55:36 fhajny Exp $ DISTNAME= trafficserver-7.1.1 PKGREVISION= 1 @@ -90,6 +90,7 @@ CONFIGURE_ARGS+= --with-user=${TS_USER} CONFIGURE_ARGS+= --with-xml=expat CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_ctl=no +CONFIGURE_ENV.SunOS+= ac_cv_func_inotify_init=no CONFIGURE_ENV+= SPHINXBUILD=sphinx-build${PYVERSSUFFIX} REPLACE_BASH+= tools/tsxs.in @@ -103,6 +104,11 @@ PKGCONFIG_OVERRIDE+= tools/trafficserver SMF_SRCDIR= ${WRKSRC}/rc SMF_MANIFEST= trafficserver.xml +PLIST_VARS+= inotify +.if ${OPSYS} == "Linux" +PLIST.inotify= yes +.endif + TEST_TARGET= check .include "../../devel/libexecinfo/buildlink3.mk" Index: pkgsrc/www/trafficserver/PLIST diff -u pkgsrc/www/trafficserver/PLIST:1.1 pkgsrc/www/trafficserver/PLIST:1.2 --- pkgsrc/www/trafficserver/PLIST:1.1 Thu Aug 17 14:57:09 2017 +++ pkgsrc/www/trafficserver/PLIST Wed Jan 3 15:55:36 2018 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2017/08/17 14:57:09 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.2 2018/01/03 15:55:36 fhajny Exp $ bin/traffic_cop bin/traffic_crashlog bin/traffic_ctl @@ -67,7 +67,7 @@ libexec/trafficserver/esi.la libexec/trafficserver/generator.la libexec/trafficserver/gzip.la libexec/trafficserver/header_rewrite.la -libexec/trafficserver/healthchecks.la +${PLIST.inotify}libexec/trafficserver/healthchecks.la libexec/trafficserver/libloader.la libexec/trafficserver/regex_remap.la libexec/trafficserver/regex_revalidate.la --_----------=_15149949371460--