6 files changed, 14 insertions, 61 deletions

diff --git a/net-mgmt/lldpd/Makefile b/net-mgmt/lldpd/Makefile
index 156fe00b2ee0..0cae1fd56eaa 100644
--- a/net-mgmt/lldpd/Makefile
+++ b/net-mgmt/lldpd/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lldpd
-PORTVERSION=	0.9.4
-PORTREVISION=	3
+PORTVERSION=	0.9.9
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://media.luffy.cx/files/${PORTNAME}/ \
 		http://mirror.1labs.ch/${PORTNAME}/
@@ -12,10 +11,12 @@ MAINTAINER=	freebsd@simweb.ch
 COMMENT=	LLDP (802.1ab)/CDP/EDP/SONMP/FDP daemon and SNMP subagent
 
 LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
 USES=		libtool
+USE_CSTD=	gnu99
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
@@ -53,6 +54,7 @@ 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
 
 post-patch:
@@ -61,7 +63,7 @@ post-patch:
 		${WRKSRC}/src/client/Makefile.am \
 		${WRKSRC}/src/client/Makefile.in
 
-post-install:
+post-install-DOCS-on:
 	${INSTALL_DATA} ${FILESDIR}/README.bsd ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/lldpd/distinfo b/net-mgmt/lldpd/distinfo
index 57c071165920..352f3ee2fa7b 100644
--- a/net-mgmt/lldpd/distinfo
+++ b/net-mgmt/lldpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466250111
-SHA256 (lldpd-0.9.4.tar.gz) = eb1f5beff2ff5c13c5e0342b5b9da815ed4a63866262445e1168a79ee65c9079
-SIZE (lldpd-0.9.4.tar.gz) = 1604103
+TIMESTAMP = 1518448953
+SHA256 (lldpd-0.9.9.tar.gz) = 5e9e08f500d21376631cbc9f8e19a4b167cd38eb2d8fd9e660b8e80507f802db
+SIZE (lldpd-0.9.9.tar.gz) = 1615627
diff --git a/net-mgmt/lldpd/files/patch-configure.ac b/net-mgmt/lldpd/files/patch-configure.ac
deleted file mode 100644
index 43be3831b510..000000000000
--- a/net-mgmt/lldpd/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2016-06-10 06:11:26 UTC
-+++ configure.ac
-@@ -90,6 +90,8 @@ AX_CFLAGS_GCC_OPTION([-Wno-sign-compare]
- AX_LDFLAGS_OPTION([-Wl,-z,relro], [LLDP_LDFLAGS])
- AX_LDFLAGS_OPTION([-Wl,-z,now], [LLDP_LDFLAGS])
- 
-+AC_C_TYPEOF
-+
- # Hardening
- AC_ARG_ENABLE([hardening],
-   [AS_HELP_STRING([--enable-hardening],
diff --git a/net-mgmt/lldpd/files/patch-src_daemon_interfaces-bsd.c b/net-mgmt/lldpd/files/patch-src_daemon_interfaces-bsd.c
deleted file mode 100644
index 16803d33afb3..000000000000
--- a/net-mgmt/lldpd/files/patch-src_daemon_interfaces-bsd.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/daemon/interfaces-bsd.c.orig	2016-06-13 06:38:49 UTC
-+++ src/daemon/interfaces-bsd.c
-@@ -470,7 +470,11 @@ ifbsd_macphy(struct lldpd *cfg,
- {
- #ifdef ENABLE_DOT3
- 	struct ifmediareq ifmr = {};
-+#ifdef HAVE_TYPEOF
- 	typeof(ifmr.ifm_ulist[0]) media_list[32] = {};
-+#else
-+	int media_list[32] = {};
-+#endif
- 	ifmr.ifm_ulist = media_list;
- 	ifmr.ifm_count = 32;
- 	struct lldpd_port *port = &hardware->h_lport;
diff --git a/net-mgmt/lldpd/files/patch-src_lib_Makefile.in b/net-mgmt/lldpd/files/patch-src_lib_Makefile.in
deleted file mode 100644
index 5b285c1dab63..000000000000
--- a/net-mgmt/lldpd/files/patch-src_lib_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/lib/Makefile.in.orig	2016-06-17 17:20:00 UTC
-+++ src/lib/Makefile.in
-@@ -895,8 +895,9 @@ uninstall-am: uninstall-includeHEADERS u
- 
- 
- atom-glue.c: $(ATOM_FILES) Makefile
--	$(AM_V_GEN)($(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--		$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ATOM_FILES:%=$(srcdir)/%) | \
-+	$(AM_V_GEN)(for f in $(ATOM_FILES:%=$(srcdir)/%); do \
-+		$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+		$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $$f; done | \
- 		$(SED) -n 's+^void init_atom_builder_\([^(]*\)().*, \([0-9]*\)).*+\2 \1+p' | \
- 		sort | \
- 		$(AWK) '{ atoms[$$2] = 1 } \
-@@ -905,8 +906,9 @@ atom-glue.c: $(ATOM_FILES) Makefile
-                                print " static int init = 0; if (init) return; init++;"; \
- 			       for (atom in atoms) { print " init_atom_builder_"atom"();" } \
- 			       print "}"; }' && \
-+		for f in $(ATOM_FILES:%=$(srcdir)/%); do \
- 		$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--		$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ATOM_FILES:%=$(srcdir)/%) | \
-+		$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $$f; done | \
- 		$(SED) -n 's+^void init_atom_map_\([^(]*\)().*, \([0-9]*\)).*+\2 \1+p' | \
- 		sort -n | \
- 		$(AWK) '{ atoms[$$2] = 1 } \
diff --git a/net-mgmt/lldpd/pkg-plist b/net-mgmt/lldpd/pkg-plist
index 3dd8f387f7d0..8f374b300be8 100644
--- a/net-mgmt/lldpd/pkg-plist
+++ b/net-mgmt/lldpd/pkg-plist
@@ -13,9 +13,10 @@ sbin/lldpcli
 sbin/lldpctl
 sbin/lldpd
 %%BASH%%share/bash-completion/completions/lldpcli
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE.md
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/README.bsd
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE.md
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README.bsd
+%%PORTDOCS%%%%DOCSDIR%%/README.md
 %%ZSH%%share/zsh/site-functions/_lldpcli