Update to upstream version 1.1.0, fetch distfile from GitHub

PR:		204896
Submitted by:	freebsd@simweb.ch
Reviewed by:	riggs
Approved by:	maintainer timeout

10 files changed, 21 insertions, 99 deletions

diff --git a/net/ladvd/Makefile b/net/ladvd/Makefile
index 822852415dd3..c44fe566db0c 100644
--- a/net/ladvd/Makefile
+++ b/net/ladvd/Makefile
@@ -2,26 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	ladvd
-PORTVERSION=	1.0.4
-PORTREVISION=	2
+PORTVERSION=	1.1.0
+DISTVERSIONPREFIX=v
 CATEGORIES=	net
-MASTER_SITES=	GOOGLE_CODE \
-		http://blinkenlights.nl/software/ladvd/
 
 MAINTAINER=	sten@blinkenlights.nl
-COMMENT=	Minimal LLDP/CDP daemon
+COMMENT=	Minimal LLDP/CDP/EDP/FDP/NDP sender daemon
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 
 USERS=		ladvd
 GROUPS=		${USERS}
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	sspans
+USES=		autoreconf libtool pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-chroot-dir=/var/empty
 
-PORTDOCS=	*
+PORTDOCS=	README TODO HACKING
 USE_RC_SUBR=	ladvd
 SUB_FILES=	pkg-message
 
@@ -32,8 +34,13 @@ PLIST_FILES=	man/man8/ladvd.8.gz \
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch-DOCS-off:
-	@@${REINPLACE_CMD} 's|install-data-am: install-dist_docDATA|install-data-am:|' \
-		${WRKSRC}/doc/Makefile.in
+.include <bsd.port.options.mk>
+
+.if ${OSVERSION} < 1000000
+CFLAGS_amd64=   -fPIC
+.endif
+
+post-patch:
+	${REINPLACE_CMD} -e 's|LICENSE||' ${WRKSRC}/doc/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/net/ladvd/distinfo b/net/ladvd/distinfo
index 8b44cc45d354..7624cef70669 100644
--- a/net/ladvd/distinfo
+++ b/net/ladvd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ladvd-1.0.4.tar.gz) = 90033d04004bd30e058faca96c0e632000d44b2ef0a65c70f9d972abda4a22ba
-SIZE (ladvd-1.0.4.tar.gz) = 463939
+SHA256 (sspans-ladvd-v1.1.0_GH0.tar.gz) = 6db4b3270d90469e7081695f62ed13b88ac15bd41b8467c81eec5d035742ae57
+SIZE (sspans-ladvd-v1.1.0_GH0.tar.gz) = 108845
diff --git a/net/ladvd/files/patch-src__cli.c b/net/ladvd/files/patch-src__cli.c
deleted file mode 100644
index ad518833048a..000000000000
--- a/net/ladvd/files/patch-src__cli.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/cli.c.orig	2012-01-01 16:17:19.000000000 -0800
-+++ ./src/cli.c	2013-10-20 23:18:59.000000000 -0700
-@@ -24,6 +24,7 @@
- #include <sys/file.h>
- #include <sys/un.h>
- #include <netdb.h>
-+#include <limits.h>
- 
- extern struct proto protos[];
- int status = EXIT_SUCCESS;
diff --git a/net/ladvd/files/patch-src__compat__setproctitle.c b/net/ladvd/files/patch-src__compat__setproctitle.c
deleted file mode 100644
index a9d50f627217..000000000000
--- a/net/ladvd/files/patch-src__compat__setproctitle.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/compat/setproctitle.c.orig	2011-12-20 05:11:03.000000000 -0800
-+++ ./src/compat/setproctitle.c	2013-10-20 23:21:24.000000000 -0700
-@@ -144,7 +144,7 @@
- 			vsnprintf(buf + len, sizeof(buf) - len , fmt, ap);
- 	}
- 	va_end(ap);
--	strnvis(ptitle, buf, sizeof(ptitle),
-+	strnvis(ptitle, sizeof(ptitle), buf,
- 	    VIS_CSTYLE|VIS_NL|VIS_TAB|VIS_OCTAL);
- 
- #if SPT_TYPE == SPT_PSTAT
diff --git a/net/ladvd/files/patch-src__compat__vis.c b/net/ladvd/files/patch-src__compat__vis.c
deleted file mode 100644
index c64a4d329323..000000000000
--- a/net/ladvd/files/patch-src__compat__vis.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/compat/vis.c.orig	2011-12-20 05:11:03.000000000 -0800
-+++ ./src/compat/vis.c	2013-10-20 23:20:15.000000000 -0700
-@@ -161,7 +161,7 @@
- }
- 
- int
--strnvis(char *dst, const char *src, size_t siz, int flag)
-+strnvis(char *dst, size_t siz, const char *src, int flag)
- {
- 	char *start, *end;
- 	char tbuf[5];
diff --git a/net/ladvd/files/patch-src__compat__vis.h b/net/ladvd/files/patch-src__compat__vis.h
deleted file mode 100644
index 825a8b9da384..000000000000
--- a/net/ladvd/files/patch-src__compat__vis.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/compat/vis.h.orig	2011-12-20 05:11:03.000000000 -0800
-+++ ./src/compat/vis.h	2013-10-20 23:20:50.000000000 -0700
-@@ -80,7 +80,7 @@
- 
- char	*vis(char *, int, int, int);
- int	strvis(char *, const char *, int);
--int	strnvis(char *, const char *, size_t, int);
-+int	strnvis(char *, size_t, const char *, int);
- int	strvisx(char *, const char *, size_t, int);
- int	strunvis(char *, const char *);
- int	unvis(char *, char, int *, int);
diff --git a/net/ladvd/files/patch-src__proto__tlv.c b/net/ladvd/files/patch-src__proto__tlv.c
deleted file mode 100644
index 996a8e452a6b..000000000000
--- a/net/ladvd/files/patch-src__proto__tlv.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./src/proto/tlv.c.orig	2012-01-01 16:17:19.000000000 -0800
-+++ ./src/proto/tlv.c	2013-10-20 23:22:04.000000000 -0700
-@@ -41,7 +41,7 @@
- 	    *(src + srclen) = '\0';
- 	    len = srclen * 4 + 1;
- 	    str = my_malloc(len);
--	    strnvis(str, src, len, VIS_NL|VIS_TAB|VIS_GLOB|VIS_OCTAL);
-+	    strnvis(str, len, src, VIS_NL|VIS_TAB|VIS_GLOB|VIS_OCTAL);
- 	    break;
- 	case PEER_CAP:
- 	    memcpy(&cap, value, sizeof(uint16_t));
-@@ -92,7 +92,7 @@
-     *(str + srclen) = '\0';
-     len = srclen * 4 + 1;
-     safe = my_malloc(len);
--    strnvis(safe, str, len, VIS_SAFE|VIS_OCTAL);
-+    strnvis(safe, len, str, VIS_SAFE|VIS_OCTAL);
-     return safe;
- }
- 
diff --git a/net/ladvd/files/patch-src__util.c b/net/ladvd/files/patch-src__util.c
deleted file mode 100644
index 6e85c78400e3..000000000000
--- a/net/ladvd/files/patch-src__util.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/util.c.orig	2011-12-20 14:11:03.000000000 +0100
-+++ src/util.c	2015-03-08 22:30:38.673935000 +0100
-@@ -213,9 +213,6 @@
-     FILE *file;
-     int ret = 0;
- 
--    if (path == NULL || line == NULL)
--	return(0);
--
-     if ((file = fopen(path, "r")) == NULL)
- 	return(0);
- 
-@@ -232,9 +229,6 @@
- int write_line(const char *path, char *line, uint16_t len) {
-     int fd, ret;
- 
--    if (path == NULL || line == NULL)
--	return(0);
--
-     if ((fd = open(path, O_WRONLY|O_TRUNC)) == -1)
- 	return(0);
- 
diff --git a/net/ladvd/files/pkg-message.in b/net/ladvd/files/pkg-message.in
index 602b453b8261..a46bfccaaa6a 100644
--- a/net/ladvd/files/pkg-message.in
+++ b/net/ladvd/files/pkg-message.in
@@ -1,6 +1,6 @@
 *******************************************************************
  If you want to run ladvd at startup you'll need the following
- line in /etc/rc.conf(.local):
+ line in %%PREFIX%%/rc.conf(.local):
 
     ladvd_enable="YES"
 
diff --git a/net/ladvd/pkg-descr b/net/ladvd/pkg-descr
index b2d32ea14e0b..322dfd2c3450 100644
--- a/net/ladvd/pkg-descr
+++ b/net/ladvd/pkg-descr
@@ -1,4 +1,4 @@
 ladvd is a minimal link layer advertisement daemon which supports
-LLDP, CDP, EDP, FDP and NDP advertisements.
+sending LLDP, CDP, EDP, FDP and NDP advertisements.
 
-WWW: http://code.google.com/p/ladvd/
+WWW: https://github.com/sspans/ladvd