Update to 1.5

ok aja@

databases/pgbouncer/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.14 2011/12/17 22:01:12 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2012/01/17 13:57:24 pea Exp $
 
 COMMENT = 	lightweight connection pooler for PostgreSQL
 
-DISTNAME = 	pgbouncer-1.4.2
-REVISION =	0
+DISTNAME = 	pgbouncer-1.5
 
 CATEGORIES = 	databases
 
@@ -17,9 +16,9 @@ PERMIT_PACKAGE_CDROM = 	Yes
 PERMIT_DISTFILES_FTP = 	Yes
 PERMIT_DISTFILES_CDROM =Yes
 
-WANTLIB = 	c event pthread
+WANTLIB = 	c event
 
-MASTER_SITES = 	http://pgfoundry.org/frs/download.php/3085/
+MASTER_SITES = 	http://pgfoundry.org/frs/download.php/3197/
 
 BUILD_DEPENDS =	devel/libeventextra
 

databases/pgbouncer/distinfo

@@ -1,5 +1,5 @@
-MD5 (pgbouncer-1.4.2.tar.gz) = UIMRC1tPIScjS/x7H0UfjQ==
-RMD160 (pgbouncer-1.4.2.tar.gz) = BVeW4j3XAp0/SiyILPJDmaVIHLE=
-SHA1 (pgbouncer-1.4.2.tar.gz) = YQGYw/IYbXAmcnX1VOI71DWY5LU=
-SHA256 (pgbouncer-1.4.2.tar.gz) = 6ZFvCGIfitQTSEAEmkF4P6k9BWkF1EWUL4qh0uWqHq4=
-SIZE (pgbouncer-1.4.2.tar.gz) = 283204
+MD5 (pgbouncer-1.5.tar.gz) = YXn9x/fjxwL+g01lVnbeTA==
+RMD160 (pgbouncer-1.5.tar.gz) = 57p+s+4DQZHLsbq0J+nrGl5Pars=
+SHA1 (pgbouncer-1.5.tar.gz) = vrsCsk1ggzmMZYd928E7QusyaYA=
+SHA256 (pgbouncer-1.5.tar.gz) = QIkk1UeU/NY80xKE+hOiEmay/DPGtea+HrHZFRImH+4=
+SIZE (pgbouncer-1.5.tar.gz) = 411488

databases/pgbouncer/patches/patch-Makefile

@@ -1,11 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2010/07/08 16:18:06 pea Exp $
---- Makefile.orig	Wed Jan 28 11:59:26 2009
-+++ Makefile	Wed Jun 16 11:22:46 2010
-@@ -104,6 +104,7 @@ install: $(exe) doc-install
- 	mkdir -p $(DESTDIR)$(docdir)
- 	$(BININSTALL) -m 755 $(exe) $(DESTDIR)$(bindir)
- 	$(INSTALL) -m 644 $(srcdir)/etc/pgbouncer.ini  $(DESTDIR)$(docdir)
-+	$(INSTALL) -m 644 $(srcdir)/etc/userlist.txt  $(DESTDIR)$(docdir)
- ifeq ($(PORTNAME),win32)
- 	$(BININSTALL) -m 755 $(dll) $(DESTDIR)$(bindir)
- endif

databases/pgbouncer/patches/patch-etc_pgbouncer_ini

@@ -1,7 +1,7 @@
-$OpenBSD: patch-etc_pgbouncer_ini,v 1.1.1.1 2010/07/08 16:18:06 pea Exp $
---- etc/pgbouncer.ini.orig	Wed Apr 21 12:02:50 2010
-+++ etc/pgbouncer.ini	Wed Jun 16 15:29:18 2010
-@@ -22,8 +22,8 @@ nondefaultdb = pool_size=50 reserve_pool=10
+$OpenBSD: patch-etc_pgbouncer_ini,v 1.2 2012/01/17 13:57:24 pea Exp $
+--- etc/pgbouncer.ini.orig	Mon Dec 12 18:09:54 2011
++++ etc/pgbouncer.ini	Wed Jan 11 10:02:47 2012
+@@ -27,8 +27,8 @@ nondefaultdb = pool_size=50 reserve_pool=10
  ;;; Administrative settings
  ;;;
  
@@ -12,13 +12,13 @@ $OpenBSD: patch-etc_pgbouncer_ini,v 1.1.1.1 2010/07/08 16:18:06 pea Exp $
  
  ;;;
  ;;; Where to wait for clients
-@@ -39,16 +39,16 @@ unix_socket_dir = /tmp
+@@ -47,16 +47,16 @@ listen_port = 6432
  ;;;
  
  ; any, trust, plain, crypt, md5
 -auth_type = trust
 +auth_type = md5
- #auth_file = 8.0/main/global/pg_auth
+ ;auth_file = 8.0/main/global/pg_auth
 -auth_file = etc/userlist.txt
 +auth_file = /etc/pgbouncer/userlist.txt
  

databases/pgbouncer/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2011/05/11 06:26:03 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.5 2012/01/17 13:57:24 pea Exp $
 @newgroup _pgbouncer:653
 @newuser _pgbouncer:653:653:daemon:pgbouncer:/nonexistent:/sbin/nologin
 @extraunexec rm -rf /var/log/pgbouncer/*
@@ -9,6 +9,9 @@
 @sample ${SYSCONFDIR}/pgbouncer/
 @owner
 share/doc/pgbouncer/
+share/doc/pgbouncer/NEWS
+share/doc/pgbouncer/README
+share/doc/pkg-readmes/${FULLPKGNAME}
 @mode 640
 @group _pgbouncer
 share/doc/pgbouncer/pgbouncer.ini
@@ -16,10 +19,9 @@ share/doc/pgbouncer/pgbouncer.ini
 share/doc/pgbouncer/userlist.txt
 @sample ${SYSCONFDIR}/pgbouncer/userlist.txt
 @mode
-@group
-share/doc/pkg-readmes/${FULLPKGNAME}
-@rcscript ${RCDIR}/pgbouncer
 @owner _pgbouncer
-@group _pgbouncer
-@group
 @sample /var/log/pgbouncer/
+@owner
+@mode
+@group
+@rcscript ${RCDIR}/pgbouncer