From 9bfeb7062b9b53a4baf612c2ea6d8a5dfb59c913 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Fri, 1 Nov 2019 20:11:57 +0000
Subject: [PATCH] - update to pgcluu-3.1 - drop maintainership

---
 databases/pgcluu/Makefile                      |  9 +++------
 databases/pgcluu/distinfo                      |  4 ++--
 databases/pgcluu/patches/patch-pgcluu          | 10 +++++-----
 databases/pgcluu/patches/patch-pgcluu_collectd |  8 ++++----
 databases/pgcluu/pkg/PLIST                     |  4 ++--
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/databases/pgcluu/Makefile b/databases/pgcluu/Makefile
index 46ad7785808..4d0544d6b28 100644
--- a/databases/pgcluu/Makefile
+++ b/databases/pgcluu/Makefile
@@ -1,14 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2019/07/12 20:43:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2019/11/01 20:11:57 jasper Exp $
 
 COMMENT=		PostgreSQL performances monitoring and auditing tool
 
-DISTNAME=		pgcluu-2.7
+DISTNAME=		pgcluu-3.1
 CATEGORIES=		databases sysutils
-REVISION=		1
 
-HOMEPAGE=		http://pgcluu.darold.net/
-
-MAINTAINER=		Jasper Lievisse Adriaanse <jasper@openbsd.org>
+HOMEPAGE=		https://pgcluu.darold.net/
 
 # BSD
 PERMIT_PACKAGE=	Yes
diff --git a/databases/pgcluu/distinfo b/databases/pgcluu/distinfo
index de584f8b009..13518892756 100644
--- a/databases/pgcluu/distinfo
+++ b/databases/pgcluu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pgcluu-2.7.tar.gz) = r8p25RnOkXW7M6v1C8gqrXKtq65qbcn3SnALYjBurcs=
-SIZE (pgcluu-2.7.tar.gz) = 1101384
+SHA256 (pgcluu-3.1.tar.gz) = ZjpVahcg33REeVJvvufikCwMY/cYz9T9iOFmmwKcmrQ=
+SIZE (pgcluu-3.1.tar.gz) = 1138808
diff --git a/databases/pgcluu/patches/patch-pgcluu b/databases/pgcluu/patches/patch-pgcluu
index 84d789ac9a5..c14cc0655db 100644
--- a/databases/pgcluu/patches/patch-pgcluu
+++ b/databases/pgcluu/patches/patch-pgcluu
@@ -1,11 +1,11 @@
-$OpenBSD: patch-pgcluu,v 1.6 2018/09/07 20:19:48 danj Exp $
+$OpenBSD: patch-pgcluu,v 1.7 2019/11/01 20:11:57 jasper Exp $
 
 - Set $sysinfo{"KERNEL"} and $sysinfo{"CPU"} (minus cache) values
 
 Index: pgcluu
 --- pgcluu.orig
 +++ pgcluu
-@@ -9979,13 +9979,13 @@ sub read_sysinfo_file
+@@ -10985,13 +10985,13 @@ sub read_sysinfo_file
  			next;
  		}
  		if ($section eq 'CPU') {
@@ -26,8 +26,8 @@ Index: pgcluu
  			} else {
  				$sysinfo{$section}{$key} = $val;
  			}
-@@ -9993,8 +9993,8 @@ sub read_sysinfo_file
- 		if ($section eq 'KERNEL') {
+@@ -10999,8 +10999,8 @@ sub read_sysinfo_file
+ 		elsif ($section eq 'KERNEL') {
  			my @kinf = split(/\s+/, $l);
  			$sysinfo{$section}{'hostname'} = $kinf[1];
 -			$sysinfo{$section}{'kernel'} = "$kinf[0] $kinf[2] $kinf[3] $kinf[4]";
@@ -35,5 +35,5 @@ Index: pgcluu
 +			$sysinfo{$section}{'kernel'} = "$kinf[2] $kinf[3]";
 +			$sysinfo{$section}{'arch'} = "$kinf[-1]";
  		}
- 		if ($section eq 'UPTIME') {
+ 		elsif ($section eq 'UPTIME') {
  			$sysinfo{$section}{'all'} = $l;
diff --git a/databases/pgcluu/patches/patch-pgcluu_collectd b/databases/pgcluu/patches/patch-pgcluu_collectd
index 5bea9325389..ffa44a2310f 100644
--- a/databases/pgcluu/patches/patch-pgcluu_collectd
+++ b/databases/pgcluu/patches/patch-pgcluu_collectd
@@ -1,12 +1,12 @@
-$OpenBSD: patch-pgcluu_collectd,v 1.6 2018/09/07 20:19:48 danj Exp $
+$OpenBSD: patch-pgcluu_collectd,v 1.7 2019/11/01 20:11:57 jasper Exp $
 
 - Set $sysinfo{"RELEASE"}, $sysinfo{"CPU"} (minus cache)
 
 Index: pgcluu_collectd
 --- pgcluu_collectd.orig
 +++ pgcluu_collectd
-@@ -1523,9 +1523,9 @@ sub grab_os_information
- {
+@@ -1678,9 +1678,9 @@ sub grab_os_information
+ 	my $out_dir = shift();
  
  	# Look at CPU informations
 -	my $cmd = 'cat /proc/cpuinfo 2>/dev/null';
@@ -17,7 +17,7 @@ Index: pgcluu_collectd
  	# Look at kernel informations
  	$cmd = 'uname -a  2>/dev/null';
  	$cmd = $sshcmd . ' "' . $cmd . "\"" if ($sshcmd);
-@@ -1551,8 +1551,7 @@ sub grab_os_information
+@@ -1717,8 +1717,7 @@ sub grab_os_information
  	$cmd = $sshcmd . ' "' . $cmd . "\"" if ($sshcmd);
  	my @pciinfo = `$cmd`;
  	# Release informations
diff --git a/databases/pgcluu/pkg/PLIST b/databases/pgcluu/pkg/PLIST
index 7dc0ca0739a..51e9993a514 100644
--- a/databases/pgcluu/pkg/PLIST
+++ b/databases/pgcluu/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.4 2018/09/04 12:46:10 espie Exp $
+@comment $OpenBSD: PLIST,v 1.5 2019/11/01 20:11:57 jasper Exp $
 @rcscript ${RCDIR}/pgcluu_collectd
 bin/pgcluu
 bin/pgcluu_collectd
-@man man/man1/pgcluu.1
+@man man/man1/pgcluu.1p
 share/doc/pkg-readmes/${PKGSTEM}