Index: head/net-mgmt/cdpr/files/patch-conffile.c =================================================================== --- head/net-mgmt/cdpr/files/patch-conffile.c (revision 441440) +++ head/net-mgmt/cdpr/files/patch-conffile.c (nonexistent) @@ -1,19 +0,0 @@ ---- conffile.c.orig 2016-06-20 14:44:21 UTC -+++ conffile.c -@@ -57,6 +57,7 @@ do_something_with (char *ip, char *url) - struct hostent *h; - char *addy; - int port; -+ char *tport; - - if (ip && url) - { -@@ -70,7 +71,7 @@ do_something_with (char *ip, char *url) - else - { - strtok(ip,":"); -- char *tport = strtok(NULL,":"); -+ tport = strtok(NULL,":"); - port = atoi(tport); - } - /* Property changes on: head/net-mgmt/cdpr/files/patch-conffile.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ 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/cdpr/files/patch-cdpr.c =================================================================== --- head/net-mgmt/cdpr/files/patch-cdpr.c (revision 441440) +++ head/net-mgmt/cdpr/files/patch-cdpr.c (nonexistent) @@ -1,36 +0,0 @@ ---- cdpr.c.orig 2016-06-20 14:44:21 UTC -+++ cdpr.c -@@ -641,7 +641,7 @@ main(int argc, char *argv[]) - pcap_lookupnet(dev, &net, &mask, errbuf); - - /* Open the pcap device */ -- if((handle = pcap_open_live(dev, BUFSIZ, 1, 0, errbuf)) == NULL) -+ if((handle = pcap_open_live(dev, BUFSIZ, 1, 1000, errbuf)) == NULL) - { - printf("Error opening device (%s)\n", errbuf); - exit(1); -@@ -658,11 +658,6 @@ main(int argc, char *argv[]) - pcap_setfilter(handle, &filter); - pcap_freecode(&filter); - -- /* Set non-blocking mode */ -- if(pcap_setnonblock(handle, 1, errbuf)) -- { -- pcap_perror(handle, NULL); -- } - - /* Get the next packet that comes in, we only need one */ - printf("Waiting for CDP advertisement:\n"); -@@ -673,11 +668,7 @@ main(int argc, char *argv[]) - do - { - packet = pcap_next(handle, &header); --#ifdef WIN32 -- Sleep(10000); --#else -- usleep(10000); --#endif -+ - } while ((!packet) && ( timeout=((start_time+seconds) > (unsigned int)time(NULL))) ); - - /* Property changes on: head/net-mgmt/cdpr/files/patch-cdpr.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/cdpr/Makefile =================================================================== --- head/net-mgmt/cdpr/Makefile (revision 441440) +++ head/net-mgmt/cdpr/Makefile (revision 441441) @@ -1,32 +1,35 @@ # Created by: Michael L. Hostbaek (mich@freebsdcluster.org) # $FreeBSD$ PORTNAME= cdpr -PORTVERSION= 2.2.1 +PORTVERSION= 2.4 CATEGORIES= net-mgmt MASTER_SITES= SF MAINTAINER= mich@FreeBSD.org COMMENT= Cisco Discovery Protocol Reporter -USES= dos2unix +LICENSE= GPLv2 + +USES= dos2unix +USES= tar:tgz DOS2UNIX_GLOB= *.c *.h LDFLAGS+= -L${LOCALBASE}/lib -lpcap DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} OPTIONS_DEFINE= DOCS do-build: (cd ${WRKSRC} && ${CC} ${CFLAGS} ${LDFLAGS} -o ${PORTNAME} ${PORTNAME}.c cdprs.c conffile.c) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/cdprs/* ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/cdpr.conf ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.cdprs ${STAGEDIR}${DOCSDIR} .include Index: head/net-mgmt/cdpr/distinfo =================================================================== --- head/net-mgmt/cdpr/distinfo (revision 441440) +++ head/net-mgmt/cdpr/distinfo (revision 441441) @@ -1,2 +1,3 @@ -SHA256 (cdpr-2.2.1.tar.gz) = cb17ea99ec80d940fae54ea5ce14626df1062e7d91c8c886cdd518963bfe7abf -SIZE (cdpr-2.2.1.tar.gz) = 25050 +TIMESTAMP = 1495443918 +SHA256 (cdpr-2.4.tgz) = 32d3b58d8be7e2f78834469bd5f48546450ccc2a86d513177311cce994dfbec5 +SIZE (cdpr-2.4.tgz) = 26053