Update net/lldpd to v1.0.5

# pkgsrc changes

No OWNDIR needed for daemon's HOME

Add Perl path to LDFLAGS only when it is needed (snmp support)

List INSTALLATION_DIRS explicitly

Set PKG_SYSCONFSUBDIR, so that README.conf actually gets installed

Since editline is fully functional, avoid linking against the GPLv3 readline

# upstream changes

Numerous small changes, see ChangeLog.

3 files changed, 44 insertions, 32 deletions

diff --git a/net/lldpd/Makefile b/net/lldpd/Makefile
index 27b2ef2c8dc..72ac574a19d 100644
--- a/net/lldpd/Makefile
+++ b/net/lldpd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2020/06/02 08:24:33 adam Exp $
+# $NetBSD: Makefile,v 1.27 2020/06/18 19:40:32 hauke Exp $
 
-DISTNAME=		lldpd-1.0.1
-PKGREVISION=		4
+DISTNAME=		lldpd-1.0.5
+#PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://media.luffy.cx/files/lldpd/
 
@@ -9,50 +9,60 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		https://vincentbernat.github.com/lldpd/
 COMMENT=		802.1ab (LLDP) implementation
 LICENSE=		isc
-# `lldpcli` will be linked to GNU Readline (which is GPL licensed)
-# if available. To avoid this, use `--without-readline` as a configure
-# option.
 
 # interfaces-bsd.c:45:34: error: net/agr/if_agrioctl.h: No such file or directory
-NOT_FOR_PLATFORM=	NetBSD-5*-*
-USE_LIBTOOL=		yes
-USE_LANGUAGES=		c c++
+NOT_FOR_PLATFORM=	NetBSD-5.*-*
+
 USE_TOOLS+=		pkg-config
+
 GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+USE_LANGUAGES=		c
+
 CONFIGURE_ARGS+=	--with-privsep-chroot=${PKG_HOME._lldpd}
-# Leave pkgsrc to handle security features.
+# Let pkgsrc handle security features.
 CONFIGURE_ARGS+=	--disable-hardening
+
+CONFIGURE_ARGS+=	--with-embedded-libevent=no
+CONFIGURE_ARGS+=	--with-readline
+
 # run/lldpd.socket is created under this directory
 # (the default is ${PRERIX}/var, changed since 0.7.9)
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 BUILD_DEFS+=		VARBASE
 
-EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES=		${EGDIR}/README.conf ${PKG_SYSCONFDIR}/lldpd.d/README.conf
-
-#  CCLD     lldpd
-#  ld: cannot find -lperl
-LDFLAGS+=		-L${PREFIX}/${PERL5_SUB_INSTALLARCHLIB}/CORE
+PKG_SYSCONFSUBDIR=	lldpd.d
+EGDIR=			share/examples/${PKGBASE}
+CONF_FILES=		${EGDIR}/README.conf ${PKG_SYSCONFDIR}/README.conf
 
 RCD_SCRIPTS=		lldpd
-PKG_GROUPS=		_lldpd
-PKG_USERS=		_lldpd:_lldpd
-PKG_HOME._lldpd=	${VARBASE}/chroot/lldpd
 
-OWN_DIRS=		${VARBASE}/chroot/lldpd
-AUTO_MKDIRS=		yes
+LLDPD_USER?=		_lldpd
+LLDPD_GROUP?=		_lldpd
+LLDPD_HOME=		${VARBASE}/chroot/lldpd
+
+PKG_GROUPS_VARS+=	LLDPD_GROUP
+PKG_USERS_VARS+=	LLDPD_USER
+
+PKG_GROUPS=		${LLDPD_GROUP}
+PKG_USERS=		${LLDPD_USER}:${LLDPD_GROUP}
+PKG_HOME.${LLDPD_USER}=	${LLDPD_HOME}
+
 TEST_TARGET=		check
 
-INSTALLATION_DIRS+=	sbin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
-INSTALLATION_DIRS+=	${EGDIR}
+INSTALLATION_DIRS+=	sbin include lib ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
+INSTALLATION_DIRS+=	${EGDIR} share/doc
+INSTALLATION_DIRS+=	share/bash-completion share/zsh/site-functions
 
 .include "options.mk"
 
 post-install:
-	${MV} ${DESTDIR}${PREFIX}/etc/lldpd.d/README.conf ${DESTDIR}${EGDIR}
+	${MV} ${DESTDIR}${PREFIX}/etc/lldpd.d/README.conf \
+		${DESTDIR}${PREFIX}/${EGDIR}
+
 
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=2.0.5
 .include "../../devel/libevent/buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
+.include "../../devel/editline/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/lldpd/distinfo b/net/lldpd/distinfo
index 70965b7b8c7..30087139415 100644
--- a/net/lldpd/distinfo
+++ b/net/lldpd/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2018/08/08 14:10:16 prlw1 Exp $
+$NetBSD: distinfo,v 1.14 2020/06/18 19:40:32 hauke Exp $
 
-SHA1 (lldpd-1.0.1.tar.gz) = ffae3bd667f7edae300b0c63a5f0103eb8c1118f
-RMD160 (lldpd-1.0.1.tar.gz) = df4ad2ff8badda0cfef602090be5d2e1a80453b4
-SHA512 (lldpd-1.0.1.tar.gz) = 61b2a7a3a78276c613c6d0b34eb625e69e5c8a206b6658a167d6a09ac6d0e1c943e46c0ff6fc3538a791d9947f193185b65848da581b3d6ecb9bc0befadde8dd
-Size (lldpd-1.0.1.tar.gz) = 1590903 bytes
+SHA1 (lldpd-1.0.5.tar.gz) = ee911186120f482f5e9bbd80023bcf5b0a628161
+RMD160 (lldpd-1.0.5.tar.gz) = 2e8a2982dbdd6e73c865d6cad3a0c821e2538369
+SHA512 (lldpd-1.0.5.tar.gz) = ce6075b6e2f847c4854c117ffc81d6e9f852e857d2bf88151ea7b3d40fbebcf980f65d4a21f17332de7f27fc696ce3ada3c063b8fa7677d7b9eee3e4634e898e
+Size (lldpd-1.0.5.tar.gz) = 1624872 bytes
diff --git a/net/lldpd/options.mk b/net/lldpd/options.mk
index 7c64ee20372..2345fe5a665 100644
--- a/net/lldpd/options.mk
+++ b/net/lldpd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2020/05/31 15:42:08 rillig Exp $
+# $NetBSD: options.mk,v 1.5 2020/06/18 19:40:32 hauke Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lldpd
 PKG_SUPPORTED_OPTIONS=	json snmp xml
@@ -11,8 +11,10 @@ PKG_SUGGESTED_OPTIONS=	json snmp xml
 
 .if !empty(PKG_OPTIONS:Msnmp)
 .  include "../../net/net-snmp/buildlink3.mk"
-USE_TOOLS+= perl
 .  include "../../lang/perl5/buildlink3.mk"
+#  CCLD     lldpd
+#  ld: cannot find -lperl
+LDFLAGS+=		-L${PREFIX}/${PERL5_SUB_INSTALLARCHLIB}/CORE
 CONFIGURE_ARGS+=	--with-snmp
 .endif