Bump 0.7.6 to 0.7.9

(pkgsrc)
- Add following line to find -lperl
  LDFLAGS+=              -L${PREFIX}/${PERL5_SUB_INSTALLARCHLIB}/CORE
- Drop NetBSD-5, net/agr/if_agrioctl.h is missing
- Add options.mk and support json, snmp, xml selection,
  those were missing in configured list
- Now includes readline.buildlink3.mk

(upstream)
lldpd (0.7.9)
  * Changes:
    + Default location for chroot, socket and PID are now configurable
      in `./configure`. The default location is based on the value of
      `runstatedir` which in turn may be based on the value of
      `localstatedir` which defaults to `/usr/local/var`. Therefore,
      to get the previous locations, lldpd should be configured with
      `./configure --localstatedir=/var`.
  * Fixes:
    + Fix `configure system bond-slave-src-mac-type local`. Also use
      it as default.
  * Features:
    + Add support for shutdown LLDPU.
    + Ability to configure IP management pattern from lldpcli.
    + Ability to choose what port ID should be (MAC or interface name).

lldpd (0.7.8)
  * Fixes:
    + Don't hard-code default values for system name, system
      description and port description. When the field is not present,
      just don't display it.
    + Fix lldpcli behaviour when suid.
    + On OSX, don't use p2p0 interfaces: it would break WLAN.
    + Fix SNMP support on RHEL.
  * Features:
    + Android support
    + Add the possibility to disable privilege separation (lower
      memory consumption, lower security, don't do it).
    + Interfaces can now be whitelisted. For example, *,!eth*,!!eth1
      is a valid pattern for all interfaces except eth ones, except
      eth1. Moreover, on exact match, an matching interface
      circumvents most sanity checks (like VLAN handling).
    + Ability to override the hostname.

lldpd (0.7.7)
  * Features:
    + Use a locally administered MAC address or an arbitrary one
      instead of null MAC address for bond devices on Linux. This is
      configurable through `lldpcli`.
    + Add support for "team" driver (alternative to bond devices).
    + Preliminary support for DTrace/systemtap.
    + Preliminary support for seccomp (for monitor process).
    + Setup chroot inside lldpd instead of relying on init script.
  * Fixes:
    + Various bugs related to fixed point number handling (for
      coordinates in LLDP-MED)
    + Fix a regression in how MAC address of an enslaved device is
      retrieved.

4 files changed, 44 insertions, 8 deletions

diff --git a/net/lldpd/Makefile b/net/lldpd/Makefile
index 8ce3e0ca9ac..78aaba159f1 100644
--- a/net/lldpd/Makefile
+++ b/net/lldpd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2014/02/12 23:18:23 tron Exp $
+# $NetBSD: Makefile,v 1.8 2014/06/13 03:06:09 mef Exp $
 
-DISTNAME=		lldpd-0.7.6
-PKGREVISION=		1
+DISTNAME=		lldpd-0.7.9
 CATEGORIES=		net
 MASTER_SITES=		http://media.luffy.cx/files/lldpd/
 
@@ -15,12 +14,22 @@ LICENSE=		isc
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+# 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++
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-privsep-chroot=${PKG_HOME._lldpd}
+# 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
 
+#  CCLD     lldpd
+#  ld: cannot find -lperl
+LDFLAGS+=		-L${PREFIX}/${PERL5_SUB_INSTALLARCHLIB}/CORE
+
 RCD_SCRIPTS=		lldpd
 PKG_GROUPS=		_lldpd
 PKG_USERS=		_lldpd:_lldpd
@@ -31,6 +40,10 @@ AUTO_MKDIRS=		yes
 
 INSTALLATION_DIRS+=	sbin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
+.include "options.mk"
+
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=2.0.5
 .include "../../devel/libevent/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/lldpd/PLIST b/net/lldpd/PLIST
index f542c096c9a..1e3a7aa3537 100644
--- a/net/lldpd/PLIST
+++ b/net/lldpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/03/11 14:05:09 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/06/13 03:06:09 mef Exp $
 include/lldp-const.h
 include/lldpctl.h
 lib/liblldpctl.la
diff --git a/net/lldpd/distinfo b/net/lldpd/distinfo
index 4cbddb77c76..bb158f67285 100644
--- a/net/lldpd/distinfo
+++ b/net/lldpd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2013/09/13 07:29:10 mef Exp $
+$NetBSD: distinfo,v 1.6 2014/06/13 03:06:09 mef Exp $
 
-SHA1 (lldpd-0.7.6.tar.gz) = be3d3937b22d14259553f637694f744ed3b8ba79
-RMD160 (lldpd-0.7.6.tar.gz) = 659f2a788a6f62b8df559ab3736a43619fe447ea
-Size (lldpd-0.7.6.tar.gz) = 1459094 bytes
+SHA1 (lldpd-0.7.9.tar.gz) = 260888a94116642ead9f733278b32f3be0750e4a
+RMD160 (lldpd-0.7.9.tar.gz) = f48f4f6fec80a2e48786b764daf5055d41177da2
+Size (lldpd-0.7.9.tar.gz) = 1496740 bytes
diff --git a/net/lldpd/options.mk b/net/lldpd/options.mk
new file mode 100644
index 00000000000..1505e1fd455
--- /dev/null
+++ b/net/lldpd/options.mk
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2014/06/13 03:06:09 mef Exp $
+PKG_OPTIONS_VAR=	PKG_OPTIONS.lldpd
+PKG_SUPPORTED_OPTIONS=	json snmp xml
+PKG_SUGGESTED_OPTIONS=	json snmp xml
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mjson)
+.	include "../../textproc/jansson/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-json
+.endif
+
+.if !empty(PKG_OPTIONS:Msnmp)
+.	include "../../net/net-snmp/buildlink3.mk"
+USE_TOOLS+= perl
+BUILDLINK_API_DEPENDS.perl+= perl>=5.16.0
+.	include "../../lang/perl5/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-snmp
+.endif
+
+.if !empty(PKG_OPTIONS:Mxml)
+.	include "../../textproc/libxml2/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-xml
+.endif