svn commit: r462488 - in head/databases/pgpool-II-33: . files

[Torsten Zuehlsdorff]

Author: tz
Date: Wed Feb 21 10:51:20 2018
New Revision: 462488
URL: https://svnweb.freebsd.org/changeset/ports/462488

Log:
  databases/pgpool-II-33: Update from 3.3.7 to 3.3.20
  
  While here:
  - set EXPIRATION_DATE and mark DEPRECATED because of incoming EOL
  - clean up conflicts
  - add LIB_DEPENDS when option is set
  - regenerate patches with make makepatch

Modified:
  head/databases/pgpool-II-33/Makefile
  head/databases/pgpool-II-33/distinfo
  head/databases/pgpool-II-33/files/patch-pool_hba.c
  head/databases/pgpool-II-33/files/patch-recovery.c
  head/databases/pgpool-II-33/files/patch-watchdog__watchdog.h

Modified: head/databases/pgpool-II-33/Makefile
==============================================================================
--- head/databases/pgpool-II-33/Makefile	Wed Feb 21 10:29:41 2018	(r462487)
+++ head/databases/pgpool-II-33/Makefile	Wed Feb 21 10:51:20 2018	(r462488)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pgpool-II
-PORTVERSION=	3.3.7
+PORTVERSION=	3.3.20
 CATEGORIES=	databases
 MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
 PKGNAMESUFFIX=	33
@@ -13,7 +13,8 @@ LICENSE=	MIT
 
 BROKEN_SSL=	openssl-devel
 BROKEN_SSL_REASON_openssl-devel=	library 'ssl' is required for OpenSSL
-
+DEPRECATED=	Will be deprecated by upstream, please switch to newer pgpool versions
+EXPIRATION_DATE=	2018-07-31
 RUN_DEPENDS=	rsync:net/rsync
 
 USES=		gmake libtool perl5 pgsql
@@ -23,7 +24,7 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
 
-CONFLICTS=	pgpool-3.* pgpool-II-22-2.* pgpool-II-23-2.* pgpool-II-30-3.* pgpool-II-3.*
+CONFLICTS=	pgpool-3.* pgpool-II-30-3.* pgpool-II-3.*
 USE_RC_SUBR=	pgpool
 
 DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp \
@@ -41,6 +42,7 @@ OPTIONS_DEFAULT=	SSL PAM
 LIBMEMCACHED_DESC=		Build with MemCached support
 LIBMEMCACHED_BUILD_DEPENDS=	libmemcached>=1.0:databases/libmemcached
 LIBMEMCACHED_CONFIGURE_ON=	--with-memcached=${LOCALBASE}/lib/libmemcached
+LIBMEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
 SSL_CONFIGURE_WITH=	openssl
 SSL_USES=		ssl

Modified: head/databases/pgpool-II-33/distinfo
==============================================================================
--- head/databases/pgpool-II-33/distinfo	Wed Feb 21 10:29:41 2018	(r462487)
+++ head/databases/pgpool-II-33/distinfo	Wed Feb 21 10:51:20 2018	(r462488)
@@ -1,2 +1,3 @@
-SHA256 (pgpool-II-3.3.7.tar.gz) = b1bfc8c48be252f6c4e54521d24a0e28e86d0027b18aa4ccf6b8405508319032
-SIZE (pgpool-II-3.3.7.tar.gz) = 1808677
+TIMESTAMP = 1519208789
+SHA256 (pgpool-II-3.3.20.tar.gz) = f78e5901b4ff9b0634fcb0c470fa0f2c3dc80365a2407f021f63c38614ba04c6
+SIZE (pgpool-II-3.3.20.tar.gz) = 1793528

Modified: head/databases/pgpool-II-33/files/patch-pool_hba.c
==============================================================================
--- head/databases/pgpool-II-33/files/patch-pool_hba.c	Wed Feb 21 10:29:41 2018	(r462487)
+++ head/databases/pgpool-II-33/files/patch-pool_hba.c	Wed Feb 21 10:51:20 2018	(r462488)
@@ -1,5 +1,5 @@
---- ./pool_hba.c.orig	2014-03-24 14:30:01.000000000 +0000
-+++ ./pool_hba.c	2014-06-29 14:58:09.893352941 +0100
+--- pool_hba.c.orig	2018-02-13 05:20:52 UTC
++++ pool_hba.c
 @@ -29,6 +29,7 @@
  #include <string.h>
  #include <errno.h>

Modified: head/databases/pgpool-II-33/files/patch-recovery.c
==============================================================================
--- head/databases/pgpool-II-33/files/patch-recovery.c	Wed Feb 21 10:29:41 2018	(r462487)
+++ head/databases/pgpool-II-33/files/patch-recovery.c	Wed Feb 21 10:51:20 2018	(r462488)
@@ -1,6 +1,6 @@
---- ./recovery.c.orig	2014-03-24 14:30:01.000000000 +0000
-+++ ./recovery.c	2014-06-29 14:55:21.756363519 +0100
-@@ -117,7 +117,7 @@
+--- recovery.c.orig	2018-02-13 05:20:52 UTC
++++ recovery.c
+@@ -115,7 +115,7 @@ int start_recovery(int recovery_node)
  
  	if (REPLICATION)
  	{
@@ -9,7 +9,7 @@
  
  		/* 2nd stage */
  		*InRecovery = RECOVERY_ONLINE;
-@@ -430,6 +430,6 @@
+@@ -437,6 +437,6 @@ int wait_connection_closed(void)
  			sleep(3);
  	} while (i++ < WAIT_RETRY_COUNT);
  

Modified: head/databases/pgpool-II-33/files/patch-watchdog__watchdog.h
==============================================================================
--- head/databases/pgpool-II-33/files/patch-watchdog__watchdog.h	Wed Feb 21 10:29:41 2018	(r462487)
+++ head/databases/pgpool-II-33/files/patch-watchdog__watchdog.h	Wed Feb 21 10:51:20 2018	(r462488)
@@ -1,5 +1,5 @@
---- ./watchdog/watchdog.h.orig	2014-03-24 14:30:01.000000000 +0000
-+++ ./watchdog/watchdog.h	2014-06-29 14:55:21.760361453 +0100
+--- watchdog/watchdog.h.orig	2018-02-13 05:20:52 UTC
++++ watchdog/watchdog.h
 @@ -56,6 +56,28 @@
  #define WD_TIME_DIFF_SEC(a,b) (int)(((a).tv_sec - (b).tv_sec) + \
                                      ((a).tv_usec - (b).tv_usec) / 1000000.0)