6 files changed, 33 insertions, 35 deletions
diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile
index 886684ea09e..d78051c6f7b 100644
--- a/databases/pgbouncer/Makefile
+++ b/databases/pgbouncer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2016/03/05 11:28:13 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2016/03/15 11:29:35 fhajny Exp $
 #
 
-DISTNAME=	pgbouncer-1.6.1
-PKGREVISION=	1
+DISTNAME=	pgbouncer-1.7.2
 CATEGORIES=	databases
 MASTER_SITES=	http://pgbouncer.github.io/downloads/files/${PKGVERSION_NOREV}/
 
@@ -17,22 +16,21 @@ GNU_CONFIGURE=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
-PGUSER?=		pgsql
-PGGROUP?=		pgsql
-PKG_GROUPS=		${PGGROUP}
-PKG_USERS=		${PGUSER}:${PGGROUP}
-PKG_GECOS.${PGUSER}=	PostgreSQL database administrator
-PKG_HOME.${PGUSER}=	${PGHOME}
-
-BUILD_DEFS+=		PGUSER PGGROUP PGHOME VARBASE
-FILES_SUBST+=		PGUSER=${PGUSER}
-FILES_SUBST+=		PGGROUP=${PGGROUP}
-FILES_SUBST+=		PGHOME=${PGHOME}
-
+PGB_USER?=		pgbounce
+PGB_GROUP?=		pgbounce
 PGB_LOG_DIR?=		${VARBASE}/log/pgbouncer
 PGB_RUN_DIR?=		${VARBASE}/run
 
-OWN_DIRS_PERMS+=	${PGB_LOG_DIR} ${PGUSER} ${PGGROUP} 0755
+PKG_GROUPS=		${PGB_GROUP}
+PKG_USERS=		${PGB_USER}:${PGB_GROUP}
+PKG_GECOS.${PGB_USER}=	PgBouncer daemon user
+PKG_HOME.${PGB_USER}=	${PGB_LOG_DIR}
+
+BUILD_DEFS+=		PGB_USER PGB_GROUP VARBASE
+FILES_SUBST+=		PGB_USER=${PGB_USER}
+FILES_SUBST+=		PGB_GROUP=${PGB_GROUP}
+
+OWN_DIRS_PERMS+=	${PGB_LOG_DIR} ${PGB_USER} ${PGB_GROUP} 0755
 
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES=		${EGDIR}/pgbouncer.ini ${PKG_SYSCONFDIR}/pgbouncer.ini \
@@ -65,4 +63,5 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${EGDIR}
 BUILDLINK_API_DEPENDS.libevent+= libevent>=2.0
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../net/libcares/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/pgbouncer/PLIST b/databases/pgbouncer/PLIST
index 2c171585de4..bf3e77b4f17 100644
--- a/databases/pgbouncer/PLIST
+++ b/databases/pgbouncer/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2015/10/23 16:40:38 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/03/15 11:29:35 fhajny Exp $
 bin/pgbouncer
 man/man1/pgbouncer.1
 man/man5/pgbouncer.5
-share/doc/pgbouncer/NEWS
-share/doc/pgbouncer/README
+share/doc/pgbouncer/NEWS.rst
+share/doc/pgbouncer/README.rst
 share/examples/pgbouncer/pgbouncer.ini
 share/examples/pgbouncer/userlist.txt
diff --git a/databases/pgbouncer/distinfo b/databases/pgbouncer/distinfo
index ddb2805a06a..4ec6a292059 100644
--- a/databases/pgbouncer/distinfo
+++ b/databases/pgbouncer/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 17:41:15 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/03/15 11:29:35 fhajny Exp $
 
-SHA1 (pgbouncer-1.6.1.tar.gz) = 4abeee4965a26197e2c193d6bfb01eef46aa72a8
-RMD160 (pgbouncer-1.6.1.tar.gz) = 3eb6d6aae0f634c71bf28eae5f5aa471c4016a9d
-SHA512 (pgbouncer-1.6.1.tar.gz) = cf1cd28b04531bce879f3f9f50b54754253e0d9882c7f122c99d1c0c39fb01264c1ba20f5fd7b42ce7f5356f413b05caf48bbb633693d866271e129426923529
-Size (pgbouncer-1.6.1.tar.gz) = 431076 bytes
-SHA1 (patch-Makefile) = 9c33efeb8c3c70487cdca056002928fc955a8307
+SHA1 (pgbouncer-1.7.2.tar.gz) = d9bb29da15d90713e2399af3ebf5019da5cbe2d6
+RMD160 (pgbouncer-1.7.2.tar.gz) = 1bed03336e62f64b1afc652e4b2ddc6478de51ab
+SHA512 (pgbouncer-1.7.2.tar.gz) = 11c89606599f424b34f39a4b072ec6293fea0b14ee52ae4fbc44775e6d83771a22d194f4e8eabe410e0d6a70657508cf1a3b1012543d91873c36f644afb5675d
+Size (pgbouncer-1.7.2.tar.gz) = 462374 bytes
+SHA1 (patch-Makefile) = 1c76e84975111d9ce077e73fe888dfe466874e33
diff --git a/databases/pgbouncer/files/pgbouncer.sh b/databases/pgbouncer/files/pgbouncer.sh
index 4d519a5b2f7..629f16e71b7 100644
--- a/databases/pgbouncer/files/pgbouncer.sh
+++ b/databases/pgbouncer/files/pgbouncer.sh
@@ -1,6 +1,6 @@
 #! @RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pgbouncer.sh,v 1.2 2014/05/13 14:18:49 fhajny Exp $
+# $NetBSD: pgbouncer.sh,v 1.3 2016/03/15 11:29:35 fhajny Exp $
 #
 # PROVIDE: pgbouncer
 # REQUIRE: DAEMON
@@ -18,7 +18,7 @@ pgbouncer_conf="@PKG_SYSCONFDIR@/${name}.ini"
 required_files="${pgbouncer_conf}"
 command_args="-d ${pgbouncer_conf}"
 extra_commands="reload"
-pgsql_user="@PGUSER@"
+pgsql_user="@PGB_USER@"
 start_cmd="pgbouncer_start"
 
 pidfile="@VARBASE@/run/${name}/${name}.pid"
diff --git a/databases/pgbouncer/files/smf/manifest.xml b/databases/pgbouncer/files/smf/manifest.xml
index 938d3f37b00..b54484f11d7 100644
--- a/databases/pgbouncer/files/smf/manifest.xml
+++ b/databases/pgbouncer/files/smf/manifest.xml
@@ -10,8 +10,8 @@
     <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
       <service_fmri value="svc:/system/filesystem/local" />
     </dependency>
-    <method_context working_directory="@PGHOME@">
-      <method_credential user="@PGUSER@" group="@PGGROUP@" />
+    <method_context>
+      <method_credential user="@PGB_USER@" group="@PGB_GROUP@" />
     </method_context>
     <exec_method type="method" name="start" exec="@PREFIX@/bin/pgbouncer -d %{config_file}" timeout_seconds="60" />
     <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
diff --git a/databases/pgbouncer/patches/patch-Makefile b/databases/pgbouncer/patches/patch-Makefile
index a27281b26f2..79ea3a9f66b 100644
--- a/databases/pgbouncer/patches/patch-Makefile
+++ b/databases/pgbouncer/patches/patch-Makefile
@@ -1,15 +1,14 @@
-$NetBSD: patch-Makefile,v 1.1 2015/10/23 16:40:38 fhajny Exp $
+$NetBSD: patch-Makefile,v 1.2 2016/03/15 11:29:35 fhajny Exp $
 
 Install sample config files as... config files.
 
---- Makefile.orig	2015-09-03 14:46:31.000000000 +0000
+--- Makefile.orig	2016-02-26 08:56:32.000000000 +0000
 +++ Makefile
-@@ -47,7 +47,8 @@ AM_FEATURES = libusual
- pgbouncer_EMBED_LIBUSUAL = 1
+@@ -50,6 +50,8 @@ pgbouncer_EMBED_LIBUSUAL = 1
  
  # docs to install as-is
--dist_doc_DATA = README NEWS etc/pgbouncer.ini etc/userlist.txt
-+dist_doc_DATA = README NEWS
+ dist_doc_DATA = README.rst NEWS.rst etc/pgbouncer.ini etc/userlist.txt
++dist_doc_DATA = README.rst NEWS.rst
 +dist_sysconf_DATA = etc/pgbouncer.ini etc/userlist.txt
  
  DISTCLEANFILES = config.mak config.status lib/usual/config.h config.log