Index: Makefile
===================================================================
--- Makefile	(revision 396449)
+++ Makefile	(working copy)
@@ -2,9 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	pgbouncer
-PORTVERSION=	1.5.5
+PORTVERSION=	1.6.1
 CATEGORIES=	databases
-MASTER_SITES=	https://pgbouncer.github.io/downloads/
+MASTER_SITES=	https://pgbouncer.github.io/downloads/files/${PORTVERSION}/ \
+		http://pgbouncer.github.io/downloads/files/${PORTVERSION}/
 
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Lightweight connection pooler for PostgreSQL
Index: distinfo
===================================================================
--- distinfo	(revision 396449)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (pgbouncer-1.5.5.tar.gz) = d65a192d1e2e69bf445d536f10211857959fc38e0247d1974e8008253080e234
-SIZE (pgbouncer-1.5.5.tar.gz) = 336145
+SHA256 (pgbouncer-1.6.1.tar.gz) = 40ff5cd84399b4da3ba864ad654fe155a0ed085261e68f3e31b1117812b17056
+SIZE (pgbouncer-1.6.1.tar.gz) = 431076
Index: files/patch-keepalive
===================================================================
--- files/patch-keepalive	(revision 396449)
+++ files/patch-keepalive	(working copy)
@@ -1,46 +0,0 @@
---- src/util.c.orig	2011-12-07 15:04:13.000000000 +0400
-+++ src/util.c	2011-12-07 15:04:07.000000000 +0400
-@@ -126,7 +126,7 @@
- 		res = setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val));
- 		if (res < 0)
- 			goto fail;
--#ifdef __linux__
-+#ifdef TCP_KEEPCNT
- 		/* set count of keepalive packets */
- 		if (cf_tcp_keepcnt > 0) {
- 			val = cf_tcp_keepcnt;
-@@ -134,6 +134,8 @@
- 			if (res < 0)
- 				goto fail;
- 		}
-+#endif
-+#ifdef TCP_KEEPIDLE
- 		/* how long the connection can stay idle before sending keepalive pkts */
- 		if (cf_tcp_keepidle) {
- 			val = cf_tcp_keepidle;
-@@ -141,6 +143,8 @@
- 			if (res < 0)
- 				goto fail;
- 		}
-+#endif
-+#ifdef TCP_KEEPINTVL
- 		/* time between packets */
- 		if (cf_tcp_keepintvl) {
- 			val = cf_tcp_keepintvl;
-@@ -148,7 +152,7 @@
- 			if (res < 0)
- 				goto fail;
- 		}
--#else
-+#endif
- #ifdef TCP_KEEPALIVE
- 		if (cf_tcp_keepidle) {
- 			val = cf_tcp_keepidle;
-@@ -157,7 +161,6 @@
- 				goto fail;
- 		}
- #endif
--#endif
- 	}
- 
- 	/* set in-kernel socket buffer size */