Import of pkgsrc-2015Q2

2015-08-30 02:56:09 -07:00
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
--- a/net/3proxy/Makefile
+++ b/net/3proxy/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2015/03/13 16:35:39 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2015/04/06 02:26:53 rodent Exp $
 #

-DISTNAME=	3proxy-0.5.3k
-PKGNAME=	${DISTNAME:C/k$/.11/}
-PKGREVISION=	1
+DISTNAME=	3proxy-0.7.1.2
 CATEGORIES=	net
 MASTER_SITES=	http://3proxy.ru/${DISTNAME:S/3proxy-//}/
 EXTRACT_SUFX=	.tgz
@@ -17,7 +15,7 @@ COMMENT=	Multi-protocol proxy
 # number.  3proxy-0.6.* will have a different license.
 LICENSE=	3proxy-0.5-license

-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/${PKGBASE}
 MAKE_FILE=	Makefile.unix

 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
--- a/net/3proxy/distinfo
+++ b/net/3proxy/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2008/02/27 23:50:29 apb Exp $
+$NetBSD: distinfo,v 1.3 2015/04/06 02:26:53 rodent Exp $

-SHA1 (3proxy-0.5.3k.tgz) = 71befdaa94867e4b54a5b24e2a3b3b33debd5e67
-RMD160 (3proxy-0.5.3k.tgz) = 416d3c0d870a6aa450472f4ab060ce90e3362dea
-Size (3proxy-0.5.3k.tgz) = 190797 bytes
-SHA1 (patch-aa) = e84a56ce0ce1fc82c982fb0e78ea14986035e0a0
-SHA1 (patch-ab) = 681c7b0b29ad6fb652b3fa8bcecc2af563589c4f
-SHA1 (patch-ac) = caff37ccb6018152d11f6ce5c682f8cec4feff9b
-SHA1 (patch-ad) = e5ebc2defdf5a79ff21e37101ddbee5f212d64f1
-SHA1 (patch-ae) = 03b9d88bd316fda6b812bbe29dbe471a652cfe91
+SHA1 (3proxy-0.7.1.2.tgz) = 58d92a3b61767c83a16f2cfd784458972083c63b
+RMD160 (3proxy-0.7.1.2.tgz) = a3be3d2c786cc52bfde46b7f9630a79eaf7b983c
+Size (3proxy-0.7.1.2.tgz) = 478532 bytes
+SHA1 (patch-aa) = ac13f04cff2fa0b0adea6306d9f645ff26452daa
+SHA1 (patch-ab) = de12687ae56ed8107259a4bc3ca04705b97b7bc8
+SHA1 (patch-ac) = 3b8479dd2cf736a87e618128e91f402611178236
+SHA1 (patch-ad) = bce24c6e2e071196d8fd0715e11f4c68144150c5
+SHA1 (patch-ae) = ef3236744582bd717db1329b7b6ad68c82156d55
--- a/net/3proxy/patches/patch-aa
+++ b/net/3proxy/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2008/02/27 16:14:25 apb Exp $
+$NetBSD: patch-aa,v 1.2 2015/04/06 02:26:53 rodent Exp $

--- src/3proxy.c.orig	2007-04-20 13:05:10.000000000 +0200
+--- src/3proxy.c.orig	2015-02-17 13:07:20.000000000 +0000
 +++ src/3proxy.c
-@@ -1276,7 +1276,7 @@ int readconfig(FILE * fp){
- 
- 
- 				tl->comment = mystrdup((char *)ch->argv[1]);
-				while(isdigit(*tl->comment))tl->comment++;
-+				while(isdigit((unsigned char)*tl->comment))tl->comment++;
- 				if(*tl->comment== '/')tl->comment++;
- 
- 				sscanf((char *)ch->argv[1], "%u", &tl->number);
+@@ -1550,7 +1550,7 @@ static int h_ace(int argc, unsigned char
+ 			unsigned long lim;
+ 
+ 			tl->comment = ( char *)argv[1];
+-			while(isdigit(*tl->comment))tl->comment++;
+			while(isdigit((unsigned char)*tl->comment))tl->comment++;
+ 			if(*tl->comment== '/')tl->comment++;
+ 			tl->comment = mystrdup(tl->comment);
+ 
--- a/net/3proxy/patches/patch-ab
+++ b/net/3proxy/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2008/02/27 16:14:25 apb Exp $
+$NetBSD: patch-ab,v 1.2 2015/04/06 02:26:53 rodent Exp $

--- src/ntlm.c.orig	2006-10-15 10:40:04.000000000 +0200
+--- src/ntlm.c.orig	2015-02-17 13:07:21.000000000 +0000
 +++ src/ntlm.c
@@ -43,7 +43,7 @@ int text2unicode(const char * text, char
- 	buflen = ((buflen>>1)<<1);
- 	if(!text || !buflen) return 0;
- 	do {
-		buf[count++] = toupper(*text++);
-+		buf[count++] = toupper((unsigned char)*text++);
- 		buf[count++] = '\0';
- 	} while (*text && count < buflen);
- 	return count;
+ 	buflen = ((buflen>>1)<<1);
+ 	if(!text || !buflen) return 0;
+ 	do {
+-		buf[count++] = toupper(*text++);
+		buf[count++] = toupper((unsigned char)*text++);
+ 		buf[count++] = '\0';
+ 	} while (*text && count < buflen);
+ 	return count;
--- a/net/3proxy/patches/patch-ac
+++ b/net/3proxy/patches/patch-ac
@@ -1,34 +1,34 @@
-$NetBSD: patch-ac,v 1.1 2008/02/27 16:14:25 apb Exp $
+$NetBSD: patch-ac,v 1.2 2015/04/06 02:26:53 rodent Exp $

--- src/webadmin.c.orig	2006-03-10 21:36:33.000000000 +0200
+--- src/webadmin.c.orig	2015-02-17 13:07:21.000000000 +0000
 +++ src/webadmin.c
-@@ -311,12 +311,12 @@ void * adminchild(void * data) {
- 		sb = strchr(buf, ':');
- 		if(!sb)continue;
- 		++sb;
-		while(isspace(*sb))sb++;
-+		while(isspace((unsigned char)*sb))sb++;
- 		if(!*sb || strncasecmp(sb, "basic", 5)){
- 			continue;
- 		}
- 		sb+=5;
-		while(isspace(*sb))sb++;
-+		while(isspace((unsigned char)*sb))sb++;
- 		i = de64((unsigned char *)sb, (unsigned char *)username, 255);
- 		if(i<=0)continue;
- 		username[i] = 0;
-@@ -332,12 +332,12 @@ void * adminchild(void * data) {
- 	}
- 	else if(i > 15 && (!strncasecmp(buf, "content-length:", 15))){
- 		sb = buf + 15;
-		while(isspace(*sb))sb++;
-+		while(isspace((unsigned char)*sb))sb++;
- 		contentlen = atoi(sb);
- 	}
- 	else if(i > 13 && (!strncasecmp(buf, "content-type:", 13))){
- 		sb = buf + 13;
-		while(isspace(*sb))sb++;
-+		while(isspace((unsigned char)*sb))sb++;
- 		if(!strncasecmp(sb, "x-www-form-urlencoded", 21)) isform = 1;
- 	}
-  }
+@@ -375,12 +375,12 @@ void * adminchild(struct clientparam* pa
+ 		sb = strchr(buf, ':');
+ 		if(!sb)continue;
+ 		++sb;
+-		while(isspace(*sb))sb++;
+		while(isspace((unsigned char)*sb))sb++;
+ 		if(!*sb || strncasecmp(sb, "basic", 5)){
+ 			continue;
+ 		}
+ 		sb+=5;
+-		while(isspace(*sb))sb++;
+		while(isspace((unsigned char)*sb))sb++;
+ 		i = de64((unsigned char *)sb, (unsigned char *)username, 255);
+ 		if(i<=0)continue;
+ 		username[i] = 0;
+@@ -396,12 +396,12 @@ void * adminchild(struct clientparam* pa
+ 	}
+ 	else if(i > 15 && (!strncasecmp(buf, "content-length:", 15))){
+ 		sb = buf + 15;
+-		while(isspace(*sb))sb++;
+		while(isspace((unsigned char)*sb))sb++;
+ 		contentlen = atoi(sb);
+ 	}
+ 	else if(i > 13 && (!strncasecmp(buf, "content-type:", 13))){
+ 		sb = buf + 13;
+-		while(isspace(*sb))sb++;
+		while(isspace((unsigned char)*sb))sb++;
+ 		if(!strncasecmp(sb, "x-www-form-urlencoded", 21)) isform = 1;
+ 	}
+  }
--- a/net/3proxy/patches/patch-ad
+++ b/net/3proxy/patches/patch-ad
@@ -1,27 +1,26 @@
-$NetBSD: patch-ad,v 1.1 2008/02/27 23:50:29 apb Exp $
+$NetBSD: patch-ad,v 1.2 2015/04/06 02:26:53 rodent Exp $

--- src/common.c.orig	2008-01-08 18:57:30.000000000 +0200
+--- src/common.c.orig	2015-02-17 13:07:20.000000000 +0000
 +++ src/common.c
-@@ -606,3 +606,22 @@ unsigned long getip(unsigned char *name)
- #endif
- 	return retval;
- }
-+
-+/*
-+ * POSIX says:
-+ *     The usleep() function may fail if:
-+ *     [EINVAL] The time interval specified one million or more microseconds.
-+ *
-+ * Other code in 3proxy calls usleep with much larger arguments, but
-+ * that gets redirected here via "#define usleep(usecs) myusleep(usecs)"
-+ * in proxy.h.  We call sleep() for any whole number of seconds, and
-+ * the real usleep() for any left over microseconds.
-+ */
-+int
-+myusleep(useconds_t useconds)
-+{
-+    unsigned int secs = useconds / 1000000;
-+    useconds = useconds % 1000000;
-+    if (secs > 0) sleep(secs);
-+    return (usleep)(useconds);
-+}
+@@ -719,3 +719,21 @@ unsigned long getip(unsigned char *name)
+ #endif
+ 	return retval;
+ }
+
+/*
+ * POSIX says:
+ *     The usleep() function may fail if:
+ *     [EINVAL] The time interval specified one million or more microseconds.
+ *
+ * Other code in 3proxy calls usleep with much larger arguments, but
+ * that gets redirected here via "#define usleep(usecs) myusleep(usecs)"
+ * in proxy.h.  We call sleep() for any whole number of seconds, and
+ * the real usleep() for any left over microseconds.
+ */
+int myusleep(useconds_t useconds)
+{
+	unsigned int secs = useconds / 1000000;
+	useconds = useconds % 1000000;
+	if (secs > 0) sleep(secs);
+	return (usleep)(useconds);
+}
--- a/net/3proxy/patches/patch-ae
+++ b/net/3proxy/patches/patch-ae
@@ -1,13 +1,23 @@
-$NetBSD: patch-ae,v 1.1 2008/02/27 23:50:29 apb Exp $
-
--- src/proxy.h.orig	2006-09-21 14:32:05.000000000 +0200
-+++ src/proxy.h
-@@ -95,6 +95,8 @@
- #endif
- #define daemonize() daemon(1,1)
- #define SLEEPTIME 1000
-+#define usleep(usecs) myusleep(usecs)
-+int myusleep(useconds_t);
- #ifndef O_BINARY
- #define O_BINARY 0
- #endif
+$NetBSD: patch-ae,v 1.2 2015/04/06 02:26:53 rodent Exp $
+
+--- src/proxy.h.orig	2015-02-17 13:07:21.000000000 +0000
+++ src/proxy.h
+@@ -22,7 +22,9 @@
+ #include <ctype.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+#if !(defined(__OpenBSD__) || !defined(__Bitrig__))
+ #include <sys/timeb.h>
+#endif
+ #include <fcntl.h>
+ #include <time.h>
+ 
+@@ -101,6 +103,8 @@
+ #endif
+ #define daemonize() daemon(1,1)
+ #define SLEEPTIME 1000
+#define usleep(usecs) myusleep(usecs)
+int myusleep(useconds_t);
+ #ifndef O_BINARY
+ #define O_BINARY 0
+ #endif
--- a/net/DarwinStreamingServer/Makefile
+++ b/net/DarwinStreamingServer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2014/10/09 14:06:44 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2015/06/12 10:50:39 wiz Exp $

 DISTNAME=	DarwinStreamingSrvr5.5.5-Source
 PKGNAME=	DarwinStreamingServer-5.5.5
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	net multimedia
 MASTER_SITES=	http://static.macosforge.org/dss/downloads/

--- a/net/Geomyidae/DESCR
+++ b/net/Geomyidae/DESCR
@@ -1,4 +1,4 @@
-Geomyidae is a daemon for serving the protocol specified in RFC
+geomyidae is a daemon for serving the protocol specified in RFC
 1436 (Gopher). Under 1000 lines of C by design, it is lightweight
 yet supports dynamic content, automatic file/directory indexing,
 logging and privilege separation.
--- a/net/Geomyidae/MESSAGE
+++ b/net/Geomyidae/MESSAGE
@@ -1,9 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2008/04/06 11:50:36 obache Exp $
+$NetBSD: MESSAGE,v 1.2 2015/04/19 19:21:15 wiz Exp $

-Geomyidae options can be specified in referenced rc.d startup script;
-see ${PREFIX}/share/examples/rc.d/Geomyidae for details.
+For documentation, license, rc.d scripts and configuration examples see:

-For documentation, license, and examples see Geomyidae(8) and/or
-${PREFIX}/share/{doc,examples}/Geomyidae/
+  geomyidae(8)
+  ${PREFIX}/share/doc/geomyidae
+  ${PREFIX}/share/examples/geomyidae
 ===========================================================================
--- a/net/Geomyidae/Makefile
+++ b/net/Geomyidae/Makefile
@@ -1,31 +1,32 @@
-# $NetBSD: Makefile,v 1.5 2013/12/10 14:05:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.6 2015/04/19 19:21:15 wiz Exp $
 #

-DISTNAME=	Geomyidae-0.12
-PKGREVISION=	1
+DISTNAME=	geomyidae-0.26.3
 CATEGORIES=	net
-MASTER_SITES=	http://www.r-36.net/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://r-36.net/src/geomyidae/

-MAINTAINER=	jgw@freeshell.org
-HOMEPAGE=	http://www.r-36.net/
+MAINTAINER=	jgw@sdf.org
+HOMEPAGE=	http://r-36.net/src/geomyidae/
 COMMENT=	Gopher daemon for Linux/BSD
+LICENSE=	mit AND x11

 NO_CONFIGURE=	yes

-EGDIR=		${PREFIX}/share/examples/Geomyidae
-DOCDIR=		${PREFIX}/share/doc/Geomyidae
-RCD_SCRIPTS=	Geomyidae
+EGDIR=		${PREFIX}/share/examples/geomyidae
+DOCDIR=		${PREFIX}/share/doc/geomyidae

-INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8 ${EGDIR} ${DOCDIR}
+INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8 ${EGDIR} ${EGDIR}/rc.d ${DOCDIR}

 LDFLAGS.SunOS+=	-lsocket -lnsl

 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Geomyidae ${DESTDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/Geomyidae.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_PROGRAM} ${WRKSRC}/geomyidae ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/geomyidae.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/CGI ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/index.gph ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/rc.d/* ${DESTDIR}${EGDIR}/rc.d

+# url2pkg-marker (please do not remove this line.)
 .include "../../mk/bsd.pkg.mk"
--- a/net/Geomyidae/PLIST
+++ b/net/Geomyidae/PLIST
@@ -1,6 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2014/03/11 14:05:06 jperkin Exp $
-man/man8/Geomyidae.8
-sbin/Geomyidae
-share/doc/Geomyidae/LICENSE
-share/doc/Geomyidae/README
-share/examples/Geomyidae/index.gph
+@comment $NetBSD: PLIST,v 1.4 2015/04/19 19:21:15 wiz Exp $
+man/man8/geomyidae.8
+sbin/geomyidae
+share/doc/geomyidae/CGI
+share/doc/geomyidae/LICENSE
+share/doc/geomyidae/README
+share/examples/geomyidae/index.gph
+share/examples/geomyidae/rc.d/Archlinux.conf.d
+share/examples/geomyidae/rc.d/Archlinux.rc.d
+share/examples/geomyidae/rc.d/Gentoo.conf.d
+share/examples/geomyidae/rc.d/Gentoo.init.d
+share/examples/geomyidae/rc.d/NetBSD.rc.d
+share/examples/geomyidae/rc.d/README
--- a/net/Geomyidae/distinfo
+++ b/net/Geomyidae/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/01/24 22:21:43 joerg Exp $
+$NetBSD: distinfo,v 1.4 2015/04/19 19:21:15 wiz Exp $

-SHA1 (Geomyidae-0.12.tgz) = 0a3cfbf26ca867b585d95d0db6f15c26ceed8887
-RMD160 (Geomyidae-0.12.tgz) = db8389297d9a3324305b4795df2051159032be30
-Size (Geomyidae-0.12.tgz) = 11014 bytes
-SHA1 (patch-Geomyidae.8) = 0a7c5304d7bac1ca31c40d975d5b9c85e08bf34f
+SHA1 (geomyidae-0.26.3.tar.gz) = 7eb018bb7436f9f2ae4e3123bb8d11f69085bb01
+RMD160 (geomyidae-0.26.3.tar.gz) = d5d843ee0f498972eb72f9f663eb550a2b3e7a31
+Size (geomyidae-0.26.3.tar.gz) = 15556 bytes
--- a/net/Geomyidae/files/Geomyidae.sh
+++ b/net/Geomyidae/files/Geomyidae.sh
@@ -1,59 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: Geomyidae.sh,v 1.2 2008/08/12 14:59:44 reed Exp $
-#
-
-# PROVIDE: Geomyidae
-# REQUIRE: DAEMON
-# BEFORE:  LOGIN
-
-$_rc_subr_loaded . /etc/rc.subr
-#. /etc/rc.subr
-
-name="Geomyidae"
-rcvar="$name"
-command="@PREFIX@/sbin/$name"
-
-#####################################################
-# Geomyidae Options Setion - "?" => Geomyidae(8)    #
-#  Uncomment & define options (defaults are shown)  #
-#####################################################
-#
-#LOGFILE="-l /var/log/gopherd.log"
-#LOGLEVEL="-v 15"
-#HTDOCS="-b /var/gopher"
-#PORT="-p 70"
-#SPORT="-o 70"
-#USR="-u $USER"
-#GRP="-g $GROUP"
-#HOST="-h localhost"
-#IP="-i 127.0.0.1"
-
-######################################################
-# Now remove any UNDEFINED options from line below:  #
-######################################################
-#
-command_args="$LOGFILE $LOGLEVEL $HTDOCS $PORT $SPORT $USR $GRP $HOST $IP"
-
-
-######################################################
-#  Uncomment this section if a PID file is desired   #
-######################################################
-#
-#pidfile="/var/run/${name}.pid"
-#start_cmd="Geomyidae_start"
-#
-#Geomyidae_start()
-#{
-#        echo "Starting $name"
-#        $name $command_args
-#        pgrep -x $name > $pidfile
-#}
-
-######################################################
-#  Lastly, add the following to /etc/rc.conf:        #
-#  "Geomyidae=YES"  (without the quotes)             #
-######################################################
-
-load_rc_config $name
-run_rc_command "$1"
--- a/net/Geomyidae/patches/patch-Geomyidae.8
+++ b/net/Geomyidae/patches/patch-Geomyidae.8
@@ -1,62 +0,0 @@
-$NetBSD: patch-Geomyidae.8,v 1.1 2012/01/24 22:21:43 joerg Exp $
-
--- Geomyidae.8.orig	2012-01-24 20:25:55.000000000 +0000
-+++ Geomyidae.8
-@@ -226,7 +226,7 @@ Links and Searches
- The above looks something like this in a text-based gopher client:
- .Pp
- .Bl -tag -width ".It Ic WIDTHS" -compact -offset indent
-.D1 Welcome to Frog.bog
-+.It Li Welcome to Frog.bog
- .Pp
- .It Ic (FILE)
- About this server
-@@ -241,7 +241,7 @@ Snowflake picture
- .El
- .Pp
- .Bl -tag -width ".It Ic WIDTHS" -compact -offset indent
-.D1 Links and Searches
-+.It Li Links and Searches
- .It Ic (DIR)
- Go to R-36.net
- .It Ic (HTML)
-@@ -326,34 +326,34 @@ where,
- .It Ic <date>
- = access date and time (std 'date' format)
- .Bl -inset -offset indent
-ex.
-+.It ex.
- .Qq "Sun Feb 17 06:11:10 PST 2008"
- .El
- .It Ic <IP:port>
- = client IP address and port served
- .Bl -inset -offset indent
-ex.
-+.It ex.
- .Qq "24.208.18.127:16857"
- .El
- .Pp
- .It Ic <item path>
- = full path to item served
- .Bl -inset -offset indent
-ex.
-+.It ex.
- .D1 Qo "/PICS/simple2.jpg" Qc for an image file
- .D1 Qo "/PICS" Qc for a directory access
- .El
- .It Ic <query>
- = query term submitted (Type 7 requests only)
- .Bl -inset -offset indent
-ex.
-+.It ex.
- .Dl % snarf Qq "gopher://frog.bog/7/hello.cgi?Christoph"
- .Dl would log Qo "Christoph" Qc as the query term.
- .El
- .It Ic (<status>)
- = status of client request
- .Bl -inset -offset indent
-ex. - some common status entries:
-+.It ex. - some common status entries:
- .El
- .Pp
- .Bl -hang -width XXXXXXXXXXXXXXXX -compact -offset XXXXXXXXXXXX
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1066 2015/03/25 20:12:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.1076 2015/06/16 16:16:20 abs Exp $
 #

 COMMENT=	Networking tools
@@ -145,6 +145,7 @@ SUBDIR+=	freerdp
 SUBDIR+=	ftplibpp
 SUBDIR+=	ftpproxy
 SUBDIR+=	gated
+SUBDIR+=	gcloud-golang-metadata
 SUBDIR+=	get-flash-videos
 SUBDIR+=	get_iplayer
 SUBDIR+=	gethost
@@ -174,6 +175,7 @@ SUBDIR+=	grilo
 SUBDIR+=	grilo-plugins
 SUBDIR+=	grilo-testui
 SUBDIR+=	grive
+SUBDIR+=	grive2
 SUBDIR+=	gsnmp
 SUBDIR+=	gssdp
 SUBDIR+=	gst-plugins0.10-mms
@@ -279,7 +281,7 @@ SUBDIR+=	libpcap
 SUBDIR+=	libquvi
 SUBDIR+=	libquvi-scripts
 SUBDIR+=	libradius
-SUBDIR+=	libsoup24
+SUBDIR+=	libsoup
 SUBDIR+=	libsscript
 SUBDIR+=	libtorrent
 SUBDIR+=	libtrace
@@ -305,6 +307,7 @@ SUBDIR+=	mimms
 SUBDIR+=	miniupnpd
 SUBDIR+=	miredo
 SUBDIR+=	mirror
+SUBDIR+=	miruo
 SUBDIR+=	mitmproxy
 SUBDIR+=	mldonkey
 SUBDIR+=	mldonkey-gui
@@ -411,6 +414,7 @@ SUBDIR+=	p5-FusionInventory-Agent-Task-Network
 SUBDIR+=	p5-Geo-IP
 SUBDIR+=	p5-Geo-IPfree
 SUBDIR+=	p5-IO-Interface
+SUBDIR+=	p5-IO-SessionData
 SUBDIR+=	p5-IO-Socket-INET6
 SUBDIR+=	p5-IO-Socket-Multicast
 SUBDIR+=	p5-IP-Country
@@ -497,6 +501,7 @@ SUBDIR+=	p5-SNMP_Session
 SUBDIR+=	p5-SOAP-Lite
 SUBDIR+=	p5-Socket6
 SUBDIR+=	p5-Test-DNS
+SUBDIR+=	p5-Test-RequiresInternet
 SUBDIR+=	p5-Test-TCP
 SUBDIR+=	p5-Umph-Prompt
 SUBDIR+=	p5-WebService-Google-Reader
@@ -516,6 +521,7 @@ SUBDIR+=	pconsole
 SUBDIR+=	pear-Net_DIME
 SUBDIR+=	pear-Net_IDNA2
 SUBDIR+=	pear-Net_LDAP2
+SUBDIR+=	pear-Net_LDAP3
 SUBDIR+=	pear-Net_SMTP
 SUBDIR+=	pear-Net_Sieve
 SUBDIR+=	pear-Net_Socket
@@ -574,6 +580,7 @@ SUBDIR+=	py-foolscap
 SUBDIR+=	py-gevent
 SUBDIR+=	py-google
 SUBDIR+=	py-hatop
+SUBDIR+=	py-ipaddress
 SUBDIR+=	py-irclib
 SUBDIR+=	py-junos-eznc
 SUBDIR+=	py-kenosis
@@ -654,6 +661,7 @@ SUBDIR+=	ruby-twitter
 SUBDIR+=	ruby-twitter-stream
 SUBDIR+=	ruby-userstream
 SUBDIR+=	samba
+SUBDIR+=	samba4
 SUBDIR+=	scamper
 SUBDIR+=	scapy
 SUBDIR+=	scdp
--- a/net/SDL2_net/Makefile
+++ b/net/SDL2_net/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2015/02/09 08:43:13 snj Exp $
+# $NetBSD: Makefile,v 1.4 2015/04/25 14:23:42 tnn Exp $

 DISTNAME=	SDL2_net-2.0.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_net/release/

--- a/net/SDL_net/Makefile
+++ b/net/SDL_net/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2012/10/23 17:18:08 asau Exp $
+# $NetBSD: Makefile,v 1.24 2015/04/25 14:23:42 tnn Exp $

 DISTNAME=	SDL_net-1.2.8
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_net/release/

--- a/net/SDL_net/buildlink3.mk
+++ b/net/SDL_net/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:07 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2015/04/25 14:23:42 tnn Exp $

 BUILDLINK_TREE+=	SDL_net

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	SDL_net
 SDL_NET_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.SDL_net+=	SDL_net>=1.2.5nb1
-BUILDLINK_ABI_DEPENDS.SDL_net+=	SDL_net>=1.2.6
+BUILDLINK_ABI_DEPENDS.SDL_net+=	SDL_net>=1.2.8nb1
 BUILDLINK_PKGSRCDIR.SDL_net?=	../../net/SDL_net

 .include "../../devel/SDL/buildlink3.mk"
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2014/05/29 23:37:02 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2015/06/12 10:50:39 wiz Exp $

 DISTNAME=	aMule-2.3.1
 PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	5
+PKGREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=amule/}
 EXTRACT_SUFX=	.tar.bz2
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2014/11/30 10:09:09 markd Exp $
+# $NetBSD: Makefile,v 1.21 2015/06/12 10:50:39 wiz Exp $

 DISTNAME=	argus-3.7
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.tcp4me.com/code/argus-archive/
 EXTRACT_SUFX=	.tgz
--- a/net/aria2/Makefile
+++ b/net/aria2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2014/12/31 01:38:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.56 2015/04/14 15:50:38 ryoon Exp $
 #

-DISTNAME=	aria2-1.18.8
+DISTNAME=	aria2-1.18.10
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aria2/}
 EXTRACT_SUFX=	.tar.bz2
--- a/net/aria2/PLIST
+++ b/net/aria2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2014/12/31 01:38:11 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.20 2015/04/14 15:50:38 ryoon Exp $
 bin/aria2c
 man/man1/aria2c.1
 man/pt/man1/aria2c.1
@@ -11,45 +11,45 @@ share/doc/aria2/bash_completion/aria2c
 share/doc/aria2/xmlrpc/README.txt
 share/doc/aria2/xmlrpc/aria2mon
 share/doc/aria2/xmlrpc/aria2rpc
-share/locale/ar/LC_MESSAGES/aria2.mo
-share/locale/bg/LC_MESSAGES/aria2.mo
-share/locale/bn/LC_MESSAGES/aria2.mo
-share/locale/ca/LC_MESSAGES/aria2.mo
-share/locale/da/LC_MESSAGES/aria2.mo
-share/locale/de/LC_MESSAGES/aria2.mo
-share/locale/el/LC_MESSAGES/aria2.mo
-share/locale/en@boldquot/LC_MESSAGES/aria2.mo
-share/locale/en@quot/LC_MESSAGES/aria2.mo
-share/locale/es/LC_MESSAGES/aria2.mo
-share/locale/fa/LC_MESSAGES/aria2.mo
-share/locale/fi/LC_MESSAGES/aria2.mo
-share/locale/fil/LC_MESSAGES/aria2.mo
-share/locale/fr/LC_MESSAGES/aria2.mo
-share/locale/he/LC_MESSAGES/aria2.mo
-share/locale/hr/LC_MESSAGES/aria2.mo
-share/locale/hu/LC_MESSAGES/aria2.mo
-share/locale/id/LC_MESSAGES/aria2.mo
-share/locale/it/LC_MESSAGES/aria2.mo
-share/locale/ja/LC_MESSAGES/aria2.mo
-share/locale/kk/LC_MESSAGES/aria2.mo
-share/locale/ko/LC_MESSAGES/aria2.mo
-share/locale/ms/LC_MESSAGES/aria2.mo
-share/locale/nb/LC_MESSAGES/aria2.mo
-share/locale/nl/LC_MESSAGES/aria2.mo
-share/locale/nn/LC_MESSAGES/aria2.mo
-share/locale/oc/LC_MESSAGES/aria2.mo
-share/locale/pl/LC_MESSAGES/aria2.mo
-share/locale/pt/LC_MESSAGES/aria2.mo
-share/locale/pt_BR/LC_MESSAGES/aria2.mo
-share/locale/ro/LC_MESSAGES/aria2.mo
-share/locale/ru/LC_MESSAGES/aria2.mo
-share/locale/sk/LC_MESSAGES/aria2.mo
-share/locale/sr/LC_MESSAGES/aria2.mo
-share/locale/sv/LC_MESSAGES/aria2.mo
-share/locale/th/LC_MESSAGES/aria2.mo
-share/locale/tr/LC_MESSAGES/aria2.mo
-share/locale/uk/LC_MESSAGES/aria2.mo
-share/locale/vi/LC_MESSAGES/aria2.mo
-share/locale/zh_CN/LC_MESSAGES/aria2.mo
-share/locale/zh_HK/LC_MESSAGES/aria2.mo
-share/locale/zh_TW/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/ar/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/bg/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/bn/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/ca/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/el/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/en@boldquot/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/en@quot/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/fa/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/fi/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/fil/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/he/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/hr/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/hu/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/id/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/kk/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/ms/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/nb/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/nl/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/nn/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/oc/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/pt/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/ro/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/sk/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/sr/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/th/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/zh_HK/LC_MESSAGES/aria2.mo
+${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/aria2.mo
--- a/net/aria2/distinfo
+++ b/net/aria2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.36 2014/12/31 01:38:11 ryoon Exp $
+$NetBSD: distinfo,v 1.37 2015/04/14 15:50:38 ryoon Exp $

-SHA1 (aria2-1.18.8.tar.bz2) = b6ad7064b1ea769e78f6a7dc9787a12cfc1e153f
-RMD160 (aria2-1.18.8.tar.bz2) = 076a72fc4a35c91e5c85c2daee328976cadf9bda
-Size (aria2-1.18.8.tar.bz2) = 2150587 bytes
+SHA1 (aria2-1.18.10.tar.bz2) = 7f1e3dc40699e9d09f31778147628e312d22f6c9
+RMD160 (aria2-1.18.10.tar.bz2) = fbe824a1a1f806057fd7114f42638e26cded4d7f
+Size (aria2-1.18.10.tar.bz2) = 2147093 bytes
--- a/net/aria2/options.mk
+++ b/net/aria2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2014/03/29 04:15:09 ryoon Exp $
+# $NetBSD: options.mk,v 1.16 2015/04/14 15:50:38 ryoon Exp $

 PKG_OPTIONS_VAR=		PKG_OPTIONS.aria2

@@ -25,6 +25,7 @@ CONFIGURE_ARGS+=	--disable-nls
 CONFIGURE_ARGS+=	--with-openssl
 CONFIGURE_ARGS+=	--with-gnutls=no
 .  include "../../security/openssl/buildlink3.mk"
+USE_TOOLS+=		pkg-config
 .else
 CONFIGURE_ARGS+=	--with-gnutls
 CONFIGURE_ARGS+=	--with-openssl=no
--- a/net/arp-scan/Makefile
+++ b/net/arp-scan/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2015/01/03 14:44:36 schwarz Exp $
+# $NetBSD: Makefile,v 1.8 2015/06/12 10:50:39 wiz Exp $
 #

 DISTNAME=	arp-scan-1.9
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.nta-monitor.com/files/arp-scan/

--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2014/10/07 16:47:32 adam Exp $
+# $NetBSD: Makefile,v 1.58 2015/04/25 14:23:43 tnn Exp $

 DISTNAME=		avahi-0.6.31
-PKGREVISION=		21
+PKGREVISION=		23
 CATEGORIES=		net
 MASTER_SITES=		http://avahi.org/download/

--- a/net/avahi/buildlink3.mk
+++ b/net/avahi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2014/05/05 00:48:13 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2015/04/25 14:23:43 tnn Exp $

 BUILDLINK_TREE+=	avahi

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	avahi
 AVAHI_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.avahi+=	avahi>=0.6.23
-BUILDLINK_ABI_DEPENDS.avahi+=	avahi>=0.6.31nb20
+BUILDLINK_ABI_DEPENDS.avahi+=	avahi>=0.6.31nb23
 BUILDLINK_PKGSRCDIR.avahi?=	../../net/avahi

 pkgbase := avahi
--- a/net/bind910/Makefile
+++ b/net/bind910/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2015/02/26 10:15:02 taca Exp $
+# $NetBSD: Makefile,v 1.8 2015/06/12 10:50:39 wiz Exp $

 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
 		http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/
@@ -14,7 +15,7 @@ CONFLICTS+=	host-[0-9]*

 MAKE_JOBS_SAFE=	no

-BIND_VERSION=	9.10.2
+BIND_VERSION=	9.10.2-P1

 .include "../../mk/bsd.prefs.mk"

--- a/net/bind910/distinfo
+++ b/net/bind910/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/02/26 10:15:02 taca Exp $
+$NetBSD: distinfo,v 1.6 2015/06/11 14:58:46 taca Exp $

-SHA1 (bind-9.10.2.tar.gz) = 4ddb2670976c06af7e86352616383958d82c51ce
-RMD160 (bind-9.10.2.tar.gz) = 62ca38c60b792224e308815f2908b0c588b08c26
-Size (bind-9.10.2.tar.gz) = 8481111 bytes
+SHA1 (bind-9.10.2-P1.tar.gz) = 1c25e0d3faeac4c78ef338e7a6f1145f53d973f3
+RMD160 (bind-9.10.2-P1.tar.gz) = c3212c130892efc5dda37aae570393c22660d91f
+Size (bind-9.10.2-P1.tar.gz) = 8469057 bytes
 SHA1 (patch-bin_dig_dighost.c) = 582fa4c7288e70bcc6ac906e8429cf38e0ad5152
 SHA1 (patch-bin_tests_system_Makefile.in) = 8bb6130981a6ff2ac736cf53a061115782bb65a2
 SHA1 (patch-config.threads.in) = 227b83efe9cb3e301aaac9b97cf42f1fb8ad06b2
--- a/net/bind99/Makefile
+++ b/net/bind99/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2015/02/26 10:14:10 taca Exp $
+# $NetBSD: Makefile,v 1.44 2015/06/12 10:50:40 wiz Exp $

 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
 		http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.103 2014/10/07 16:47:32 adam Exp $
+# $NetBSD: Makefile,v 1.106 2015/06/07 14:05:58 youri Exp $
 #

 DISTNAME=		bug-buddy-2.30.0
-PKGREVISION=		3
+PKGREVISION=		5
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bug-buddy/2.30/}
 EXTRACT_SUFX=		.tar.bz2
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=    --disable-google-breakpad
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libelf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../net/libsoup24/buildlink3.mk"
+.include "../../net/libsoup/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
 .include "../../sysutils/gnome-settings-daemon/buildlink3.mk"
--- a/net/cacti-spine/Makefile
+++ b/net/cacti-spine/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2014/01/30 16:01:27 pettai Exp $
+# $NetBSD: Makefile,v 1.3 2015/06/11 08:45:48 nils Exp $
 #

-DISTNAME=	cacti-spine-0.8.8b
+DISTNAME=	cacti-spine-0.8.8c
 CATEGORIES=	net
 MASTER_SITES=	http://www.cacti.net/downloads/spine/

--- a/net/cacti-spine/PLIST
+++ b/net/cacti-spine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/12/11 03:01:57 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/06/11 08:45:48 nils Exp $
 bin/spine
 share/doc/cacti-spine/AUTHORS
 share/doc/cacti-spine/COPYING
@@ -8,5 +8,5 @@ share/doc/cacti-spine/LICENSE
 share/doc/cacti-spine/LICENSE.LGPL
 share/doc/cacti-spine/NEWS
 share/doc/cacti-spine/README
-share/doc/cacti-spine/README-WINDOWS
+share/doc/cacti-spine/README.wri
 share/doc/cacti-spine/examples/spine.conf.dist
--- a/net/cacti-spine/distinfo
+++ b/net/cacti-spine/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2013/12/11 03:01:57 obache Exp $
+$NetBSD: distinfo,v 1.2 2015/06/11 08:45:48 nils Exp $

-SHA1 (cacti-spine-0.8.8b.tar.gz) = cd48ec93067f3f7e5ffb99375e1e624e3f42cece
-RMD160 (cacti-spine-0.8.8b.tar.gz) = 606eeafc73061bd4d9bf8aa0f5b0fa62b5339727
-Size (cacti-spine-0.8.8b.tar.gz) = 631603 bytes
+SHA1 (cacti-spine-0.8.8c.tar.gz) = 4a9672cc9957903293da98469f4135497ee4cae1
+RMD160 (cacti-spine-0.8.8c.tar.gz) = 7b7756dc00c3f3312fddcc7b78953e12e6f8c213
+Size (cacti-spine-0.8.8c.tar.gz) = 632102 bytes
--- a/net/cacti/Makefile
+++ b/net/cacti/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2015/03/11 13:56:46 adam Exp $
+# $NetBSD: Makefile,v 1.27 2015/04/25 14:23:43 tnn Exp $

 DISTNAME=	cacti-0.8.8c
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.cacti.net/downloads/

--- a/net/cclive/Makefile
+++ b/net/cclive/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2014/11/07 19:39:40 adam Exp $
+# $NetBSD: Makefile,v 1.10 2015/04/17 15:53:13 adam Exp $

 DISTNAME=		cclive-0.7.16
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		net multimedia www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cclive/}
 EXTRACT_SUFX=		.tar.xz
--- a/net/ccrtp/Makefile
+++ b/net/ccrtp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/04/05 13:55:59 rodent Exp $
+# $NetBSD: Makefile,v 1.7 2015/04/18 03:11:47 rodent Exp $
 #

-DISTNAME=	ccrtp-2.0.8
+DISTNAME=	ccrtp-2.1.2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU:=ccrtp/}

@@ -10,16 +10,23 @@ HOMEPAGE=	http://www.gnu.org/software/ccrtp/
 COMMENT=	RTP and RTSP protocol implementation using GNU CommonCpp
 LICENSE=	gnu-gpl-v2

-GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_LANGUAGES+=		c c++
 USE_TOOLS+=		pkg-config
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/libccrtp1.pc.in
+USE_CMAKE=		yes
+PKGCONFIG_OVERRIDE+=	libccrtp.pc.in
 INFO_FILES=		yes

+SUBST_CLASSES+=		info
+SUBST_FILES.info=	doc/cmake_install.cmake
+SUBST_MESSAGE.info=	Fixing infodir path.
+SUBST_SED.info=		-e 's|share/info|info|1'
+SUBST_STAGE.info=	post-configure
+
 .include "options.mk"

-.include "../../security/libgcrypt/buildlink3.mk"
+BUILDLINK_API_DEPENDS.ucommon+=	ucommon>=6.3.1
 .include "../../devel/ucommon/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/net/ccrtp/PLIST
+++ b/net/ccrtp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/04/17 00:54:16 rodent Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/04/18 03:11:47 rodent Exp $
 include/ccrtp/CryptoContext.h
 include/ccrtp/CryptoContextCtrl.h
 include/ccrtp/base.h
@@ -15,6 +15,7 @@ include/ccrtp/rtcppkt.h
 include/ccrtp/rtp.h
 include/ccrtp/rtppkt.h
 include/ccrtp/sources.h
-info/ccrtp.info
-lib/libccrtp.la
+lib/libccrtp.so
+lib/libccrtp.so.SOVERSION
 lib/pkgconfig/libccrtp.pc
+info/ccrtp.info
--- a/net/ccrtp/buildlink3.mk
+++ b/net/ccrtp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/02/12 23:18:19 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2015/04/18 03:11:47 rodent Exp $

 BUILDLINK_TREE+=	ccrtp

@@ -9,7 +9,17 @@ BUILDLINK_API_DEPENDS.ccrtp+=	ccrtp>=2.0.0
 BUILDLINK_ABI_DEPENDS.ccrtp?=	ccrtp>=2.0.6nb2
 BUILDLINK_PKGSRCDIR.ccrtp?=	../../net/ccrtp

+pkgbase := ccrtp
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.ccrtp:Mlibgcrypt)
 .include "../../security/libgcrypt/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.ccrtp:Mopenssl)
+.include "../../security/openssl/buildlink3.mk"
+.endif
+
 .include "../../devel/ucommon/buildlink3.mk"
 .endif # CCRTP_BUILDLINK3_MK

--- a/net/ccrtp/distinfo
+++ b/net/ccrtp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2014/04/05 13:55:59 rodent Exp $
+$NetBSD: distinfo,v 1.5 2015/04/18 03:11:47 rodent Exp $

-SHA1 (ccrtp-2.0.8.tar.gz) = e26eb4a97871fd9844e5d12fe07e06bf5fd5d144
-RMD160 (ccrtp-2.0.8.tar.gz) = 3ee14ec8198c20c436f581b60801cde182457b3e
-Size (ccrtp-2.0.8.tar.gz) = 751694 bytes
-SHA1 (patch-src_ccrtp_crypto_gcrypt_InitializeGcrypt.cpp) = 150315c24f4c578b8cf045b9050e188d54e0fc8a
+SHA1 (ccrtp-2.1.2.tar.gz) = ecad8c17c5ed61e1c9fb1b785592958c678b7c4b
+RMD160 (ccrtp-2.1.2.tar.gz) = b3b2cb2f6822e08422b19fcd1528f976ca10ad66
+Size (ccrtp-2.1.2.tar.gz) = 764869 bytes
+SHA1 (patch-src_ccrtp_crypto_gcrypt_InitializeGcrypt.cpp) = 407f3a7f6536028a1b727a826183133dfe3ce4d6
--- a/net/ccrtp/options.mk
+++ b/net/ccrtp/options.mk
@@ -1,11 +1,17 @@
-# $NetBSD: options.mk,v 1.1 2013/04/17 00:54:16 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2015/04/18 03:11:47 rodent Exp $

-PKG_OPTIONS_VAR=	PKG_OPTIONS.ccrtp
-PKG_SUPPORTED_OPTIONS=	debug
-PKG_SUGGESTED_OPTIONS+=	# blank
+PKG_OPTIONS_VAR=		PKG_OPTIONS.ccrtp
+PKG_OPTIONS_GROUP.tls=		libgcrypt openssl
+PKG_OPTIONS_REQUIRED_GROUPS=	tls
+PKG_SUGGESTED_OPTIONS+=		openssl

 .include "../../mk/bsd.options.mk"

-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=	--enable-debug
+.if !empty(PKG_OPTIONS:Mlibgcrypt)
+.include "../../security/libgcrypt/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mopenssl)
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.8
+.include "../../security/openssl/buildlink3.mk"
 .endif
--- a/net/ccrtp/patches/patch-src_ccrtp_crypto_gcrypt_InitializeGcrypt.cpp
+++ b/net/ccrtp/patches/patch-src_ccrtp_crypto_gcrypt_InitializeGcrypt.cpp
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_ccrtp_crypto_gcrypt_InitializeGcrypt.cpp,v 1.1 2014/02/21 20:30:27 joerg Exp $
+$NetBSD: patch-src_ccrtp_crypto_gcrypt_InitializeGcrypt.cpp,v 1.2 2015/04/18 03:11:47 rodent Exp $
+
+Fix build with newer libgcrypt.

 --- src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp.orig	2012-06-18 15:19:04.000000000 +0000
 +++ src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp
--- a/net/choqok/Makefile
+++ b/net/choqok/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2014/11/07 19:39:40 adam Exp $
+# $NetBSD: Makefile,v 1.28 2015/06/15 09:21:56 joerg Exp $
 #

 DISTNAME=	choqok-1.4
-PKGREVISION=	6
+PKGREVISION=	9
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=choqok/}Choqok/
 EXTRACT_SUFX=	.tar.xz
@@ -12,6 +12,9 @@ HOMEPAGE=	http://choqok.gnufolks.org/
 COMMENT=	Twitter and StatusNet client for KDE
 LICENSE=	gnu-gpl-v2

+# /data/scratch/net/choqok/work/choqok-1.4/plugins/shorteners/bit_ly/bit_ly_settings.h:64:5: error: unterminated /* comment
+MAKE_JOBS_SAFE=	no
+
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	perl msgfmt pkg-config

--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2013/08/16 08:30:20 hannken Exp $
+# $NetBSD: Makefile,v 1.30 2015/04/13 10:03:21 hannken Exp $

-DISTNAME=	chrony-1.29
+DISTNAME=	chrony-1.31.1
 CATEGORIES=	net
 MASTER_SITES=	http://download.tuxfamily.org/chrony/

@@ -32,8 +32,8 @@ SUBST_STAGE.paths=	post-patch

 post-install:
 	set -e; for file in ${EGFILES}; do			\
-		${INSTALL_DATA} ${WRKSRC}/examples/$${file}	\
-			${DESTDIR}${EGDIR}/$${file};		\
+		${INSTALL_DATA} "${WRKSRC}/examples/$${file}"	\
+			"${DESTDIR}${EGDIR}/$${file}";		\
 	done

 .include "../../mk/readline.buildlink3.mk"
--- a/net/chrony/distinfo
+++ b/net/chrony/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.9 2013/08/31 14:53:45 joerg Exp $
+$NetBSD: distinfo,v 1.10 2015/04/13 10:03:21 hannken Exp $

-SHA1 (chrony-1.29.tar.gz) = 442fb7d62a6f23bf1057864a3dbdfa55e1b6eb35
-RMD160 (chrony-1.29.tar.gz) = 53518efdd90c4695005d7cc929077985f16887d7
-Size (chrony-1.29.tar.gz) = 392880 bytes
-SHA1 (patch-aa) = c28f5b7ff6c3ebc67b68d574c1b10bd54334b6a3
-SHA1 (patch-ab) = 1af7c5699147d4c05165c4e1f90bf127814511ce
-SHA1 (patch-ac) = 5830215f11573ca88541f661fffb17365e7d206c
-SHA1 (patch-ad) = df47df974995f9f947b731a4812fb7633fd874a4
-SHA1 (patch-ae) = 133e90d0614ef5961305b952d9a7a4047a2edcc7
-SHA1 (patch-af) = 43c5e0f14aa8a980af83ba4ea5691705a4738064
-SHA1 (patch-ag) = 165daaab8507cca8b29a61af576711c0ec05a3a6
-SHA1 (patch-ntp__io.c) = 9b9503cf63fba28f57aa6da9020ca02b5d198bf9
+SHA1 (chrony-1.31.1.tar.gz) = 8e92871e164dad89b315a5dda99d94ff7b31770a
+RMD160 (chrony-1.31.1.tar.gz) = 7dd53fb95c1ecf30099bb580adeccd1a808c4dff
+Size (chrony-1.31.1.tar.gz) = 395797 bytes
+SHA1 (patch-Makefile.in) = 28abbbf1cfd037f018a92c3827642e749fd8768a
+SHA1 (patch-conf.c) = df47df974995f9f947b731a4812fb7633fd874a4
+SHA1 (patch-examples_chrony.conf.example) = ed17d749b1e4ad1c168da7a0393ef35a5e68aac0
+SHA1 (patch-examples_chrony.keys.example) = 5be7672dc40a1a1cb4451db05a4318185ef4f4d2
+SHA1 (patch-ntp__io.c) = edd1b5cf49fc24d3bfed128cd686b17633335a4d
--- a/net/chrony/patches/patch-Makefile.in
+++ b/net/chrony/patches/patch-Makefile.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2013/08/16 08:30:20 hannken Exp $
+$NetBSD: patch-Makefile.in,v 1.1 2015/04/13 10:03:21 hannken Exp $

 Adapt install target for pkgsrc.

--- Makefile.in.orig	2013-08-08 13:58:07.000000000 +0000
+--- Makefile.in.orig	2015-04-07 14:35:16.000000000 +0000
 +++ Makefile.in
-@@ -93,35 +93,17 @@ getdate :
+@@ -96,35 +96,15 @@ getdate :
 # seem to vary between systems.
 
- install: chronyd chronyc
+ install: chronyd chronyc chrony.txt
 -	[ -d $(DESTDIR)$(SYSCONFDIR) ] || mkdir -p $(DESTDIR)$(SYSCONFDIR)
 -	[ -d $(DESTDIR)$(SBINDIR) ] || mkdir -p $(DESTDIR)$(SBINDIR)
 -	[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
@@ -15,8 +15,8 @@ Adapt install target for pkgsrc.
 -	[ -d $(DESTDIR)$(MANDIR)/man1 ] || mkdir -p $(DESTDIR)$(MANDIR)/man1
 -	[ -d $(DESTDIR)$(MANDIR)/man5 ] || mkdir -p $(DESTDIR)$(MANDIR)/man5
 -	[ -d $(DESTDIR)$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)$(MANDIR)/man8
- 	[ -d $(DESTDIR)$(DOCDIR) ] || mkdir -p $(DESTDIR)$(DOCDIR)
- 	[ -d $(DESTDIR)$(CHRONYVARDIR) ] || mkdir -p $(DESTDIR)$(CHRONYVARDIR)
+-	[ -d $(DESTDIR)$(DOCDIR) ] || mkdir -p $(DESTDIR)$(DOCDIR)
+-	[ -d $(DESTDIR)$(CHRONYVARDIR) ] || mkdir -p $(DESTDIR)$(CHRONYVARDIR)
 -	if [ -f $(DESTDIR)$(SBINDIR)/chronyd ]; then rm -f $(DESTDIR)$(SBINDIR)/chronyd ; fi
 -	if [ -f $(DESTDIR)$(BINDIR)/chronyc ]; then rm -f $(DESTDIR)$(BINDIR)/chronyc ; fi
 -	cp chronyd $(DESTDIR)$(SBINDIR)/chronyd
--- a/net/chrony/patches/patch-ab
+++ b/net/chrony/patches/patch-ab
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2013/08/16 08:30:20 hannken Exp $
-
-The ctype functions work on integers.
-
--- cmdparse.c.orig	2013-08-08 13:58:07.000000000 +0000
-+++ cmdparse.c
-@@ -203,7 +203,7 @@ CPS_NormalizeLine(char *line)
- 
-   /* Remove white-space at beginning and replace white-spaces with space char */
-   for (p = q = line; *p; p++) {
-    if (isspace(*p)) {
-+    if (isspace((unsigned char)(*p))) {
-       if (!space)
-         *q++ = ' ';
-       space = 1;
-@@ -233,15 +233,15 @@ CPS_SplitWord(char *line)
-   char *p = line, *q = line;
- 
-   /* Skip white-space before the word */
-  while (*q && isspace(*q))
-+  while (*q && isspace((unsigned char)(*q)))
-     q++;
- 
-   /* Move the word to the beginning */
-  while (*q && !isspace(*q))
-+  while (*q && !isspace((unsigned char)(*q)))
-     *p++ = *q++;
- 
-   /* Find the next word */
-  while (*q && isspace(*q))
-+  while (*q && isspace((unsigned char)(*q)))
-     q++;
- 
-   *p = '\0';
--- a/net/chrony/patches/patch-ac
+++ b/net/chrony/patches/patch-ac
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2013/08/16 08:30:20 hannken Exp $
-
-Remove unused variable.
-
--- sys_netbsd.c.orig	2013-08-08 13:58:07.000000000 +0000
-+++ sys_netbsd.c
-@@ -281,7 +281,6 @@ SYS_NetBSD_Initialise(void)
-   };
- 
-   kvm_t *kt;
-  FILE *fp;
- 
-   kt = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
-   if (!kt) {
--- a/net/chrony/patches/patch-ag
+++ b/net/chrony/patches/patch-ag
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2013/08/16 08:30:20 hannken Exp $
-
-The ctype functions work on integers.
-
--- getdate.c.orig	2013-08-08 13:58:07.000000000 +0000
-+++ getdate.c
-@@ -2547,7 +2547,7 @@ LookupWord (buff)
-   /* Make it lowercase. */
-   for (p = buff; *p; p++)
-     if (ISUPPER ((unsigned char) *p))
-      *p = tolower (*p);
-+      *p = tolower ((unsigned char)(*p));
- 
-   if (strcmp (buff, "am") == 0 || strcmp (buff, "a.m.") == 0)
-     {
--- a/net/chrony/patches/patch-conf.c
+++ b/net/chrony/patches/patch-conf.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2013/08/16 08:30:20 hannken Exp $
+$NetBSD: patch-conf.c,v 1.1 2015/04/13 10:03:21 hannken Exp $

 Prepare for SUBST, not processed by configure.

--- a/net/chrony/patches/patch-examples_chrony.conf.example
+++ b/net/chrony/patches/patch-examples_chrony.conf.example
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2013/08/16 08:30:20 hannken Exp $
+$NetBSD: patch-examples_chrony.conf.example,v 1.1 2015/04/13 10:03:21 hannken Exp $

 Prepare for SUBST, not processed by configure.

--- examples/chrony.conf.example.orig	2013-08-08 13:58:07.000000000 +0000
+--- examples/chrony.conf.example.orig	2015-04-07 14:35:16.000000000 +0000
 +++ examples/chrony.conf.example
@@ -1,7 +1,7 @@
 #######################################################################
@@ -31,7 +31,7 @@ Prepare for SUBST, not processed by configure.
 
 # Tell chronyd which numbered key in the file is used as the password
 # for chronyc. (You can pick any integer up to 2**32-1.  '1' is just a
-@@ -129,7 +129,7 @@ commandkey 1
+@@ -132,7 +132,7 @@ generatecommandkey
 # still running and bail out.  If you want to change the path to the PID
 # file, uncomment this line and edit it.  The default path is shown.
 
--- a/net/chrony/patches/patch-examples_chrony.keys.example
+++ b/net/chrony/patches/patch-examples_chrony.keys.example
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2013/08/16 08:30:20 hannken Exp $
+$NetBSD: patch-examples_chrony.keys.example,v 1.1 2015/04/13 10:03:21 hannken Exp $

 Prepare for SUBST, not processed by configure.

--- examples/chrony.keys.example.orig	2013-08-08 13:58:07.000000000 +0000
+--- examples/chrony.keys.example.orig	2015-04-07 14:35:16.000000000 +0000
 +++ examples/chrony.keys.example
@@ -1,6 +1,6 @@
 #######################################################################
--- a/net/chrony/patches/patch-ntp__io.c
+++ b/net/chrony/patches/patch-ntp__io.c
@@ -1,9 +1,11 @@
-$NetBSD: patch-ntp__io.c,v 1.1 2013/08/31 14:53:45 joerg Exp $
+$NetBSD: patch-ntp__io.c,v 1.2 2015/04/13 10:03:21 hannken Exp $

--- ntp_io.c.orig	2013-08-31 11:51:32.000000000 +0000
+Don't use IP_PKTINFO on NetBSD.
+
+--- ntp_io.c.orig	2015-04-07 14:35:16.000000000 +0000
 +++ ntp_io.c
-@@ -350,7 +350,7 @@ read_from_socket(void *anything)
-     }
+@@ -506,7 +506,7 @@ read_from_socket(void *anything)
+     local_addr.sock_fd = sock_fd;
 
     for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
 -#ifdef IP_PKTINFO
@@ -11,12 +13,12 @@ $NetBSD: patch-ntp__io.c,v 1.1 2013/08/31 14:53:45 joerg Exp $
       if (cmsg->cmsg_level == IPPROTO_IP && cmsg->cmsg_type == IP_PKTINFO) {
         struct in_pktinfo ipi;
 
-@@ -449,7 +449,7 @@ send_packet(void *packet, int packetlen,
+@@ -623,7 +623,7 @@ send_packet(void *packet, int packetlen,
   msg.msg_flags = 0;
   cmsglen = 0;
 
 -#ifdef IP_PKTINFO
 +#if defined(IP_PKTINFO) && !defined(__NetBSD__)
-   if (remote_addr->local_ip_addr.family == IPADDR_INET4) {
+   if (local_addr->ip_addr.family == IPADDR_INET4) {
     struct cmsghdr *cmsg;
     struct in_pktinfo *ipi;
--- a/net/cia/Makefile
+++ b/net/cia/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2013/02/06 19:30:56 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2015/06/07 11:06:43 tron Exp $

 DISTNAME=	cia-20030922
 PKGREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	http://scheler.de/~matthias/files/
+MASTER_SITES=	https://zhadum.org.uk/~tron/files/
 EXTRACT_SUFX=	.tar.bz2

 OWNER=		tron@NetBSD.org
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2015/03/14 15:21:56 joerg Exp $
+# $NetBSD: Makefile,v 1.46 2015/06/19 15:30:27 jperkin Exp $

 DISTNAME=	citrix_ica-10.6.115659
 PKGREVISION=	2
@@ -17,7 +17,7 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}

 # "Abort Traps" indefinitely in pbulk
-NOT_FOR_PLATFORM+=	DragonFly-*-* NetBSD-*-x86_64
+NOT_FOR_PLATFORM+=	DragonFly-*-* Linux-*-* NetBSD-*-x86_64

 EMUL_PLATFORMS=		linux-i386
 EMUL_PLATFORMS+=	solaris-sparc
--- a/net/clive/Makefile
+++ b/net/clive/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2014/05/29 23:37:02 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2015/06/12 10:50:40 wiz Exp $

 DISTNAME=	clive-2.3.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	net multimedia www
 MASTER_SITES=	http://clive.googlecode.com/files/

--- a/net/coda/Makefile
+++ b/net/coda/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2015/01/28 13:11:22 hauke Exp $
+# $NetBSD: Makefile,v 1.25 2015/06/12 10:50:40 wiz Exp $
 #

 DISTNAME=	coda-6.9.5
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	net
 MASTER_SITES=	http://www.coda.cs.cmu.edu/pub/coda/src/

--- a/net/corebird/Makefile
+++ b/net/corebird/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2015/03/15 20:03:24 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.7 2015/06/07 14:05:58 youri Exp $

 DISTNAME=	corebird-0.9
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	-https://github.com/baedert/corebird/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX}

@@ -24,7 +25,7 @@ TEST_TARGET=	check
 .include "../../www/librest07/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../net/libsoup24/buildlink3.mk"
+.include "../../net/libsoup/buildlink3.mk"
 .include "../../devel/libgee/buildlink3.mk"
 BUILDLINK_DEPMETHOD.vala=	build
 .include "../../lang/vala/buildlink3.mk"
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2014/05/05 00:48:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.81 2015/04/25 14:23:43 tnn Exp $

 DISTNAME=	dc_gui2-0.80
-PKGREVISION=	31
+PKGREVISION=	32
 CATEGORIES=	net
 MASTER_SITES=	http://ac2i.homelinux.com/dctc/

--- a/net/dcsharp/Makefile
+++ b/net/dcsharp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2014/10/07 16:47:32 adam Exp $
+# $NetBSD: Makefile,v 1.49 2015/04/25 14:23:43 tnn Exp $

 DISTNAME=	dcsharp-0.11.1
-PKGREVISION=	43
+PKGREVISION=	45
 CATEGORIES=	net
 MASTER_SITES=	http://dcsharp.googlecode.com/files/
 EXTRACT_SUFX=	.tar.bz2
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2014/05/29 23:37:02 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2015/06/12 10:50:40 wiz Exp $

 DISTNAME=	dctc-0.85.9
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	net
 MASTER_SITES=	http://ac2i.homelinux.com/dctc/

--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2015/03/13 10:57:14 jmcneill Exp $
+# $NetBSD: Makefile,v 1.37 2015/06/12 10:50:40 wiz Exp $

 DISTNAME=	ddclient-3.8.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ddclient/}
 EXTRACT_SUFX=	.tar.bz2
--- a/net/dhcpcd-gtk/Makefile
+++ b/net/dhcpcd-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2014/10/06 20:12:30 roy Exp $
+# $NetBSD: Makefile,v 1.39 2015/04/25 14:23:43 tnn Exp $
 #

 PKGNAME=		dhcpcd-gtk-${DHCPCD_UI_VERSION}
+PKGREVISION=		1
 CATEGORIES=		net

 COMMENT=		GTK+ system tray monitor for dhcpcd
--- a/net/dhcpcd-qt/Makefile
+++ b/net/dhcpcd-qt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2014/10/06 20:12:30 roy Exp $
+# $NetBSD: Makefile,v 1.3 2015/04/25 14:23:43 tnn Exp $
 #

 PKGNAME=		dhcpcd-qt-${DHCPCD_UI_VERSION}
+PKGREVISION=		1
 CATEGORIES=		net

 COMMENT=		Qt system tray monitor for dhcpcd
--- a/net/dhcpcd/Makefile
+++ b/net/dhcpcd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2015/01/07 09:01:01 roy Exp $
+# $NetBSD: Makefile,v 1.48 2015/05/16 23:37:25 roy Exp $
 #

-DISTNAME=		dhcpcd-6.6.7
+DISTNAME=		dhcpcd-6.9.0
 CATEGORIES=		net
 MASTER_SITES=		ftp://roy.marples.name/pub/dhcpcd/
 MASTER_SITES+=		http://roy.aydogan.net/dhcpcd/
--- a/net/dhcpcd/distinfo
+++ b/net/dhcpcd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.43 2015/01/07 09:01:01 roy Exp $
+$NetBSD: distinfo,v 1.45 2015/05/16 23:37:25 roy Exp $

-SHA1 (dhcpcd-6.6.7.tar.bz2) = 73cb26b4be98753ab44d5cbce6f8c70719db827a
-RMD160 (dhcpcd-6.6.7.tar.bz2) = 2ac8d97938a827038573e120b40bddb225995cf7
-Size (dhcpcd-6.6.7.tar.bz2) = 158093 bytes
+SHA1 (dhcpcd-6.9.0.tar.bz2) = 0e4900e05c01b795508b51f882e1316aad5ad932
+RMD160 (dhcpcd-6.9.0.tar.bz2) = c092e666440fafc8793a86d86b300327db31d9e6
+Size (dhcpcd-6.9.0.tar.bz2) = 176736 bytes
--- a/net/dhcpd-pools/Makefile
+++ b/net/dhcpd-pools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2014/05/29 23:37:03 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2015/06/12 10:50:40 wiz Exp $

 DISTNAME=	dhcpd-pools-2.16
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dhcpd-pools/}

--- a/net/dlint/Makefile
+++ b/net/dlint/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2014/05/29 23:37:03 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2015/06/12 10:50:40 wiz Exp $
 #

 DISTNAME=	dlint1.4.0
 PKGNAME=	dlint-1.4.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://www.domtools.com/pub/

--- a/net/dnscheck/Makefile
+++ b/net/dnscheck/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2015/03/19 22:15:52 pettai Exp $
+# $NetBSD: Makefile,v 1.10 2015/06/12 10:50:40 wiz Exp $

 DISTNAME=	dotse-dnscheck-1.5.4-0-g352a15c
 PKGNAME=	dnscheck-1.5.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_GITHUB:=dotse/dnscheck/tarball/1.5.4/}

--- a/net/dnsmasq/Makefile
+++ b/net/dnsmasq/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2014/11/23 13:16:23 cheusov Exp $
-#
+# $NetBSD: Makefile,v 1.29 2015/05/06 06:08:48 mef Exp $

-DISTNAME=		dnsmasq-2.67
-PKGREVISION=		1
+DISTNAME=		dnsmasq-2.72
 CATEGORIES=		net
 MASTER_SITES=		http://www.thekelleys.org.uk/dnsmasq/

-MAINTAINER=		roy@NetBSD.org
+MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.thekelleys.org.uk/dnsmasq/doc.html
 COMMENT=		Lightweight, easy to configure DNS forwarder
 LICENSE=		gnu-gpl-v3
--- a/net/dnsmasq/distinfo
+++ b/net/dnsmasq/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.24 2015/01/17 13:52:12 bsiegert Exp $
+$NetBSD: distinfo,v 1.27 2015/05/06 06:08:48 mef Exp $

-SHA1 (dnsmasq-2.67.tar.gz) = 550c7ea2bef2a74a089c664d95fc52420a8cb726
-RMD160 (dnsmasq-2.67.tar.gz) = c2f3f9d7978bc9eddbcb77add54acdf3c8103fa8
-Size (dnsmasq-2.67.tar.gz) = 600838 bytes
+SHA1 (dnsmasq-2.72.tar.gz) = c2dc54b142ec5676d6e22951bc5b61863b0503fe
+RMD160 (dnsmasq-2.72.tar.gz) = bac635ea7c93e2864fb369d3e346a65222e70ce2
+Size (dnsmasq-2.72.tar.gz) = 654739 bytes
 SHA1 (patch-dnsmasq.conf.example) = 2974c722a26400915037259c79899e8a3e95bf8f
-SHA1 (patch-src_bpf.c) = 8ba0482e8ba9441d5eb235dfb7b4aa556545636c
+SHA1 (patch-src_bpf.c) = 82b1fcbb20122684193fe0718bff93ab20af0463
+SHA1 (patch-src_rfc1035.c) = 08cd37ee864931cf664a2e008ce475898a2757df
--- a/net/dnsmasq/files/dnsmasq.sh
+++ b/net/dnsmasq/files/dnsmasq.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dnsmasq.sh,v 1.2 2011/10/07 22:37:04 shattered Exp $
+# $NetBSD: dnsmasq.sh,v 1.3 2015/04/22 14:57:22 abs Exp $
 #

 # PROVIDE: dnsmasq
@@ -12,6 +12,7 @@ name="dnsmasq"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
 pidfile="/var/run/${name}.pid"
+extra_commands="reload"

 load_rc_config $name
 run_rc_command "$1"
--- a/net/dnsmasq/patches/patch-src_bpf.c
+++ b/net/dnsmasq/patches/patch-src_bpf.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_bpf.c,v 1.3 2015/01/17 13:52:13 bsiegert Exp $
+$NetBSD: patch-src_bpf.c,v 1.5 2015/05/06 06:08:48 mef Exp $

--- src/bpf.c.orig     2015-01-02 04:23:05.000000000 +0000
-+++ src/bpf.c
-@@ -19,6 +19,10 @@
- #if defined(HAVE_BSD_NETWORK) || defined(HAVE_SOLARIS_NETWORK)
- #include <ifaddrs.h>
+Add inet6 include for OS X
+
+--- src/bpf.c.orig	2014-09-24 06:16:15.000000000 +0900
+++ src/bpf.c	2015-05-06 15:01:56.000000000 +0900
+@@ -29,7 +29,7 @@
+ #  include <net/if_var.h> 
+ #endif
+ #include <netinet/in_var.h>
+-#ifdef HAVE_IPV6
+#if defined(HAVE_IPV6) || defined(__APPLE__)
+ #  include <netinet6/in6_var.h>
+ #endif
 
-+#if defined(__APPLE__)
-+#include <netinet6/in6_var.h>
-+#endif
-+
- #if defined(HAVE_BSD_NETWORK) && !defined(__APPLE__)
- #include <sys/param.h>
- #include <sys/sysctl.h>
--- a/net/dnsmasq/patches/patch-src_rfc1035.c
+++ b/net/dnsmasq/patches/patch-src_rfc1035.c
@@ -0,0 +1,46 @@
+$NetBSD: patch-src_rfc1035.c,v 1.2 2015/05/06 06:08:48 mef Exp $
+
+From ad4a8ff7d9097008d7623df8543df435bfddeac8 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Thu, 9 Apr 2015 21:48:00 +0100
+Subject: [PATCH] Fix crash on receipt of certain malformed DNS requests.
+
+---
+ CHANGELOG     |    3 +++
+ src/rfc1035.c |    9 ++++++---
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/rfc1035.c b/src/rfc1035.c
+index 7a07b0c..a995ab5 100644
+--- src/rfc1035.c
+++ src/rfc1035.c
+@@ -1198,7 +1198,10 @@ unsigned int extract_request(struct dns_header *header, size_t qlen, char *name,
+ size_t setup_reply(struct dns_header *header, size_t qlen,
+ 		struct all_addr *addrp, unsigned int flags, unsigned long ttl)
+ {
+-  unsigned char *p = skip_questions(header, qlen);
+  unsigned char *p;
+
+  if (!(p = skip_questions(header, qlen)))
+    return 0;
+   
+   /* clear authoritative and truncated flags, set QR flag */
+   header->hb3 = (header->hb3 & ~(HB3_AA | HB3_TC)) | HB3_QR;
+@@ -1214,7 +1217,7 @@ size_t setup_reply(struct dns_header *header, size_t qlen,
+     SET_RCODE(header, NOERROR); /* empty domain */
+   else if (flags == F_NXDOMAIN)
+     SET_RCODE(header, NXDOMAIN);
+-  else if (p && flags == F_IPV4)
+  else if (flags == F_IPV4)
+     { /* we know the address */
+       SET_RCODE(header, NOERROR);
+       header->ancount = htons(1);
+@@ -1222,7 +1225,7 @@ size_t setup_reply(struct dns_header *header, size_t qlen,
+       add_resource_record(header, NULL, NULL, sizeof(struct dns_header), &p, ttl, NULL, T_A, C_IN, "4", addrp);
+     }
+ #ifdef HAVE_IPV6
+-  else if (p && flags == F_IPV6)
+  else if (flags == F_IPV6)
+     {
+       SET_RCODE(header, NOERROR);
+       header->ancount = htons(1);
--- a/net/dnstracer/Makefile
+++ b/net/dnstracer/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2015/03/20 15:19:46 mef Exp $
+# $NetBSD: Makefile,v 1.16 2015/06/12 10:50:40 wiz Exp $

 DISTNAME=		dnstracer-1.10
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://www.mavetju.org/download/
 EXTRACT_SUFX=		.tar.bz2
--- a/net/echoping/Makefile
+++ b/net/echoping/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2014/02/12 23:18:19 tron Exp $
+# $NetBSD: Makefile,v 1.29 2015/04/25 09:16:49 mef Exp $
 #

 DISTNAME=	echoping-6.0.2
 PKGREVISION=	7
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.internatif.org/pub/unix/echoping/ \
-		${MASTER_SITE_SOURCEFORGE:=echoping/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=echoping/}

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://echoping.sourceforge.net/
--- a/net/ed2k-gtk-gui/Makefile
+++ b/net/ed2k-gtk-gui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2014/05/05 00:48:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2015/04/25 14:23:43 tnn Exp $

 DISTNAME=		ed2k-gtk-gui-0.6.3
-PKGREVISION=		25
+PKGREVISION=		26
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ed2k-gtk-gui/}

--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2014/10/07 16:47:32 adam Exp $
+# $NetBSD: Makefile,v 1.64 2015/04/25 14:23:43 tnn Exp $
 #

 DISTNAME=		ekiga-3.2.6
-PKGREVISION=		44
+PKGREVISION=		46
 CATEGORIES=		net comms
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ekiga/3.2/}
 EXTRACT_SUFX=		.tar.bz2
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.89 2014/05/05 00:48:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.91 2015/05/27 21:46:26 wiz Exp $

 DISTNAME=	etherape-0.9.12
-PKGREVISION=	24
+PKGREVISION=	25
 CATEGORIES=	gnome net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=etherape/}

-MAINTAINER=	damon@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://etherape.sourceforge.net/
 COMMENT=	Graphical network monitor
 LICENSE=	gnu-gpl-v2 # or later
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2014/05/05 00:48:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2015/04/25 14:23:43 tnn Exp $

 DISTNAME=		ettercap-0.6.b
-PKGREVISION=		26
+PKGREVISION=		27
 CATEGORIES=		security net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ettercap/}

--- a/net/exabgp/Makefile
+++ b/net/exabgp/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.12 2015/03/19 09:20:30 he Exp $
+# $NetBSD: Makefile,v 1.15 2015/06/12 10:50:40 wiz Exp $

-VERSION=	3.4.9
+VERSION=	3.4.11
 DISTNAME=	${VERSION}
 PKGNAME=	exabgp-${VERSION}
+PKGREVISION=	1
 EGG_NAME=	exabgp-${VERSION}
 CATEGORIES=	net
-MASTER_SITES=	https://github.com/Exa-Networks/exabgp/archive/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=Exa-Networks/exabgp/archive/}
 DIST_SUBDIR=	exabgp

 MAINTAINER=	pettai@NetBSD.org
@@ -22,21 +23,25 @@ DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools

 REPLACE_PERL+=		etc/exabgp/processes/dynamic-1.pl
 REPLACE_PERL+=		etc/exabgp/processes/watchdog-1.pl
-REPLACE_PYTHON+=	lib/exabgp/application/bmp.py
-REPLACE_PYTHON+=	lib/exabgp/application/cli.py
-REPLACE_PYTHON+=	lib/exabgp/netlink/route.py
-REPLACE_PYTHON+=	lib/exabgp/reactor/api/encoding.py
+
 REPLACE_PYTHON+=	etc/exabgp/processes/healthcheck.py
 REPLACE_PYTHON+=	etc/exabgp/processes/read-write.py
-REPLACE_PYTHON+=	etc/exabgp/processes/tcp-server
-REPLACE_PYTHON+=	etc/exabgp/processes/syslog-1.py
 REPLACE_PYTHON+=	etc/exabgp/processes/stderr-1.py
+REPLACE_PYTHON+=	etc/exabgp/processes/syslog-1.py
+REPLACE_PYTHON+=	etc/exabgp/processes/tcp-server
+REPLACE_PYTHON+=	lib/exabgp/application/bmp.py
+REPLACE_PYTHON+=	lib/exabgp/application/cli.py
+REPLACE_PYTHON+=	lib/exabgp/application/netlink.py
+REPLACE_PYTHON+=	lib/exabgp/netlink/old.py
+REPLACE_PYTHON+=	lib/exabgp/netlink/route.py
+REPLACE_PYTHON+=	lib/exabgp/reactor/api/encoding.py

 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 3.2.19

 USE_LANGUAGES=  # none

-INSTALLATION_DIRS=	share/exabgp bin man/man1 man/man5
+INSTALLATION_DIRS+=	share/exabgp bin
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1 ${PKGMANDIR}/man5

 pre-install:
 	find ${WRKDIR} -name "*.orig" | xargs rm -f
--- a/net/exabgp/PLIST
+++ b/net/exabgp/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2015/03/19 09:20:30 he Exp $
-bin/exabgp
+@comment $NetBSD: PLIST,v 1.8 2015/05/27 12:26:26 he Exp $
 ${PYSITELIB}/${EGG_FILE}/PKG-INFO
 ${PYSITELIB}/${EGG_FILE}/SOURCES.txt
 ${PYSITELIB}/${EGG_FILE}/dependency_links.txt
@@ -20,6 +19,12 @@ ${PYSITELIB}/exabgp/application/bmp.pyo
 ${PYSITELIB}/exabgp/application/cli.py
 ${PYSITELIB}/exabgp/application/cli.pyc
 ${PYSITELIB}/exabgp/application/cli.pyo
+${PYSITELIB}/exabgp/application/healthcheck.py
+${PYSITELIB}/exabgp/application/healthcheck.pyc
+${PYSITELIB}/exabgp/application/healthcheck.pyo
+${PYSITELIB}/exabgp/application/netlink.py
+${PYSITELIB}/exabgp/application/netlink.pyc
+${PYSITELIB}/exabgp/application/netlink.pyo
 ${PYSITELIB}/exabgp/bgp/__init__.py
 ${PYSITELIB}/exabgp/bgp/__init__.pyc
 ${PYSITELIB}/exabgp/bgp/__init__.pyo
@@ -392,9 +397,39 @@ ${PYSITELIB}/exabgp/logger.pyo
 ${PYSITELIB}/exabgp/netlink/__init__.py
 ${PYSITELIB}/exabgp/netlink/__init__.pyc
 ${PYSITELIB}/exabgp/netlink/__init__.pyo
-${PYSITELIB}/exabgp/netlink/route.py
-${PYSITELIB}/exabgp/netlink/route.pyc
-${PYSITELIB}/exabgp/netlink/route.pyo
+${PYSITELIB}/exabgp/netlink/attributes.py
+${PYSITELIB}/exabgp/netlink/attributes.pyc
+${PYSITELIB}/exabgp/netlink/attributes.pyo
+${PYSITELIB}/exabgp/netlink/firewall.py
+${PYSITELIB}/exabgp/netlink/firewall.pyc
+${PYSITELIB}/exabgp/netlink/firewall.pyo
+${PYSITELIB}/exabgp/netlink/message.py
+${PYSITELIB}/exabgp/netlink/message.pyc
+${PYSITELIB}/exabgp/netlink/message.pyo
+${PYSITELIB}/exabgp/netlink/old.py
+${PYSITELIB}/exabgp/netlink/old.pyc
+${PYSITELIB}/exabgp/netlink/old.pyo
+${PYSITELIB}/exabgp/netlink/route/__init__.py
+${PYSITELIB}/exabgp/netlink/route/__init__.pyc
+${PYSITELIB}/exabgp/netlink/route/__init__.pyo
+${PYSITELIB}/exabgp/netlink/route/address.py
+${PYSITELIB}/exabgp/netlink/route/address.pyc
+${PYSITELIB}/exabgp/netlink/route/address.pyo
+${PYSITELIB}/exabgp/netlink/route/link.py
+${PYSITELIB}/exabgp/netlink/route/link.pyc
+${PYSITELIB}/exabgp/netlink/route/link.pyo
+${PYSITELIB}/exabgp/netlink/route/neighbor.py
+${PYSITELIB}/exabgp/netlink/route/neighbor.pyc
+${PYSITELIB}/exabgp/netlink/route/neighbor.pyo
+${PYSITELIB}/exabgp/netlink/route/network.py
+${PYSITELIB}/exabgp/netlink/route/network.pyc
+${PYSITELIB}/exabgp/netlink/route/network.pyo
+${PYSITELIB}/exabgp/netlink/sequence.py
+${PYSITELIB}/exabgp/netlink/sequence.pyc
+${PYSITELIB}/exabgp/netlink/sequence.pyo
+${PYSITELIB}/exabgp/netlink/tc.py
+${PYSITELIB}/exabgp/netlink/tc.pyc
+${PYSITELIB}/exabgp/netlink/tc.pyo
 ${PYSITELIB}/exabgp/protocol/__init__.py
 ${PYSITELIB}/exabgp/protocol/__init__.pyc
 ${PYSITELIB}/exabgp/protocol/__init__.pyo
@@ -527,14 +562,15 @@ ${PYSITELIB}/exabgp/util/usage.pyo
 ${PYSITELIB}/exabgp/version.py
 ${PYSITELIB}/exabgp/version.pyc
 ${PYSITELIB}/exabgp/version.pyo
+bin/exabgp
+bin/healthcheck
+man/man1/exabgp.1
+man/man5/exabgp.conf.5
 share/exabgp/dynamic-1.pl
 share/exabgp/dynamic-1.sh
-share/exabgp/healthcheck.py
 share/exabgp/read-write.py
 share/exabgp/stderr-1.py
 share/exabgp/syslog-1.py
 share/exabgp/tcp-server
 share/exabgp/watchdog-1.pl
 share/exabgp/watchdog-1.sh
-man/man1/exabgp.1
-man/man5/exabgp.conf.5
--- a/net/exabgp/distinfo
+++ b/net/exabgp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2015/03/19 09:20:30 he Exp $
+$NetBSD: distinfo,v 1.10 2015/05/27 12:26:26 he Exp $

-SHA1 (exabgp/3.4.9.tar.gz) = 7d3dcd6a4cbc7ca02fc330f653a22b0ef63545de
-RMD160 (exabgp/3.4.9.tar.gz) = d89e59472202cea5479677875ba20fdcb8b1099b
-Size (exabgp/3.4.9.tar.gz) = 532690 bytes
+SHA1 (exabgp/3.4.11.tar.gz) = 62b4da0291cfa72ca8be6c176b97f06c1123ba87
+RMD160 (exabgp/3.4.11.tar.gz) = 4a28c954f34667165def4646d7cfd106ee0e0360
+Size (exabgp/3.4.11.tar.gz) = 536372 bytes
 SHA1 (patch-setup.py) = 8181a726cead85e6e06d49f9b474ac97210a069c
--- a/net/filezilla/Makefile
+++ b/net/filezilla/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2015/01/19 12:38:08 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2015/05/06 17:01:52 wiz Exp $

-VERSION=	3.10.0.2
+VERSION=	3.10.3
 DISTNAME=	FileZilla_${VERSION}_src
 PKGNAME=	filezilla-${VERSION}
 CATEGORIES=	net x11
@@ -9,7 +9,7 @@ EXTRACT_SUFX=	.tar.bz2

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://filezilla-project.org/
-COMMENT=	FTP, FTPS and SFTP client with intuitive GUI
+COMMENT=	FTP, FTPS, and SFTP client with intuitive GUI
 LICENSE=	gnu-gpl-v2

 GNU_CONFIGURE=	yes
--- a/net/filezilla/distinfo
+++ b/net/filezilla/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.23 2015/01/19 12:38:08 wiz Exp $
+$NetBSD: distinfo,v 1.24 2015/05/06 17:01:52 wiz Exp $

-SHA1 (FileZilla_3.10.0.2_src.tar.bz2) = fd02e450caff757f28ac62f18b7137f4a0ecbfec
-RMD160 (FileZilla_3.10.0.2_src.tar.bz2) = 6c146947f053a3b6d36afa6767393b109454e914
-Size (FileZilla_3.10.0.2_src.tar.bz2) = 4559921 bytes
+SHA1 (FileZilla_3.10.3_src.tar.bz2) = 81d9994797a841711e4365fb437771abc0df82a8
+RMD160 (FileZilla_3.10.3_src.tar.bz2) = cdb1a073b66bedcb7930d804a588bc437a1e1e6b
+Size (FileZilla_3.10.3_src.tar.bz2) = 4430113 bytes
--- a/net/fpdns/Makefile
+++ b/net/fpdns/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2014/05/29 23:37:03 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2015/06/12 10:50:40 wiz Exp $

 VERSION=	20130404
 DISTNAME=	20130404
-PKGREVISION=	2
+PKGREVISION=	3
 PKGNAME=	fpdns-0.10.0pre${VERSION}
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/kirei/fpdns/archive/
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.85 2014/11/02 05:53:48 obache Exp $
+# $NetBSD: Makefile,v 1.86 2015/06/12 10:50:40 wiz Exp $

 DISTNAME=	freeradius-${RADVER}
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/

--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2015/03/30 09:21:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.40 2015/06/12 10:50:41 wiz Exp $

 DISTNAME=	freeradius-server-${RADVER}
 PKGNAME=	${DISTNAME:S/-server//}
-PKGREVISION=	10
+PKGREVISION=	12
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/
 EXTRACT_SUFX=	.tar.bz2
--- a/net/gcloud-golang-metadata/DESCR
+++ b/net/gcloud-golang-metadata/DESCR
@@ -0,0 +1,5 @@
+Package metadata provides access to Google Compute Engine (GCE) metadata
+and API service accounts.
+
+This package is a wrapper around the GCE metadata service, as documented
+at https://developers.google.com/compute/docs/metadata.
--- a/net/gcloud-golang-metadata/Makefile
+++ b/net/gcloud-golang-metadata/Makefile
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1 2015/05/11 13:02:21 bsiegert Exp $
+#
+
+DISTNAME=		gcloud-golang
+PKGNAME=		gcloud-golang-metadata-20150310
+GITHUB_PROJECT=		${DISTNAME}
+CATEGORIES=		net
+MASTER_SITES=		${MASTER_SITE_GITHUB:=GoogleCloudPlatform/}
+GITHUB_TAG=		9e1852f597
+
+MAINTAINER=		bsiegert@NetBSD.org
+HOMEPAGE=		http://golang.org/
+COMMENT=		Google Compute Engine metadata package
+LICENSE=		modified-bsd
+
+GO_SRCPATH=		google.golang.org/cloud
+GO_BUILD_PATTERN=	${GO_SRCPATH}/compute/metadata
+GO_DIST_BASE=		${DISTNAME}-${GITHUB_TAG}*
+
+# Remove all code except compute/metadata and internal
+pre-patch:
+	${RM} -fr ${WRKSRC}/[^ci]* ${WRKSRC}/cloud*go
+	${RM} -fr ${WRKSRC}/internal/datastore
+	${RM} -fr ${WRKSRC}/internal/testutil
+
+.include "../../net/go-net/buildlink3.mk"
+.include "../../lang/go/go-package.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/net/gcloud-golang-metadata/PLIST
+++ b/net/gcloud-golang-metadata/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1 2015/05/11 13:02:21 bsiegert Exp $
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/cloud/compute/metadata.a
+gopkg/pkg/${GO_PLATFORM}/google.golang.org/cloud/internal.a
+gopkg/src/google.golang.org/cloud/compute/metadata/go13.go
+gopkg/src/google.golang.org/cloud/compute/metadata/metadata.go
+gopkg/src/google.golang.org/cloud/container/container.go
+gopkg/src/google.golang.org/cloud/internal/cloud.go
--- a/net/gcloud-golang-metadata/buildlink3.mk
+++ b/net/gcloud-golang-metadata/buildlink3.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/05/11 13:02:21 bsiegert Exp $
+
+BUILDLINK_TREE+=	gcloud-golang-metadata
+
+.if !defined(GCLOUD_GOLANG_METADATA_BUILDLINK3_MK)
+GCLOUD_GOLANG_METADATA_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.gcloud-golang-metadata+=	gcloud-golang-metadata>=20150310
+BUILDLINK_PKGSRCDIR.gcloud-golang-metadata?=	../../net/gcloud-golang-metadata
+BUILDLINK_DEPMETHOD.gcloud-golang-metadata?=	build
+
+.include "../../net/go-net/buildlink3.mk"
+.endif	# GCLOUD_GOLANG_METADATA_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-gcloud-golang-metadata
--- a/net/gcloud-golang-metadata/distinfo
+++ b/net/gcloud-golang-metadata/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/05/11 13:02:21 bsiegert Exp $
+
+SHA1 (gcloud-golang-9e1852f597.tar.gz) = 6c0ae291809c101ef2ddb1cd1d8c1bfc3fdcf53e
+RMD160 (gcloud-golang-9e1852f597.tar.gz) = 1da0c142082903868c2e878ba3101c1773d9cfb6
+Size (gcloud-golang-9e1852f597.tar.gz) = 88037 bytes
--- a/net/get-flash-videos/Makefile
+++ b/net/get-flash-videos/Makefile
@@ -1,19 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2014/05/29 23:37:03 wiz Exp $
-
-DISTNAME=	${GHACCOUNT}-${GHNAME}-${GHDESCRIBE}-g${GHCOMMIT}
-PKGNAME=	${GHNAME}-0.0.${GHDATE}
-PKGREVISION=	2
-GHNAME=		get-flash-videos
-
-# git describe + GHVERSION from the last commit + GHCOMMIT from the tar.
-GHACCOUNT=	monsieurvideo
-GHDATE=		20140129
-GHDESCRIBE=	v1.22-586
-GHVERSION=	d6e4f43fbb858dd0ba94a2c9431f40a9af13dbfe
-GHCOMMIT=	d6e4f43
+# $NetBSD: Makefile,v 1.10 2015/06/12 10:50:41 wiz Exp $

+DISTNAME=	get-flash-videos-0.0.20150331
+PKGREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	https://github.com/${GHACCOUNT}/${GHNAME}/tarball/${GHVERSION}/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=monsieurvideo/}
+GITHUB_TYPE=	tag
+GITHUB_TAG=	eae1ac23fcc4a31ead78bfdd99c6faae3bde4ab3

 MAINTAINER=	dsainty@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/get-flash-videos/
@@ -33,8 +25,6 @@ DEPENDS+=	rtmpdump-[0-9]*:../../net/rtmpdump

 USE_TOOLS+=	perl:run

-WRKSRC=		${WRKDIR}/${GHACCOUNT}-${GHNAME}-${GHCOMMIT}
-
 PERL5_PACKLIST=	auto/App/get_flash_videos/.packlist

 .include "../../lang/perl5/module.mk"
--- a/net/get-flash-videos/distinfo
+++ b/net/get-flash-videos/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2014/01/31 11:21:18 dsainty Exp $
+$NetBSD: distinfo,v 1.3 2015/04/06 01:50:09 dsainty Exp $

-SHA1 (monsieurvideo-get-flash-videos-v1.22-586-gd6e4f43.tar.gz) = 4afea53440cd286ed6a0cf5edd8cdb108756d467
-RMD160 (monsieurvideo-get-flash-videos-v1.22-586-gd6e4f43.tar.gz) = 25ae308b9cc65a93c5190f69541d69e6bca2fa37
-Size (monsieurvideo-get-flash-videos-v1.22-586-gd6e4f43.tar.gz) = 130361 bytes
+SHA1 (get-flash-videos-0.0.20150331-eae1ac23fcc4a31ead78bfdd99c6faae3bde4ab3.tar.gz) = 48b11a72498a0dd26abfacc3e4d8690380956e99
+RMD160 (get-flash-videos-0.0.20150331-eae1ac23fcc4a31ead78bfdd99c6faae3bde4ab3.tar.gz) = 6e58678f3a861294faea366571706fae99964026
+Size (get-flash-videos-0.0.20150331-eae1ac23fcc4a31ead78bfdd99c6faae3bde4ab3.tar.gz) = 132516 bytes
--- a/net/get_iplayer/Makefile
+++ b/net/get_iplayer/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2015/03/14 00:29:09 prlw1 Exp $
+# $NetBSD: Makefile,v 1.7 2015/06/12 10:50:41 wiz Exp $

-DISTNAME=	get_iplayer-2.92
+DISTNAME=	get_iplayer-2.94
+PKGREVISION=	1
 CATEGORIES=	net multimedia
 MASTER_SITES=	ftp://ftp.infradead.org/pub/get_iplayer/

@@ -12,6 +13,7 @@ LICENSE=	gnu-gpl-v3
 DEPENDS+=	p5-HTML-Parser>=3.0:../../www/p5-HTML-Parser
 DEPENDS+=	p5-HTTP-Cookies>=6.0:../../www/p5-HTTP-Cookies
 DEPENDS+=	p5-HTTP-Date>=6.0:../../www/p5-HTTP-Date
+DEPENDS+=	p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple
 DEPENDS+=	p5-libwww>=6.0:../../www/p5-libwww
 DEPENDS+=	rtmpdump>=1.8:../../net/rtmpdump
 DEPENDS+=	flvstreamer>=1.8:../../multimedia/flvstreamer
--- a/net/get_iplayer/distinfo
+++ b/net/get_iplayer/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/03/14 00:29:09 prlw1 Exp $
+$NetBSD: distinfo,v 1.4 2015/06/03 22:52:24 prlw1 Exp $

-SHA1 (get_iplayer-2.92.tar.gz) = 683b89912a0f31e6508a9761f27354089524b1ba
-RMD160 (get_iplayer-2.92.tar.gz) = 4e1f5cc2235c1a05825941426b57cc283e643c37
-Size (get_iplayer-2.92.tar.gz) = 275682 bytes
+SHA1 (get_iplayer-2.94.tar.gz) = 1082ffb213bf16bfdaa95731f48272b2a7adc4fd
+RMD160 (get_iplayer-2.94.tar.gz) = 70b67bdc2850e914c0606030b6cb2f09a41b0332
+Size (get_iplayer-2.94.tar.gz) = 276644 bytes
 SHA1 (patch-aa) = e15a98daae71135936329d29766a3b70dc845326
 SHA1 (patch-windows_get_iplayer_setup.cgi) = 1f87f0bb74c5883e875cb7676dfd61461dc2cbd0
--- a/net/gift/Makefile
+++ b/net/gift/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2014/05/29 23:37:03 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2015/06/12 10:50:41 wiz Exp $
 #

 DISTNAME=	gift-0.11.8.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gift/}
 EXTRACT_SUFX=	.tar.bz2
--- a/net/gitso/Makefile
+++ b/net/gitso/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2014/05/09 07:37:14 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2015/04/25 14:23:44 tnn Exp $

 DISTNAME=		gitso-0.6
-PKGREVISION=		12
+PKGREVISION=		13
 CATEGORIES=		net x11
 MASTER_SITES=		http://gitso.googlecode.com/files/
 DISTFILES=		gitso_0.6_linux_all.tar.gz
--- a/Show More
+++ b/Show More