From 62c8b83a19f77c4c1103bfdbe4ff1b6b0c6cf23c Mon Sep 17 00:00:00 2001
From: Rainer Hurling <rhurlin@FreeBSD.org>
Date: Mon, 15 Feb 2021 20:18:10 +0000
Subject: [PATCH] net-mgmt/lldpd: Update to 1.0.8

Changelog: https://github.com/lldpd/lldpd/compare/1.0.4...1.0.8

PR:		253512
Submitted by:	Brad Davis <brd@FreeBSD.org>
---
 net-mgmt/lldpd/Makefile  | 33 ++++++++++++++++-----------------
 net-mgmt/lldpd/distinfo  |  6 +++---
 net-mgmt/lldpd/pkg-descr |  2 +-
 net-mgmt/lldpd/pkg-plist |  2 +-
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/net-mgmt/lldpd/Makefile b/net-mgmt/lldpd/Makefile
index 726bf9244e8a..46e0509ef6f0 100644
--- a/net-mgmt/lldpd/Makefile
+++ b/net-mgmt/lldpd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lldpd
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.8
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://media.luffy.cx/files/${PORTNAME}/ \
 		http://mirror.1labs.ch/${PORTNAME}/
@@ -16,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libevent.so:devel/libevent
 
 USES=		libtool
-
 USE_CSTD=	gnu99
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	${PORTNAME}
@@ -35,15 +34,14 @@ GROUPS=	_lldpd
 
 OPTIONS_DEFINE=		BASH DOCS DTRACE JSON PIE PROPRIETARY READLINE SNMP XML ZSH
 OPTIONS_DEFAULT=	BASH JSON PROPRIETARY SNMP XML ZSH
-OPTIONS_SUB=	yes
-
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 # dt_modtext:opensolaris/lib/libdtrace/common/dt_link.c: arm not implemented
 OPTIONS_EXCLUDE_armv6=		DTRACE
 OPTIONS_EXCLUDE_armv7=		DTRACE
+OPTIONS_SUB=	yes
 
-DTRACE_DESC=		DTrace support
+DTRACE_DESC=		DTrace support (BROKEN)
 JSON_DESC=		JSON output support
 PIE_DESC=		Build PIE (position independant executables)
 PROPRIETARY_DESC=	Support proprietary protocols (CDP/EDP/FDP/SONMP)
@@ -51,24 +49,25 @@ SNMP_DESC=		Enable the use of SNMP
 XML_DESC=		XML output support
 
 DTRACE_CONFIGURE_ENABLE=	dtrace
+JSON_LIB_DEPENDS=		libjansson.so:devel/jansson
+JSON_USES=			pkgconfig
 JSON_CONFIGURE_WITH=		json
 PIE_CONFIGURE_ENABLE=		pie
-READLINE_CONFIGURE_WITH=	readline
-SNMP_CONFIGURE_WITH=		snmp
-XML_CONFIGURE_WITH=		xml
 PROPRIETARY_CONFIGURE_ENABLE=	cdp edp fdp sonmp
-
-JSON_LIB_DEPENDS=	libjansson.so:devel/jansson
-JSON_USES=		pkgconfig
-SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
-SNMP_USES=		ssl
-XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
+READLINE_CONFIGURE_WITH=	readline
+SNMP_LIB_DEPENDS=		libnetsnmp.so:net-mgmt/net-snmp \
+				libpcre.so:devel/pcre \
+				libpkg.so:ports-mgmt/pkg \
+				librpm.so:archivers/rpm4
+SNMP_USES=			ssl
+SNMP_CONFIGURE_WITH=		snmp
+XML_LIB_DEPENDS=		libxml2.so:textproc/libxml2
+# libedit needed in combination of READLINE and XML
+XML_USES=			libedit
+XML_CONFIGURE_WITH=		xml
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}|g' ${WRKSRC}/src/daemon/lldpd.8.in
-	@${REINPLACE_CMD} -e 's|vendor-completions|site-functions|g' \
-		${WRKSRC}/src/client/Makefile.am \
-		${WRKSRC}/src/client/Makefile.in
 
 post-install-DOCS-on:
 	${INSTALL_DATA} ${FILESDIR}/README.bsd ${STAGEDIR}${DOCSDIR}
diff --git a/net-mgmt/lldpd/distinfo b/net-mgmt/lldpd/distinfo
index e3ed0a3d46a4..7f58bcde7c0f 100644
--- a/net-mgmt/lldpd/distinfo
+++ b/net-mgmt/lldpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566804210
-SHA256 (lldpd-1.0.4.tar.gz) = 5319bc032fabf1008d5d91e280276aa7f1bbfbb70129d8526cd4526d7c22724f
-SIZE (lldpd-1.0.4.tar.gz) = 1607806
+TIMESTAMP = 1613320298
+SHA256 (lldpd-1.0.8.tar.gz) = 98d200e76e30f6262c4a4493148c1840827898329146a57a34f8f0f928ca3def
+SIZE (lldpd-1.0.8.tar.gz) = 1965326
diff --git a/net-mgmt/lldpd/pkg-descr b/net-mgmt/lldpd/pkg-descr
index 0e3a7744143f..8e53a41f0a3e 100644
--- a/net-mgmt/lldpd/pkg-descr
+++ b/net-mgmt/lldpd/pkg-descr
@@ -15,4 +15,4 @@ real physical devices, not on bridges, vlans, etc. However, vlans can
 be mapped on the bonding device. You can bridge vlan but not add vlans
 on bridges. More complex setups may give false results.
 
-WWW: http://vincentbernat.github.io/lldpd/
+WWW: https://lldpd.github.io/
diff --git a/net-mgmt/lldpd/pkg-plist b/net-mgmt/lldpd/pkg-plist
index 8f374b300be8..d8a1c2457243 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.8.0
+lib/liblldpctl.so.4.9.0
 libdata/pkgconfig/lldpctl.pc
 man/man8/lldpcli.8.gz
 man/man8/lldpctl.8.gz