Index: head/databases/pgbouncer/Makefile
===================================================================
--- head/databases/pgbouncer/Makefile	(revision 396503)
+++ head/databases/pgbouncer/Makefile	(revision 396504)
@@ -1,60 +1,61 @@
 # Created by: Sergey Skvortsov <skv@protey.ru>
 # $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
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 BUILD_DEPENDS+=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
 
 PORTSCOUT=	site:https://pgbouncer.github.io/downloads/
 
 USERS=		pgbouncer
 GROUPS=		pgbouncer
 
 USE_RC_SUBR=	pgbouncer
 
 GNU_CONFIGURE=	yes
 USES=		gmake
 
 CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} --enable-evdns
 CONFIGURE_ENV+=	PTHREAD_LIBS="-lpthread"
 
 PGBOUNCER_USER?=	pgbouncer
 PGBOUNCER_GROUP?=	pgbouncer
 
 PGBOUNCER_RUNDIR?=	/var/run/pgbouncer
 PGBOUNCER_LOGDIR?=	/var/log/pgbouncer
 
 PLIST_SUB+=	PGBOUNCER_USER="${USERS}" \
 		PGBOUNCER_GROUP="${GROUPS}" \
 		PGBOUNCER_LOGDIR="${PGBOUNCER_LOGDIR}" \
 		PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}"
 SUB_LIST+=	PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}"
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|= pgbouncer.log|= ${PGBOUNCER_LOGDIR}/pgbouncer.log|g" \
 		-e "s|= pgbouncer.pid|= ${PGBOUNCER_RUNDIR}/pgbouncer.pid|g" \
 		${WRKSRC}/etc/pgbouncer.ini
 	@${REINPLACE_CMD} -e "s|sed -n|${LOCALBASE}/bin/gsed -n|g" \
 		${WRKSRC}/lib/find_modules.sh
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pgbouncer ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.5 ${STAGEDIR}${PREFIX}/man/man5/
 	${INSTALL_DATA} ${WRKSRC}/etc/pgbouncer.ini \
 		${STAGEDIR}${PREFIX}/etc/pgbouncer.ini.sample
 	${INSTALL_DATA} ${WRKSRC}/etc/userlist.txt \
 		${STAGEDIR}${PREFIX}/etc/pgbouncer.users.sample
 	@${MKDIR} ${STAGEDIR}${PGBOUNCER_RUNDIR} \
 		${STAGEDIR}${PGBOUNCER_LOGDIR}
 
 .include <bsd.port.mk>
Index: head/databases/pgbouncer/distinfo
===================================================================
--- head/databases/pgbouncer/distinfo	(revision 396503)
+++ head/databases/pgbouncer/distinfo	(revision 396504)
@@ -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: head/databases/pgbouncer/files/patch-keepalive
===================================================================
--- head/databases/pgbouncer/files/patch-keepalive	(revision 396503)
+++ head/databases/pgbouncer/files/patch-keepalive	(nonexistent)
@@ -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 */

Property changes on: head/databases/pgbouncer/files/patch-keepalive
___________________________________________________________________
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