Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Feb 2023 12:46:02 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 5d3023c9a23a - main - net-mgmt/xymon-server: Fix BUILD with LDAP option
Message-ID:  <202302111246.31BCk2jG031493@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5d3023c9a23a14e9bbbe74da4ca3ffb3077a1196

commit 5d3023c9a23a14e9bbbe74da4ca3ffb3077a1196
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-02-11 12:43:52 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-02-11 12:43:52 +0000

    net-mgmt/xymon-server: Fix BUILD with LDAP option
    
    - While converting USE_LDAP=yes to USES=ldap this port was missed. Fix
      this.
    - Utilize OPTIONS framework
    
    PR:             269486
    Reported by:    dinoex
    Approved by:    portmgr (just-fix-it)
    Fixes: 6e1233b Mk/**ldap.mk: Convert USE_LDAP to USES=ldap
---
 net-mgmt/xymon-server/Makefile | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index 7710f884a484..7dfd772b6907 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -52,17 +52,10 @@ FIXME2=		analysis.cfg combo.cfg holidays.cfg rrddefinitions.cfg \
 OPTIONS_DEFINE=DEBUG LDAP NETSNMP
 NETSNMP_DESC=Enable Net-SNMP support
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLDAP}
-MAKE_ENV+=	WITH_LDAP=1
-USE+=	ldap
-.endif
-
-.if ${PORT_OPTIONS:MNETSNMP}
-MAKE_ENV+=	WITH_NETSNMP=1
-LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
-.endif
+LDAP_USES=	ldap
+LDAP_MAKE_ENV=	WITH_LDAP=1
+NETSNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
+NETSNMP_MAKE_ENV=	WITH_NETSNMP=1
 
 post-patch:
 	${REINPLACE_CMD} -e 's|web-build client|web-build|' ${WRKSRC}/build/Makefile.rules



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302111246.31BCk2jG031493>