Date: Thu, 15 Aug 2024 11:54:46 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4aeef9e30aca - main - net/mtr: Convert X11 option to x11 and nox11 flavors Message-ID: <202408151154.47FBskvi057194@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4aeef9e30aca4af6377166b26fc99430f6a7db7b commit 4aeef9e30aca4af6377166b26fc99430f6a7db7b Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2024-08-15 09:44:37 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> 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} ""
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408151154.47FBskvi057194>