Fri Jun 19 10:05:07 2020 UTC ()
PKG_SYSCONFDIR fixes.

Install a sample config file. Mention, but do not install lldpd.d
directory.

The config file is not mandatory, adjust rc.d script.


(hauke)
diff -r1.28 -r1.29 pkgsrc/net/lldpd/Makefile
diff -r1.6 -r1.7 pkgsrc/net/lldpd/PLIST
diff -r1.14 -r1.15 pkgsrc/net/lldpd/distinfo
diff -r0 -r1.1 pkgsrc/net/lldpd/files/lldpd.conf
diff -r1.1 -r1.2 pkgsrc/net/lldpd/files/lldpd.sh
diff -r0 -r1.1 pkgsrc/net/lldpd/patches/patch-src_daemon_lldpd.8.in
cvs diff -r1.28 -r1.29 pkgsrc/net/lldpd/Makefile (expand / switch to unified diff)

--- pkgsrc/net/lldpd/Makefile 2020/06/18 20:01:17 1.28
+++ pkgsrc/net/lldpd/Makefile 2020/06/19 10:05:07 1.29
@@ -1,68 +1,76 @@ @@ -1,68 +1,76 @@
1# $NetBSD: Makefile,v 1.28 2020/06/18 20:01:17 hauke Exp $ 1# $NetBSD: Makefile,v 1.29 2020/06/19 10:05:07 hauke Exp $
2 2
3DISTNAME= lldpd-1.0.5 3DISTNAME= lldpd-1.0.5
4#PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://media.luffy.cx/files/lldpd/ 6MASTER_SITES= http://media.luffy.cx/files/lldpd/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://vincentbernat.github.com/lldpd/ 9HOMEPAGE= https://vincentbernat.github.com/lldpd/
10COMMENT= 802.1ab (LLDP) implementation 10COMMENT= 802.1ab (LLDP) implementation
11LICENSE= isc 11LICENSE= isc
12 12
13# interfaces-bsd.c:45:34: error: net/agr/if_agrioctl.h: No such file or directory 13# interfaces-bsd.c:45:34: error: net/agr/if_agrioctl.h: No such file or directory
14NOT_FOR_PLATFORM= NetBSD-5.*-* 14NOT_FOR_PLATFORM= NetBSD-5.*-*
15 15
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17 17
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_LANGUAGES= c 20USE_LANGUAGES= c
21 21
22CONFIGURE_ARGS+= --with-privsep-chroot=${LLDPD_HOME} 22CONFIGURE_ARGS+= --with-privsep-chroot=${LLDPD_HOME}
23# Let pkgsrc handle security features. 23# Let pkgsrc handle security features.
24CONFIGURE_ARGS+= --disable-hardening 24CONFIGURE_ARGS+= --disable-hardening
25 
26CONFIGURE_ARGS+= --with-embedded-libevent=no 25CONFIGURE_ARGS+= --with-embedded-libevent=no
27CONFIGURE_ARGS+= --with-readline 26CONFIGURE_ARGS+= --with-readline
28 27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
29# run/lldpd.socket is created under this directory 28# run/lldpd.socket is created under this directory
30# (the default is ${PRERIX}/var, changed since 0.7.9) 29# (the default is ${PRERIX}/var, changed since 0.7.9)
31CONFIGURE_ARGS+= --localstatedir=${VARBASE} 30CONFIGURE_ARGS+= --localstatedir=${VARBASE}
 31
32BUILD_DEFS+= VARBASE 32BUILD_DEFS+= VARBASE
33 33
34PKG_SYSCONFSUBDIR= lldpd.d 
35EGDIR= share/examples/${PKGBASE} 34EGDIR= share/examples/${PKGBASE}
36CONF_FILES= ${EGDIR}/README.conf ${PKG_SYSCONFDIR}/README.conf 35CONF_FILES= ${EGDIR}/lldpd.conf ${PKG_SYSCONFDIR}/lldpd.conf
37 36
38RCD_SCRIPTS= lldpd 37RCD_SCRIPTS= lldpd
39 38
40LLDPD_USER?= _lldpd 39LLDPD_USER?= _lldpd
41LLDPD_GROUP?= _lldpd 40LLDPD_GROUP?= _lldpd
42LLDPD_HOME= ${VARBASE}/chroot/lldpd 41LLDPD_HOME= ${VARBASE}/chroot/lldpd
43 42
44PKG_GROUPS_VARS+= LLDPD_GROUP 43PKG_GROUPS_VARS+= LLDPD_GROUP
45PKG_USERS_VARS+= LLDPD_USER 44PKG_USERS_VARS+= LLDPD_USER
46 45
47PKG_GROUPS= ${LLDPD_GROUP} 46PKG_GROUPS= ${LLDPD_GROUP}
48PKG_USERS= ${LLDPD_USER}:${LLDPD_GROUP} 47PKG_USERS= ${LLDPD_USER}:${LLDPD_GROUP}
49PKG_HOME.${LLDPD_USER}= ${LLDPD_HOME} 48PKG_HOME.${LLDPD_USER}= ${LLDPD_HOME}
50 49
51TEST_TARGET= check 50SUBST_CLASSES+= files
 51SUBST_STAGE.files= pre-configure
 52SUBST_FILES.files= ../lldpd.conf
 53SUBST_VARS.files= PKG_SYSCONFDIR
 54SUBST_MESSAGE.files= Fixing default configuration file.
52 55
53INSTALLATION_DIRS+= sbin include lib ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 56INSTALLATION_DIRS+= sbin include lib ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
54INSTALLATION_DIRS+= ${EGDIR} share/doc 57INSTALLATION_DIRS+= ${EGDIR} share/doc
55INSTALLATION_DIRS+= share/bash-completion share/zsh/site-functions 58INSTALLATION_DIRS+= share/bash-completion share/zsh/site-functions
56 59
 60TEST_TARGET= check
 61
57.include "options.mk" 62.include "options.mk"
58 63
 64post-patch:
 65 ${CP} ${PKGDIR}/files/lldpd.conf ${WRKDIR}
 66
59post-install: 67post-install:
60 ${MV} ${DESTDIR}${PREFIX}/etc/lldpd.d/README.conf \ 68 ${INSTALL_DATA} ${WRKDIR}/lldpd.conf \
61 ${DESTDIR}${PREFIX}/${EGDIR} 69 ${DESTDIR}${PREFIX}/${EGDIR}/lldpd.conf
62 70
63 71
64BUILDLINK_API_DEPENDS.libevent+= libevent>=2.0.5 72BUILDLINK_API_DEPENDS.libevent+= libevent>=2.0.5
65.include "../../devel/libevent/buildlink3.mk" 73.include "../../devel/libevent/buildlink3.mk"
66.include "../../devel/editline/buildlink3.mk" 74.include "../../devel/editline/buildlink3.mk"
67 75
68.include "../../mk/bsd.pkg.mk" 76.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/net/lldpd/PLIST (expand / switch to unified diff)

--- pkgsrc/net/lldpd/PLIST 2018/08/08 14:10:16 1.6
+++ pkgsrc/net/lldpd/PLIST 2020/06/19 10:05:07 1.7
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1@comment $NetBSD: PLIST,v 1.6 2018/08/08 14:10:16 prlw1 Exp $ 1@comment $NetBSD: PLIST,v 1.7 2020/06/19 10:05:07 hauke Exp $
2include/lldp-const.h 2include/lldp-const.h
3include/lldpctl.h 3include/lldpctl.h
4lib/liblldpctl.la 4lib/liblldpctl.la
5lib/pkgconfig/lldpctl.pc 5lib/pkgconfig/lldpctl.pc
6man/man8/lldpcli.8 6man/man8/lldpcli.8
7man/man8/lldpctl.8 7man/man8/lldpctl.8
8man/man8/lldpd.8 8man/man8/lldpd.8
9sbin/lldpcli 9sbin/lldpcli
10sbin/lldpctl 10sbin/lldpctl
11sbin/lldpd 11sbin/lldpd
12share/bash-completion/completions/lldpcli 12share/bash-completion/completions/lldpcli
13share/doc/lldpd/CONTRIBUTE.md 13share/doc/lldpd/CONTRIBUTE.md
14share/doc/lldpd/ChangeLog 14share/doc/lldpd/ChangeLog
15share/doc/lldpd/LICENSE 15share/doc/lldpd/LICENSE
16share/doc/lldpd/NEWS 16share/doc/lldpd/NEWS
17share/doc/lldpd/README.md 17share/doc/lldpd/README.md
18share/examples/lldpd/README.conf 18share/examples/lldpd/lldpd.conf
19share/zsh/site-functions/_lldpcli 19share/zsh/site-functions/_lldpcli
 20@pkgdir man/man5
cvs diff -r1.14 -r1.15 pkgsrc/net/lldpd/distinfo (expand / switch to unified diff)

--- pkgsrc/net/lldpd/distinfo 2020/06/18 19:40:32 1.14
+++ pkgsrc/net/lldpd/distinfo 2020/06/19 10:05:07 1.15
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.14 2020/06/18 19:40:32 hauke Exp $ 1$NetBSD: distinfo,v 1.15 2020/06/19 10:05:07 hauke Exp $
2 2
3SHA1 (lldpd-1.0.5.tar.gz) = ee911186120f482f5e9bbd80023bcf5b0a628161 3SHA1 (lldpd-1.0.5.tar.gz) = ee911186120f482f5e9bbd80023bcf5b0a628161
4RMD160 (lldpd-1.0.5.tar.gz) = 2e8a2982dbdd6e73c865d6cad3a0c821e2538369 4RMD160 (lldpd-1.0.5.tar.gz) = 2e8a2982dbdd6e73c865d6cad3a0c821e2538369
5SHA512 (lldpd-1.0.5.tar.gz) = ce6075b6e2f847c4854c117ffc81d6e9f852e857d2bf88151ea7b3d40fbebcf980f65d4a21f17332de7f27fc696ce3ada3c063b8fa7677d7b9eee3e4634e898e 5SHA512 (lldpd-1.0.5.tar.gz) = ce6075b6e2f847c4854c117ffc81d6e9f852e857d2bf88151ea7b3d40fbebcf980f65d4a21f17332de7f27fc696ce3ada3c063b8fa7677d7b9eee3e4634e898e
6Size (lldpd-1.0.5.tar.gz) = 1624872 bytes 6Size (lldpd-1.0.5.tar.gz) = 1624872 bytes
 7SHA1 (patch-src_daemon_lldpd.8.in) = 13f08e48123ae6a3edce43fa465823353955534e
File Added: pkgsrc/net/lldpd/files/lldpd.conf
# $NetBSD: lldpd.conf,v 1.1 2020/06/19 10:05:07 hauke Exp $
#
# lldpd(8) configuration file - see lldpcli(8) for more details.
#
# You can also create the @PKG_SYSCONFDIR@/lldpd.d directory, and put
# configuration snippets (suffixed by .conf) into it. 
# Upon start, lldpd will read each file in this directory, and
# execute the content as if it were passed as arguments to lldpcli(8).

#configure system description 'my little server'
cvs diff -r1.1 -r1.2 pkgsrc/net/lldpd/files/lldpd.sh (expand / switch to unified diff)

--- pkgsrc/net/lldpd/files/lldpd.sh 2013/05/09 01:39:43 1.1
+++ pkgsrc/net/lldpd/files/lldpd.sh 2020/06/19 10:05:07 1.2
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: lldpd.sh,v 1.1 2013/05/09 01:39:43 mef Exp $ 3# $NetBSD: lldpd.sh,v 1.2 2020/06/19 10:05:07 hauke Exp $
4# 4#
5 5
6# PROVIDE: lldpd 6# PROVIDE: lldpd
7# REQUIRE: DAEMON 7# REQUIRE: DAEMON
8# BEFORE: LOGIN 8# BEFORE: LOGIN
9 9
10. /etc/rc.subr 10. /etc/rc.subr
11 11
12name="lldpd" 12name="lldpd"
13rcvar="lldpd" 13rcvar="lldpd"
14command="@PREFIX@/sbin/${name}" 14command="@PREFIX@/sbin/${name}"
15#required_files="@PKG_SYSCONFDIR@/lldpd.conf" 
16 15
17load_rc_config $name 16load_rc_config $name
18run_rc_command "$1" 17run_rc_command "$1"
File Added: pkgsrc/net/lldpd/patches/patch-src_daemon_lldpd.8.in
$NetBSD: patch-src_daemon_lldpd.8.in,v 1.1 2020/06/19 10:05:07 hauke Exp $

Have configure replace /etc/

--- src/daemon/lldpd.8.in.orig	2019-09-29 11:32:19.000000000 +0000
+++ src/daemon/lldpd.8.in
@@ -394,13 +394,13 @@ column tells that only one neighbor will
 .It @LLDPD_CTL_SOCKET@
 Unix-domain socket used for communication with
 .Xr lldpctl 8 .
-.It /etc/lldpd.conf
+.It @sysconfdir@/lldpd.conf
 Configuration file for
 .Nm .
 Commands in this files are executed by
 .Xr lldpcli 8
 at start.
-.It /etc/lldpd.d
+.It @sysconfdir@/lldpd.d
 Directory containing configuration files whose commands are executed
 by
 .Xr lldpcli 8