Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Feb 2025 12:23:39 GMT
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 0f6517b9d087 - main - net-mgmt/lldpd: Update to 1.0.19
Message-ID:  <202502091223.519CNdZH051079@gitrepo.freebsd.org>

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=0f6517b9d087243796cd05e08f54134089afdae9

commit 0f6517b9d087243796cd05e08f54134089afdae9
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-02-09 11:55:55 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-02-09 12:19:31 +0000

    net-mgmt/lldpd: Update to 1.0.19
    
    * Remove C standard override
    * Remove obsolete MANPREFIX
    * Add GitHub as primary site and media.luffy.cx as fallback
    * Adjust FLAVOR handling in Makefile
    * Remove bundled libevent, stops ports from running configure on bundled version
    * Rework Makefile to closer follow Porters Handbook and improve readability
    * Rename XML menu option to LIBXML2
    
    Initial patch submitted by John W. O'Brien <john@saltant.com>
    
    PR:             284005
    Approved by:    portmgr (maintainer timeout, 4+ weeks)
    Sponsored by:   Saltant Solutions LLC (initial patch)
---
 net-mgmt/lldpd/Makefile  | 57 +++++++++++++++++++++++++++++-------------------
 net-mgmt/lldpd/distinfo  |  6 ++---
 net-mgmt/lldpd/pkg-plist |  2 +-
 3 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/net-mgmt/lldpd/Makefile b/net-mgmt/lldpd/Makefile
index 644fa2f5d450..b011c518822b 100644
--- a/net-mgmt/lldpd/Makefile
+++ b/net-mgmt/lldpd/Makefile
@@ -1,7 +1,8 @@
 PORTNAME=	lldpd
-PORTVERSION=	1.0.18
+DISTVERSION=	1.0.19
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://media.luffy.cx/files/${PORTNAME}/
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ \
+		http://media.luffy.cx/files/${PORTNAME}/
 
 MAINTAINER=	freebsd@simweb.ch
 COMMENT=	Link-Layer Discovery Protocol (LLDP 802.1ab) daemon
@@ -13,15 +14,25 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libevent.so:devel/libevent
 
 FLAVORS=	default tiny
+FLAVOR?=	${FLAVORS:[1]}
 tiny_PKGNAMESUFFIX=	-tiny
 
 USES=		cpe libtool pkgconfig
 CPE_VENDOR=	${PORTNAME}_project
-USE_CSTD=	gnu99
 USE_LDCONFIG=	yes
+
+EXTRACT_AFTER_ARGS=	--exclude ${DISTNAME}/libevent \
+			--no-same-owner --no-same-permissions
+
 USE_RC_SUBR=	${PORTNAME}
+
+USERS=		_lldpd
+GROUPS= 	_lldpd
+
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+
+INSTALL_TARGET=	install-strip
+
 CONFIGURE_ARGS=	--disable-doxygen-doc \
 		--enable-hardening \
 		--enable-privsep \
@@ -29,34 +40,34 @@ CONFIGURE_ARGS=	--disable-doxygen-doc \
 		--with-lldpd-ctl-socket=/var/run/lldpd.socket \
 		--with-lldpd-pid-file=/var/run/lldpd.pid \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
-INSTALL_TARGET=	install-strip
 
-USERS=	_lldpd
-GROUPS=	_lldpd
-
-CONFLICTS_INSTALL=	${FLAVORS:N${FLAVOR}:S/^/${PORTNAME}-/}
-
-OPTIONS_DEFINE=		BASH DOCS PIE PROPRIETARY READLINE SNMP XML ZSH
-OPTIONS_DEFAULT=	BASH PROPRIETARY SNMP XML ZSH
-OPTIONS_SUB=	yes
-
-.if ${FLAVOR:U} == tiny
-OPTIONS_DEFAULT:=
+.if ${FLAVOR} == tiny
+OPTIONS_UNSET=	${OPTIONS_DEFAULT}
+SUB_LIST+=	BASH="@comment " \
+		ZSH="@comment "
 .endif
 
+OPTIONS_DEFINE=		BASH DOCS LIBXML2 PIE PROPRIETARY READLINE SNMP ZSH
+OPTIONS_DEFAULT=	BASH LIBXML2 PROPRIETARY SNMP ZSH
+OPTIONS_SUB=		yes
+
 PIE_DESC=		Build PIE (position independant executables)
 PROPRIETARY_DESC=	Support proprietary protocols (CDP/EDP/FDP/SONMP)
 SNMP_DESC=		Enable SNMP sub-agent (AgentX)
-XML_DESC=		XML output support
 
-PIE_CONFIGURE_ENABLE=		pie
+LIBXML2_USES=		gnome
+LIBXML2_USE=		GNOME=libxml2
+LIBXML2_CONFIGURE_WITH=	xml
+
+PIE_CONFIGURE_ENABLE=	pie
+
 PROPRIETARY_CONFIGURE_ENABLE=	cdp edp fdp sonmp
+
 READLINE_CONFIGURE_WITH=	readline
-SNMP_LIB_DEPENDS=		libnetsnmp.so:net-mgmt/net-snmp
-SNMP_USES=			ssl
-SNMP_CONFIGURE_WITH=		snmp
-XML_LIB_DEPENDS=		libxml2.so:textproc/libxml2
-XML_CONFIGURE_WITH=		xml
+
+SNMP_USES=		ssl
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
+SNMP_CONFIGURE_WITH=	snmp
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/run/lldpd
diff --git a/net-mgmt/lldpd/distinfo b/net-mgmt/lldpd/distinfo
index 8969b0b93699..a60fcf36a095 100644
--- a/net-mgmt/lldpd/distinfo
+++ b/net-mgmt/lldpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715532062
-SHA256 (lldpd-1.0.18.tar.gz) = 4b320675d608901a4a0d4feff8f96bb846d4913d914b0cf75b7d0ae80490f2f7
-SIZE (lldpd-1.0.18.tar.gz) = 1988753
+TIMESTAMP = 1736637102
+SHA256 (lldpd-1.0.19.tar.gz) = 4de17fe5137b4d44a7bd57f8dfc80cffe2c8bb3691b4ae3012b5a6ea20d79ee0
+SIZE (lldpd-1.0.19.tar.gz) = 1987102
diff --git a/net-mgmt/lldpd/pkg-plist b/net-mgmt/lldpd/pkg-plist
index 8b80edcb75ef..ea8b21422e51 100644
--- a/net-mgmt/lldpd/pkg-plist
+++ b/net-mgmt/lldpd/pkg-plist
@@ -4,7 +4,7 @@ include/lldpctl.h
 lib/liblldpctl.a
 lib/liblldpctl.so
 lib/liblldpctl.so.4
-lib/liblldpctl.so.4.9.1
+lib/liblldpctl.so.4.10.0
 libdata/pkgconfig/lldpctl.pc
 share/man/man8/lldpcli.8.gz
 share/man/man8/lldpctl.8.gz



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