From nobody Thu Aug 15 11:54:46 2024 X-Original-To: dev-commits-ports-all@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 4Wl3T30Jfvz5TTnX; Thu, 15 Aug 2024 11:54:47 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wl3T23L90z3xwG; Thu, 15 Aug 2024 11:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723722886; 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=NOVr27NfGtwk2XJotGXGMUmdDE6vo/eA/HzMNCJ2Xnc=; b=LdJ9NL1fNraJZ/krLKm2bxJOp7Uim413LakwGBUq7qby/sDAlyvb2BWe3gyvdBny6IO6Kf Nzxr1tXTGYk1CH5987ewUB6DF4eDEr5SIZ4PyzwE8BIhp/t1JPhcxknlLTYNj0DKNeo3oy ymJ86FUOMnyskMAxJX6JLjGecsmihpholYuKlUtNbDMAzN4/CHvn5IBh0hqYpk0pDDhmQA lEmbmEcJEK9TMPKomGhk4dTCQ4Cc+IqDivZZFljZPlWiJPanlTRBJIhs22L3F6KjD0ZoaZ FszWbI9d06BZxapgt+Eq6X99nHy3cGKvUbyloRu7suMW7d6ejlpx95CGdR9edw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723722886; a=rsa-sha256; cv=none; b=cETMLyHt4FxhQty5+4EgxhuXcBLbpJnktwmFmr+1OKnZO3vZmdjauLn/uXUu2Ba7tkqXYD 0VnKrhUaxYqWYYzW9UkFT4VqyqLPnQlWXdiQM9Y/XlP21iamhibAwONwZ9akpTZhIUGi9+ 3qBakwg775EXHq9U9yQ+yCcQyoOTZX11q977af2PzQIfb+Gyp9iOxhj8GMdoUkc4YbgVsk msECt276AZYv/LylD1AWbCsGs13/KufbWKsI3kmSUfx6YlDmD3c+51ppw5N8xmV37+RHQk aDX1nU2j+5+oaDDrFOt+OCT3oqWJ8j9U6uIVcPu29NUWvII7oTuRpqI0trgNJA== 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=1723722886; 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=NOVr27NfGtwk2XJotGXGMUmdDE6vo/eA/HzMNCJ2Xnc=; b=I/SvkWU84HwjozQJ5PhDHxQezrzK/Y0IWLZlF7dkRoSk8dOo++u7pnHpNPB8Wfhj3O+//H eEcmxcn23xp1PZ5vsDC5qfvUslGe1zc8OYiiSG+GaoHVXDi7hGaZOTDYe3Lrk6oePYsGqb XJigVB8T1mnBo2S/NInV6DdxRa2hc+hDIsMap6SyAcevyIuwc9iDbGDxEqsWuMRCPdchfD Fpkpo68ZkvsgAURM1wNLDDVOG0RHBk98Z0Bb77VHXNqdxEZZuSIhuIy54JIp/W6bbUmjk6 lbIniSUlDfVbfd92hao27+rMBxjg7mq+PDw459/PO+onddTl8b6G1vQswYO06Q== 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 4Wl3T22w7zzLd8; Thu, 15 Aug 2024 11:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FBskje057197; Thu, 15 Aug 2024 11:54:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FBskvi057194; Thu, 15 Aug 2024 11:54:46 GMT (envelope-from git) Date: Thu, 15 Aug 2024 11:54:46 GMT Message-Id: <202408151154.47FBskvi057194@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 4aeef9e30aca - main - net/mtr: Convert X11 option to x11 and nox11 flavors List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4aeef9e30aca4af6377166b26fc99430f6a7db7b Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4aeef9e30aca4af6377166b26fc99430f6a7db7b commit 4aeef9e30aca4af6377166b26fc99430f6a7db7b Author: Po-Chuan Hsieh AuthorDate: 2024-08-15 09:44:37 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-08-15 10:55:29 +0000 net/mtr: Convert X11 option to x11 and nox11 flavors net/mtr-nox11 is net/mtr@nox11 now. --- net-mgmt/librenms/Makefile | 2 +- net-mgmt/observium/Makefile | 2 +- net-mgmt/xymon-server/Makefile | 2 +- net/mtr/Makefile | 19 +++++++++++++------ 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index c450569e4960..53a37eaecde9 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -112,7 +112,7 @@ NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios NMAP_RUN_DEPENDS= nmap:security/nmap WMIC_RUN_DEPENDS= wmic:net-mgmt/wmi-client X11_RUN_DEPENDS= mtr:net/mtr -X11_RUN_DEPENDS_OFF= mtr:net/mtr-nox11 +X11_RUN_DEPENDS_OFF= mtr:net/mtr@nox11 X11_USES= magick:6 X11_USES_OFF= magick:6,nox11 diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile index 811fdc167cad..1291d92f7bc3 100644 --- a/net-mgmt/observium/Makefile +++ b/net-mgmt/observium/Makefile @@ -34,7 +34,7 @@ NO_BUILD= yes RUN_DEPENDS+= rrdtool:databases/rrdtool \ dot:graphics/graphviz \ - mtr:net/mtr-nox11 \ + mtr:net/mtr@nox11 \ ${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4@${PHP_FLAVOR} \ ${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6@${PHP_FLAVOR} \ snmpget:net-mgmt/net-snmp \ diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile index 80f496c9bb02..fd0da5d3ac0e 100644 --- a/net-mgmt/xymon-server/Makefile +++ b/net-mgmt/xymon-server/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libpng.so:graphics/png \ libcares.so:dns/c-ares RUN_DEPENDS= rrdtool:databases/rrdtool \ fping:net/fping \ - mtr:net/mtr-nox11 + mtr:net/mtr@nox11 USERS= xymon GROUPS= xymon diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 54f15e84b2a1..8c9aecf484d2 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -17,22 +17,29 @@ USES= autoreconf ncurses pkgconfig GNU_CONFIGURE= yes LDFLAGS+= -lncurses +FLAVORS= x11 nox11 +FLAVOR?= ${FLAVORS:[1]} +nox11_PKGNAMESUFFIX= -nox11 +.if ${FLAVOR} == x11 +CONFIGURE_ARGS+=--with-gtk +USE_GNOME= gtk20 +USES+= gnome +.else +CONFIGURE_ARGS+=--without-gtk +.endif + USE_GITHUB= yes GH_ACCOUNT= traviscross CONFLICTS_INSTALL= mtr mtr-nox11 -OPTIONS_DEFINE= IPV6 JSON X11 -OPTIONS_DEFAULT=JSON X11 +OPTIONS_DEFINE= IPV6 JSON +OPTIONS_DEFAULT=JSON JSON_DESC= JSON support -X11_DESC= Build X11-enabled mtr IPV6_CONFIGURE_ENABLE= ipv6 JSON_CONFIGURE_WITH= jansson JSON_LIB_DEPENDS= libjansson.so:devel/jansson -X11_CONFIGURE_WITH= gtk -X11_USE= GNOME=gtk20 -X11_USES= gnome post-install: @${ECHO_MSG} ""