*/Makefile: Sort SUBDIRs

13 files changed, 44 insertions, 44 deletions

diff --git a/archivers/Makefile b/archivers/Makefile
index c503d1247f5e..3a2dcaf3d8f5 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -161,12 +161,12 @@
     SUBDIR += php74-zip
     SUBDIR += php74-zlib
     SUBDIR += php80-bz2
-    SUBDIR += php81-bz2
     SUBDIR += php80-phar
-    SUBDIR += php81-phar
     SUBDIR += php80-zip
-    SUBDIR += php81-zip
     SUBDIR += php80-zlib
+    SUBDIR += php81-bz2
+    SUBDIR += php81-phar
+    SUBDIR += php81-zip
     SUBDIR += php81-zlib
     SUBDIR += pigz
     SUBDIR += pixz
diff --git a/converters/Makefile b/converters/Makefile
index 2a0031cfd8a2..03e6e5d628fa 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -141,8 +141,8 @@
     SUBDIR += php74-iconv
     SUBDIR += php74-mbstring
     SUBDIR += php80-iconv
-    SUBDIR += php81-iconv
     SUBDIR += php80-mbstring
+    SUBDIR += php81-iconv
     SUBDIR += php81-mbstring
     SUBDIR += psiconv
     SUBDIR += py-bencode.py
diff --git a/databases/Makefile b/databases/Makefile
index 93b24ec7a13e..62cb833ea7d7 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -637,28 +637,28 @@
     SUBDIR += php74-pgsql
     SUBDIR += php74-sqlite3
     SUBDIR += php80-dba
-    SUBDIR += php81-dba
     SUBDIR += php80-mysqli
-    SUBDIR += php81-mysqli
     SUBDIR += php80-odbc
-    SUBDIR += php81-odbc
     SUBDIR += php80-pdo
-    SUBDIR += php81-pdo
     SUBDIR += php80-pdo_dblib
-    SUBDIR += php81-pdo_dblib
     SUBDIR += php80-pdo_firebird
-    SUBDIR += php81-pdo_firebird
     SUBDIR += php80-pdo_mysql
-    SUBDIR += php81-pdo_mysql
     SUBDIR += php80-pdo_odbc
-    SUBDIR += php81-pdo_odbc
     SUBDIR += php80-pdo_pgsql
-    SUBDIR += php81-pdo_pgsql
     SUBDIR += php80-pdo_sqlite
-    SUBDIR += php81-pdo_sqlite
     SUBDIR += php80-pgsql
-    SUBDIR += php81-pgsql
     SUBDIR += php80-sqlite3
+    SUBDIR += php81-dba
+    SUBDIR += php81-mysqli
+    SUBDIR += php81-odbc
+    SUBDIR += php81-pdo
+    SUBDIR += php81-pdo_dblib
+    SUBDIR += php81-pdo_firebird
+    SUBDIR += php81-pdo_mysql
+    SUBDIR += php81-pdo_odbc
+    SUBDIR += php81-pdo_pgsql
+    SUBDIR += php81-pdo_sqlite
+    SUBDIR += php81-pgsql
     SUBDIR += php81-sqlite3
     SUBDIR += phpliteadmin
     SUBDIR += phpminiadmin
diff --git a/devel/Makefile b/devel/Makefile
index f34d48a40366..723d730db03b 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4038,24 +4038,24 @@
     SUBDIR += php74-sysvshm
     SUBDIR += php74-tokenizer
     SUBDIR += php80-ffi
-    SUBDIR += php81-ffi
     SUBDIR += php80-gettext
-    SUBDIR += php81-gettext
     SUBDIR += php80-intl
-    SUBDIR += php81-intl
     SUBDIR += php80-pcntl
-    SUBDIR += php81-pcntl
     SUBDIR += php80-readline
-    SUBDIR += php81-readline
     SUBDIR += php80-shmop
-    SUBDIR += php81-shmop
     SUBDIR += php80-sysvmsg
-    SUBDIR += php81-sysvmsg
     SUBDIR += php80-sysvsem
-    SUBDIR += php81-sysvsem
     SUBDIR += php80-sysvshm
-    SUBDIR += php81-sysvshm
     SUBDIR += php80-tokenizer
+    SUBDIR += php81-ffi
+    SUBDIR += php81-gettext
+    SUBDIR += php81-intl
+    SUBDIR += php81-pcntl
+    SUBDIR += php81-readline
+    SUBDIR += php81-shmop
+    SUBDIR += php81-sysvmsg
+    SUBDIR += php81-sysvsem
+    SUBDIR += php81-sysvshm
     SUBDIR += php81-tokenizer
     SUBDIR += phpunit6
     SUBDIR += phpunit7
diff --git a/ftp/Makefile b/ftp/Makefile
index e576070085bb..74ad045e895c 100644
--- a/ftp/Makefile
+++ b/ftp/Makefile
@@ -60,8 +60,8 @@
     SUBDIR += php74-curl
     SUBDIR += php74-ftp
     SUBDIR += php80-curl
-    SUBDIR += php81-curl
     SUBDIR += php80-ftp
+    SUBDIR += php81-curl
     SUBDIR += php81-ftp
     SUBDIR += phpwebftp
     SUBDIR += proftpd
diff --git a/graphics/Makefile b/graphics/Makefile
index 269eaef1d600..60fce7f7c465 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -765,8 +765,8 @@
     SUBDIR += php74-exif
     SUBDIR += php74-gd
     SUBDIR += php80-exif
-    SUBDIR += php81-exif
     SUBDIR += php80-gd
+    SUBDIR += php81-exif
     SUBDIR += php81-gd
     SUBDIR += phplot
     SUBDIR += picpuz
diff --git a/lang/Makefile b/lang/Makefile
index 3a8415003ba0..7fa3d004f658 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -263,8 +263,8 @@
     SUBDIR += php74
     SUBDIR += php74-extensions
     SUBDIR += php80
-    SUBDIR += php81
     SUBDIR += php80-extensions
+    SUBDIR += php81
     SUBDIR += php81-extensions
     SUBDIR += picoc
     SUBDIR += plexil
diff --git a/math/Makefile b/math/Makefile
index 8a58d4ef135d..5eb44d357b11 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -766,8 +766,8 @@
     SUBDIR += php74-bcmath
     SUBDIR += php74-gmp
     SUBDIR += php80-bcmath
-    SUBDIR += php81-bcmath
     SUBDIR += php80-gmp
+    SUBDIR += php81-bcmath
     SUBDIR += php81-gmp
     SUBDIR += physcalc
     SUBDIR += picosat
diff --git a/net/Makefile b/net/Makefile
index c80be16e2de8..8027411bb601 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -983,10 +983,10 @@
     SUBDIR += php74-sockets
     SUBDIR += php74-xmlrpc
     SUBDIR += php80-ldap
-    SUBDIR += php81-ldap
     SUBDIR += php80-soap
-    SUBDIR += php81-soap
     SUBDIR += php80-sockets
+    SUBDIR += php81-ldap
+    SUBDIR += php81-soap
     SUBDIR += php81-sockets
     SUBDIR += phpldapadmin
     SUBDIR += pichi
diff --git a/security/Makefile b/security/Makefile
index 3a9dbda75a52..2da5037ce760 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -806,10 +806,10 @@
     SUBDIR += php74-openssl
     SUBDIR += php74-sodium
     SUBDIR += php80-filter
-    SUBDIR += php81-filter
     SUBDIR += php80-openssl
-    SUBDIR += php81-openssl
     SUBDIR += php80-sodium
+    SUBDIR += php81-filter
+    SUBDIR += php81-openssl
     SUBDIR += php81-sodium
     SUBDIR += phpsecinfo
     SUBDIR += picosha2
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 530a3bb5ada4..c76864c4f436 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -956,8 +956,8 @@
     SUBDIR += php74-fileinfo
     SUBDIR += php74-posix
     SUBDIR += php80-fileinfo
-    SUBDIR += php81-fileinfo
     SUBDIR += php80-posix
+    SUBDIR += php81-fileinfo
     SUBDIR += php81-posix
     SUBDIR += phybs
     SUBDIR += pick
diff --git a/textproc/Makefile b/textproc/Makefile
index 411159e551f4..91281aebb0cc 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1231,22 +1231,22 @@
     SUBDIR += php74-xmlwriter
     SUBDIR += php74-xsl
     SUBDIR += php80-ctype
-    SUBDIR += php81-ctype
     SUBDIR += php80-dom
-    SUBDIR += php81-dom
     SUBDIR += php80-enchant
-    SUBDIR += php81-enchant
     SUBDIR += php80-pspell
-    SUBDIR += php81-pspell
     SUBDIR += php80-simplexml
-    SUBDIR += php81-simplexml
     SUBDIR += php80-xml
-    SUBDIR += php81-xml
     SUBDIR += php80-xmlreader
-    SUBDIR += php81-xmlreader
     SUBDIR += php80-xmlwriter
-    SUBDIR += php81-xmlwriter
     SUBDIR += php80-xsl
+    SUBDIR += php81-ctype
+    SUBDIR += php81-dom
+    SUBDIR += php81-enchant
+    SUBDIR += php81-pspell
+    SUBDIR += php81-simplexml
+    SUBDIR += php81-xml
+    SUBDIR += php81-xmlreader
+    SUBDIR += php81-xmlwriter
     SUBDIR += php81-xsl
     SUBDIR += pict
     SUBDIR += po4a
diff --git a/www/Makefile b/www/Makefile
index 168b2d21b0e3..74fc9a779d05 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -195,8 +195,8 @@
     SUBDIR += gitlab-workhorse
     SUBDIR += glassfish
     SUBDIR += glassfish4
-    SUBDIR += glpi
     SUBDIR += glewlwyd
+    SUBDIR += glpi
     SUBDIR += gnome-user-share
     SUBDIR += go-www
     SUBDIR += gobuffalo
@@ -1382,10 +1382,10 @@
     SUBDIR += php74-session
     SUBDIR += php74-tidy
     SUBDIR += php80-opcache
-    SUBDIR += php81-opcache
     SUBDIR += php80-session
-    SUBDIR += php81-session
     SUBDIR += php80-tidy
+    SUBDIR += php81-opcache
+    SUBDIR += php81-session
     SUBDIR += php81-tidy
     SUBDIR += phpbb
     SUBDIR += phpbb3