Index: head/net-mgmt/lldpd/Makefile =================================================================== --- head/net-mgmt/lldpd/Makefile (revision 462544) +++ head/net-mgmt/lldpd/Makefile (revision 462545) @@ -1,67 +1,69 @@ # Created by: Mathieu Simon # $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}/ 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 CONFIGURE_ARGS= --disable-doxygen-doc \ --enable-hardening \ --enable-privsep \ --with-privsep-chroot=/var/empty \ --with-lldpd-ctl-socket=/var/run/lldpd.socket \ --with-lldpd-pid-file=/var/run/lldpd.pid \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig INSTALL_TARGET= install-strip USERS= _lldpd 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 DTRACE_DESC= DTrace support JSON_DESC= JSON output support PIE_DESC= Build PIE (position independant executables) PROPRIETARY_DESC= Support proprietary protocols (CDP/EDP/FDP/SONMP) SNMP_DESC= Enable the use of SNMP XML_DESC= XML output support DTRACE_CONFIGURE_ENABLE= dtrace 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 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: +post-install-DOCS-on: ${INSTALL_DATA} ${FILESDIR}/README.bsd ${STAGEDIR}${DOCSDIR} .include Index: head/net-mgmt/lldpd/distinfo =================================================================== --- head/net-mgmt/lldpd/distinfo (revision 462544) +++ head/net-mgmt/lldpd/distinfo (revision 462545) @@ -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 Index: head/net-mgmt/lldpd/files/patch-configure.ac =================================================================== --- head/net-mgmt/lldpd/files/patch-configure.ac (revision 462544) +++ head/net-mgmt/lldpd/files/patch-configure.ac (nonexistent) @@ -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], Property changes on: head/net-mgmt/lldpd/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/lldpd/files/patch-src_lib_Makefile.in =================================================================== --- head/net-mgmt/lldpd/files/patch-src_lib_Makefile.in (revision 462544) +++ head/net-mgmt/lldpd/files/patch-src_lib_Makefile.in (nonexistent) @@ -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 } \ Property changes on: head/net-mgmt/lldpd/files/patch-src_lib_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/lldpd/files/patch-src_daemon_interfaces-bsd.c =================================================================== --- head/net-mgmt/lldpd/files/patch-src_daemon_interfaces-bsd.c (revision 462544) +++ head/net-mgmt/lldpd/files/patch-src_daemon_interfaces-bsd.c (nonexistent) @@ -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; Property changes on: head/net-mgmt/lldpd/files/patch-src_daemon_interfaces-bsd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/lldpd/pkg-plist =================================================================== --- head/net-mgmt/lldpd/pkg-plist (revision 462544) +++ head/net-mgmt/lldpd/pkg-plist (revision 462545) @@ -1,21 +1,22 @@ %%ETCDIR%%.d/README.conf include/lldp-const.h include/lldpctl.h lib/liblldpctl.a lib/liblldpctl.so lib/liblldpctl.so.4 lib/liblldpctl.so.4.8.0 libdata/pkgconfig/lldpctl.pc man/man8/lldpcli.8.gz man/man8/lldpctl.8.gz man/man8/lldpd.8.gz 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