git: d77f8d92ff49 - main - www/phpvirtualbox{,-legacy}: use one patch for both ports, remove "No newline at end of file" from patches

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d77f8d92ff492b6f408bead68d5484c70a031fba

commit d77f8d92ff492b6f408bead68d5484c70a031fba
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-06-07 16:41:36 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-06-07 16:48:33 +0000

    www/phpvirtualbox{,-legacy}: use one patch for both ports, remove "No newline at end of file" from patches
    
    Forgot to commit this change in previous commit.
    
    PR:             261498
    Approved by:    portmgr (blanket, fix run)
    Fixes:          c8ee98641064 (PHP 8.2 support - "utf8_encode()")
    MFH:            2024Q2
---
 www/phpvirtualbox-legacy/Makefile                  |  3 +-
 .../patch-panes_mediumEncryptionPasswords.html     | 41 ----------------------
 .../patch-panes_mediumEncryptionPasswords.html     |  7 ----
 www/phpvirtualbox/files/patch-php8                 |  7 ----
 4 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/www/phpvirtualbox-legacy/Makefile b/www/phpvirtualbox-legacy/Makefile
index 623174262c8e..efaccedd0017 100644
--- a/www/phpvirtualbox-legacy/Makefile
+++ b/www/phpvirtualbox-legacy/Makefile
@@ -22,7 +22,8 @@ DOS2UNIX_REGEX=	.*\.(php|txt|js|css|html)
 WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
 ETCDIR=		${WWWDIR}
 
-EXTRA_PATCHES+=	${.CURDIR}/../phpvirtualbox/files/patch-php8
+EXTRA_PATCHES+=	${.CURDIR}/../phpvirtualbox/files/patch-php8 \
+		${.CURDIR}/../phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html
 
 post-patch:
 	@${MV} ${WRKSRC}/phpvirtualbox.conf ${WRKSRC}/phpvirtualbox-legacy.conf
diff --git a/www/phpvirtualbox-legacy/files/patch-panes_mediumEncryptionPasswords.html b/www/phpvirtualbox-legacy/files/patch-panes_mediumEncryptionPasswords.html
deleted file mode 100644
index 75142aed7747..000000000000
--- a/www/phpvirtualbox-legacy/files/patch-panes_mediumEncryptionPasswords.html
+++ /dev/null
@@ -1,41 +0,0 @@
---- panes/mediumEncryptionPasswords.html.orig	2017-07-27 16:54:58 UTC
-+++ panes/mediumEncryptionPasswords.html
-@@ -15,6 +15,7 @@
-                 <th class='translate' style='width:1%; text-align:center'>Status</th>
-                 <th class='translate' style='width:30%; text-align:center'>ID</th>
-                 <th class='translate'>Password</th>
-+                <th class='translate'>Clear on suspend</th>
-             </tr>
-         </thead>
-         <tbody id='vboxMediumEncryptionPasswordList'>
-@@ -37,9 +38,12 @@ function vboxMediumEncryptionPasswordAdd
-         .append($('<td />')
-                 .append(
-                         valid ? '*****' : 
--                        $('<input />').attr({'type':'password','style':'width:95%'}).addClass('vboxText')
-+                        $('<input />').attr({'type':'password','style':'width:90%'}).addClass('vboxText')
-                         )
-         )
-+        .append($('<td />')
-+                .append($('<input />').attr({'type':'checkbox', 'checked':'checked'}))
-+        )
-         .appendTo($('#vboxMediumEncryptionPasswordList'))
- }
- 
-@@ -55,7 +59,8 @@ function vboxMediumEncryptionPasswordsGe
-             continue;
-         encryptionPWs.push({
-             'id': $(rowlist[i]).data('vboxEncryptionId'),
--            'password': $(rowlist[i]).find('input').first().val()
-+            'password': $(rowlist[i]).find('input[type="password"]').first().val(),
-+            'clearOnSuspend': $(rowlist[i]).find('input[type="checkbox"]').first().is(':checked') ? '1' : '0'
-         });
-         
-     }
-@@ -75,4 +80,4 @@ function vboxMediumEncryptionPasswordsVa
-     });
-     return valid;
- }
--</script>
-\ No newline at end of file
-+</script>
diff --git a/www/phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html b/www/phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html
index 75142aed7747..3e8a7c62dfb7 100644
--- a/www/phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html
+++ b/www/phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html
@@ -32,10 +32,3 @@
          });
          
      }
-@@ -75,4 +80,4 @@ function vboxMediumEncryptionPasswordsVa
-     });
-     return valid;
- }
--</script>
-\ No newline at end of file
-+</script>
diff --git a/www/phpvirtualbox/files/patch-php8 b/www/phpvirtualbox/files/patch-php8
index 318b3c4b5a58..52fe5a6a5b12 100644
--- a/www/phpvirtualbox/files/patch-php8
+++ b/www/phpvirtualbox/files/patch-php8
@@ -178,13 +178,6 @@
  
  		return $log;
  	}
-@@ -5855,4 +5853,4 @@ class vboxconnector {
- 
- 		return @$rcodes['0x'.strtoupper(dechex($c))] . ' (0x'.strtoupper(dechex($c)).')';
- 	}
--}
-\ No newline at end of file
-+}
 --- endpoints/screen.php.orig	2024-06-07 15:46:20 UTC
 +++ endpoints/screen.php
 @@ -87,13 +87,13 @@ try {