CVS commit: pkgsrc/databases/phppgadmin

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Mon Oct 16 13:02:26 UTC 2023

Modified Files:
        pkgsrc/databases/phppgadmin: Makefile distinfo
Added Files:
        pkgsrc/databases/phppgadmin/patches: patch-all__db.php
            patch-libraries_adodb_drivers_adodb-postgres64.inc.php

Log Message:
Unbreak on php-8, from
<https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=263759>


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/databases/phppgadmin/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/databases/phppgadmin/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/phppgadmin/patches/patch-all__db.php \
    pkgsrc/databases/phppgadmin/patches/patch-libraries_adodb_drivers_adodb-postgres64.inc.php

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/phppgadmin/Makefile
diff -u pkgsrc/databases/phppgadmin/Makefile:1.39 pkgsrc/databases/phppgadmin/Makefile:1.40
--- pkgsrc/databases/phppgadmin/Makefile:1.39   Thu Apr  1 02:42:17 2021
+++ pkgsrc/databases/phppgadmin/Makefile        Mon Oct 16 13:02:26 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2021/04/01 02:42:17 taca Exp $
+# $NetBSD: Makefile,v 1.40 2023/10/16 13:02:26 hauke Exp $
 
 DISTNAME=      phpPgAdmin-7.13.0
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME:S/PgAdmin/pgadmin/}
+PKGREVISION=   1
 CATEGORIES=    databases www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=phppgadmin/}
 GITHUB_PROJECT=        phppgadmin

Index: pkgsrc/databases/phppgadmin/distinfo
diff -u pkgsrc/databases/phppgadmin/distinfo:1.17 pkgsrc/databases/phppgadmin/distinfo:1.18
--- pkgsrc/databases/phppgadmin/distinfo:1.17   Tue Oct 26 10:09:46 2021
+++ pkgsrc/databases/phppgadmin/distinfo        Mon Oct 16 13:02:26 2023
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.17 2021/10/26 10:09:46 nia Exp $
+$NetBSD: distinfo,v 1.18 2023/10/16 13:02:26 hauke Exp $
 
 BLAKE2s (phpPgAdmin-7.13.0.tar.gz) = 190395d8201c4dbf7a1c169ce105fddf91d8964825da0780db7fb12b2cfe6425
 SHA512 (phpPgAdmin-7.13.0.tar.gz) = 744718b49cd3cb1aa23aea0c402076e1a911892c8b871bac9650e39bcf73c45853f6b24bf699ad3b9432f3e082362577ac899baa4e89f14a4da8cf2fb017fb19
 Size (phpPgAdmin-7.13.0.tar.gz) = 804431 bytes
+SHA1 (patch-all__db.php) = 6c66ec6e6dab3713c909c3e54e10a9e56f5a6d70
+SHA1 (patch-libraries_adodb_drivers_adodb-postgres64.inc.php) = c963b943fb755c7e0a42bc4ba088ac3bae5c1991

Added files:

Index: pkgsrc/databases/phppgadmin/patches/patch-all__db.php
diff -u /dev/null pkgsrc/databases/phppgadmin/patches/patch-all__db.php:1.1
--- /dev/null   Mon Oct 16 13:02:26 2023
+++ pkgsrc/databases/phppgadmin/patches/patch-all__db.php       Mon Oct 16 13:02:26 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-all__db.php,v 1.1 2023/10/16 13:02:26 hauke Exp $
+
+Replace deprecated while instruction, from
+<https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=263759>
+
+--- all_db.php.orig    2020-11-07 06:09:12.000000000 +0000
++++ all_db.php
+@@ -199,7 +199,7 @@
+               echo "\t\t<td class=\"data1\">\n";
+               echo "\t\t\t<select name=\"formEncoding\">\n";
+               echo "\t\t\t\t<option value=\"\"></option>\n";
+-              while (list ($key) = each ($data->codemap)) {
++              foreach ($data->codemap as $key => $value) {
+                   echo "\t\t\t\t<option value=\"", htmlspecialchars($key), "\"",
+                               ($key == $_POST['formEncoding']) ? ' selected="selected"' : '', ">",
+                               $misc->printVal($key), "</option>\n";
Index: pkgsrc/databases/phppgadmin/patches/patch-libraries_adodb_drivers_adodb-postgres64.inc.php
diff -u /dev/null pkgsrc/databases/phppgadmin/patches/patch-libraries_adodb_drivers_adodb-postgres64.inc.php:1.1
--- /dev/null   Mon Oct 16 13:02:26 2023
+++ pkgsrc/databases/phppgadmin/patches/patch-libraries_adodb_drivers_adodb-postgres64.inc.php  Mon Oct 16 13:02:26 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-libraries_adodb_drivers_adodb-postgres64.inc.php,v 1.1 2023/10/16 13:02:26 hauke Exp $
+
+Unbreak on php-8, from
+<https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=263759>
+
+--- libraries/adodb/drivers/adodb-postgres64.inc.php.orig      2020-11-07 06:09:12.000000000 +0000
++++ libraries/adodb/drivers/adodb-postgres64.inc.php
+@@ -121,6 +121,11 @@ WHERE relkind in ('r','v') AND (c.relnam
+       {
+       // changes the metaColumnsSQL, adds columns: attnum[6]
+       }
++
++      function __construct()
++      {
++              // non-virtual
++      }
+       
+       function ServerInfo()
+       {