From nobody Wed Aug 02 21:18:23 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RGPwb0xnkzZnYh; Wed, 2 Aug 2023 21:18:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RGPwJ0MzKz3PdK; Wed, 2 Aug 2023 21:18:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691011104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LH1OsveX/qW8KKy+D91Wnev+PQiESbdjEMcb3gMjk9A=; b=MN8MHtkHGxeC2D895B2Ro/nJ3Pjb8J6POvGCtLqUJlne5wgBQ11zx7iG8oes5H9XoPHRsd hbqLIR7yxEzBDpkxMdODKFXzLjedGmM4SmdHNt7OwbyYOguUjH6JcWvVPi//C2ZnKZ0D9b n//tJFb/k38iy0FX0UK1/kTIMAMOA+kUeXzlNB2HiYi71mJxe9RBddJV8Y7DtwkugyUEY5 073FFtnDXNqsthmDNG98MAtyonVvkYRc2mmiVWwSHVQoBBYzES2+zSM4jCmBYeAsafsaVQ CltAIOPxEm9So+cGweWNX8CUh9MuG1phnfD/Bi3mtFVu+SFf+sCCTHMwJRVYQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691011104; a=rsa-sha256; cv=none; b=EAnT4SVZu1C5UXkQIHzegBOEVGEf/DO9dGpbAcYk6Sk93PjXIxR0+upDHDyOIEEf6eO6HY 3yrtKuaiEWxBxqum1Mu2kUs7L7ZaR+NL6BKZmRg8l2cUgXCTTAKRO88VIbo7siWUf/WVue WRcATz0QYJP6Mdq5sFJ2yvMxq1tukukvLnMqfqb20lnOGjnI11LONX+lUL402iOkXPVvyq VgfqKoK3F1MR3dVv31ThPl5T/ptbKXYIxzbMv8m0X2BqTsqz+1CayhTXCWgh1e/j5/zn7z 0VaU26JgaTJj0V6vOrgV0DIgbOQAa9Lvt+cydreF7iDMJFRgKQavQhi5HZXGWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691011104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LH1OsveX/qW8KKy+D91Wnev+PQiESbdjEMcb3gMjk9A=; b=uXnwfUa3p0qhdU4sjw/1LU3oI8H9J4GRNF8jhee5oSbWXPuQN6OC4ypuNQTZ4aezreKRXQ Y9I5rVRyOxpBf/9UXfjsdgBpkdZ2MMqmcuO3u2KKFjbqoUPhlHVFdlUALgnQFwIaATF/9Z CnO9FbU3hBnV/mjc8RfwTaDK65uvatA8l0Ru61qFwLsJz9iKlGmT0p0rq/LgLrdt/z2tOp dL1WqYJVTYneeZRLXsgZRT4gGoisAv7A3Yh4C8qdebJkNFGU8N56cIyL02CyC6bqa38t58 LNad2E0i18ZRV5/KJGnxTbWRrnydt5IFTcUfBrWSMwZR1rZSW08qBnjwHfOnbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RGPwH6GghzZR3; Wed, 2 Aug 2023 21:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 372LIN8D017544; Wed, 2 Aug 2023 21:18:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372LINUr017543; Wed, 2 Aug 2023 21:18:23 GMT (envelope-from git) Date: Wed, 2 Aug 2023 21:18:23 GMT Message-Id: <202308022118.372LINUr017543@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: f83a6b9b6256 - main - sysutils/ganglia-monitor-core: Fix build with llvm16 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f83a6b9b6256ee9e5b14a69cc47f865fb6f500dc Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=f83a6b9b6256ee9e5b14a69cc47f865fb6f500dc commit f83a6b9b6256ee9e5b14a69cc47f865fb6f500dc Author: Muhammad Moinur Rahman AuthorDate: 2023-08-02 19:28:30 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-02 21:18:13 +0000 sysutils/ganglia-monitor-core: Fix build with llvm16 - Utilize OPTIONSNG where possible Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- sysutils/ganglia-monitor-core/Makefile | 55 +++++++++++++++++----------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile index 0b5d18181e61..79f99de0d52a 100644 --- a/sysutils/ganglia-monitor-core/Makefile +++ b/sysutils/ganglia-monitor-core/Makefile @@ -20,46 +20,45 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \ libpcre.so:devel/pcre \ libexpat.so:textproc/expat2 -USES= libtool pkgconfig +USES= libtool localbase:ldflags pkgconfig +USE_LDCONFIG= yes +USE_RC_SUBR= gmond GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-setuid=ganglia --enable-setgid=ganglia \ --disable-python CONFIGURE_ENV= GANGLIA_ACK_SYSCONFDIR=1 -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib + +INSTALL_TARGET= install-strip + +SUB_FILES+= pkg-message USERS= ganglia GROUPS= ganglia -OPTIONS_DEFINE= GMETAD -OPTIONS_DEFAULT= GMETAD -GMETAD_DESC= include gmetad - PLIST_SUB+= PORTVERSION=${PORTVERSION} -SUB_FILES+= pkg-message +OPTIONS_DEFINE= GMETAD +OPTIONS_DEFAULT= GMETAD +OPTIONS_SUB= yes -INSTALL_TARGET= install-strip +GMETAD_DESC= include gmetad -USE_RC_SUBR= gmond +GMETAD_LIB_DEPENDS= librrd.so:databases/rrdtool +GMETAD_CONFIGURE_ON= --with-gmetad +GMETAD_SUB_LIST= GMETAD="" +GMETAD_SUB_LIST_OFF= GMETAD="\#" .include +.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + .if ${PORT_OPTIONS:MGMETAD} USE_RC_SUBR+= gmetad - -LIB_DEPENDS+= librrd.so:databases/rrdtool -CONFIGURE_ARGS+= --with-gmetad -PLIST_SUB+= GMETAD="" -SUB_LIST+= GMETAD="" -.else -PLIST_SUB+= GMETAD="@comment " -SUB_LIST+= GMETAD="\#" .endif -USE_LDCONFIG= yes - CONF_DIR= ${PREFIX}/etc MODULES= modcpu.so \ @@ -91,14 +90,6 @@ post-build: post-install: ${INSTALL_DATA} ${WRKDIR}/gmond.conf \ ${STAGEDIR}${PREFIX}/etc/gmond.conf.sample -.if ${PORT_OPTIONS:MGMETAD} - ${INSTALL_SCRIPT} ${FILESDIR}/gmetasnap.sh \ - ${STAGEDIR}${PREFIX}/sbin/gmetasnap - ${INSTALL_DATA} ${WRKSRC}/gmetad/gmetad.conf \ - ${STAGEDIR}${PREFIX}/etc/gmetad.conf.sample - ${INSTALL_MAN} ${WRKSRC}/mans/gmetad.1 \ - ${STAGEDIR}${MANPREFIX}/man/man1 -.endif ${INSTALL_MAN} \ ${WRKSRC}/mans/gmetric.1 \ ${WRKSRC}/mans/gmond.1 \ @@ -109,4 +100,12 @@ post-install: ${MKDIR} ${STAGEDIR}/var/db/ganglia/rrds @${CHMOD} -R a+rX ${STAGEDIR}/var/db/ganglia +post-install-GMETAD-on: + ${INSTALL_SCRIPT} ${FILESDIR}/gmetasnap.sh \ + ${STAGEDIR}${PREFIX}/sbin/gmetasnap + ${INSTALL_DATA} ${WRKSRC}/gmetad/gmetad.conf \ + ${STAGEDIR}${PREFIX}/etc/gmetad.conf.sample + ${INSTALL_MAN} ${WRKSRC}/mans/gmetad.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 + .include