From: TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] [NOMERGE] php/composer: turn into meta package as 7.4 is EOL; php8.[01] and composer8.[01]: add alternatives groups.
Date: Mon, 29 Aug 2022 14:58:01 +0200 [thread overview]
Message-ID: <20220829125801.8-tyM3uQNRkH8J1YGH_2VTelhvfvFsKtTeX4YzGLDS0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38536@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1459 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php
https://github.com/void-linux/void-packages/pull/38536
[WIP] [NOMERGE] php/composer: turn into meta package as 7.4 is EOL; php8.[01] and composer8.[01]: add alternatives groups.
### Should not be merged until PHP 7.4 EOL (28 Nov 2022): https://www.php.net/supported-versions.php
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38536.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-38536.patch --]
[-- Type: text/x-diff, Size: 37563 bytes --]
From 8691113d1e7b31ce74b787f2c6d588c2cdc9755c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 8 Aug 2022 11:36:37 -0400
Subject: [PATCH 1/6] php: turn into meta package
7.4 is EOL
---
srcpkgs/php/files/apache.conf | 13 -
srcpkgs/php/files/php-fpm/run | 3 -
srcpkgs/php/patches/php-706-crypt.patch | 15 -
srcpkgs/php/patches/php-cross-config.patch | 41 ---
srcpkgs/php/patches/php-enchant2.patch | 103 ------
srcpkgs/php/patches/php-fpm.patch | 13 -
.../patches/php-ltmain-sysroot-support.patch | 39 --
srcpkgs/php/patches/php-pear-cross.patch | 23 --
srcpkgs/php/patches/php-phar-cross.patch | 29 --
.../patches/php-phpize-sysroot-support.patch | 28 --
srcpkgs/php/patches/php.ini.patch | 24 --
srcpkgs/php/template | 332 +++---------------
srcpkgs/php/update | 1 -
13 files changed, 43 insertions(+), 621 deletions(-)
delete mode 100644 srcpkgs/php/files/apache.conf
delete mode 100755 srcpkgs/php/files/php-fpm/run
delete mode 100644 srcpkgs/php/patches/php-706-crypt.patch
delete mode 100644 srcpkgs/php/patches/php-cross-config.patch
delete mode 100644 srcpkgs/php/patches/php-enchant2.patch
delete mode 100644 srcpkgs/php/patches/php-fpm.patch
delete mode 100644 srcpkgs/php/patches/php-ltmain-sysroot-support.patch
delete mode 100644 srcpkgs/php/patches/php-pear-cross.patch
delete mode 100644 srcpkgs/php/patches/php-phar-cross.patch
delete mode 100644 srcpkgs/php/patches/php-phpize-sysroot-support.patch
delete mode 100644 srcpkgs/php/patches/php.ini.patch
delete mode 100644 srcpkgs/php/update
diff --git a/srcpkgs/php/files/apache.conf b/srcpkgs/php/files/apache.conf
deleted file mode 100644
index b516b5e66ffa..000000000000
--- a/srcpkgs/php/files/apache.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Required modules: dir_module, php7_module
-
-<IfModule dir_module>
- <IfModule php7_module>
- DirectoryIndex index.php index.html
- <FilesMatch "\.php$">
- SetHandler application/x-httpd-php
- </FilesMatch>
- <FilesMatch "\.phps$">
- SetHandler application/x-httpd-php-source
- </FilesMatch>
- </IfModule>
-</IfModule>
diff --git a/srcpkgs/php/files/php-fpm/run b/srcpkgs/php/files/php-fpm/run
deleted file mode 100755
index c9c75b0498aa..000000000000
--- a/srcpkgs/php/files/php-fpm/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec php-fpm --nodaemonize
diff --git a/srcpkgs/php/patches/php-706-crypt.patch b/srcpkgs/php/patches/php-706-crypt.patch
deleted file mode 100644
index 254f1d2187c2..000000000000
--- a/srcpkgs/php/patches/php-706-crypt.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/ext/standard/crypt.c 2016-04-28 14:13:00.000000000 -0400
-+++ b/ext/standard/crypt.c 2016-04-28 21:45:24.340955313 -0400
-@@ -267,6 +267,12 @@
- }
- # elif defined(HAVE_CRYPT)
- crypt_res = crypt(password, salt);
-+ if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
-+ return NULL;
-+ } else {
-+ result = zend_string_init(crypt_res, strlen(crypt_res), 0);
-+ return result;
-+ }
- # else
- # error No crypt() implementation
- # endif
diff --git a/srcpkgs/php/patches/php-cross-config.patch b/srcpkgs/php/patches/php-cross-config.patch
deleted file mode 100644
index d6af2c58cb25..000000000000
--- a/srcpkgs/php/patches/php-cross-config.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/configure 2020-03-17 11:40:20.000000000 +0100
-+++ b/configure 2020-04-12 19:51:57.216350534 +0200
-@@ -6374,10 +6374,12 @@ IFS="- /.
- as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5
- fi
-
-+ APXS_PREFIX='$(INSTALL_ROOT)'/usr
- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
- if test -z `$APXS -q SYSCONFDIR`; then
- INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
- $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-+ -S PREFIX='$APXS_PREFIX' \
- -i -n php7"
- else
- APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
-@@ -6385,6 +6387,7 @@ IFS="- /.
- \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
- $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
- -S SYSCONFDIR='$APXS_SYSCONFDIR' \
-+ -S PREFIX='$APXS_PREFIX' \
- -i -a -n php7"
- fi
-
-@@ -57170,7 +57173,7 @@ $as_echo_n "checking for pg_config... "
- fi
- done
-
-- if test -n "$PG_CONFIG"; then
-+ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- $as_echo "$PG_CONFIG" >&6; }
- PGSQL_INCLUDE=`$PG_CONFIG --includedir`
-@@ -58821,7 +58824,7 @@ $as_echo_n "checking for pg_config... "
- fi
- done
-
-- if test -n "$PG_CONFIG"; then
-+ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- $as_echo "$PG_CONFIG" >&6; }
- PGSQL_INCLUDE=`$PG_CONFIG --includedir`
diff --git a/srcpkgs/php/patches/php-enchant2.patch b/srcpkgs/php/patches/php-enchant2.patch
deleted file mode 100644
index b82c41211123..000000000000
--- a/srcpkgs/php/patches/php-enchant2.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git a/configure b/configure
-index 3ece7a4..b832a68 100755
---- a/configure
-+++ b/configure
-@@ -28123,19 +28123,19 @@ $as_echo "$ext_output" >&6; }
- if test "$PHP_ENCHANT" != "no"; then
-
- pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant" >&5
--$as_echo_n "checking for enchant... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant-2" >&5
-+$as_echo_n "checking for enchant-2... " >&6; }
-
- if test -n "$ENCHANT_CFLAGS"; then
- pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "enchant") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant" 2>/dev/null`
-+ pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant-2" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -28147,12 +28147,12 @@ if test -n "$ENCHANT_LIBS"; then
- pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "enchant") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant" 2>/dev/null`
-+ pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant-2" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -28173,14 +28173,14 @@ else
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "enchant" 2>&1`
-+ ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "enchant-2" 2>&1`
- else
-- ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "enchant" 2>&1`
-+ ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "enchant-2" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$ENCHANT_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (enchant) were not met:
-+ as_fn_error $? "Package requirements (enchant-2) were not met:
-
- $ENCHANT_PKG_ERRORS
-
-diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
-index 6ce9d4b..1923726 100644
---- a/ext/enchant/enchant.c
-+++ b/ext/enchant/enchant.c
-@@ -738,7 +738,7 @@ PHP_FUNCTION(enchant_dict_quick_check)
- for (i = 0; i < n_sugg; i++) {
- add_next_index_string(sugg, suggs[i]);
- }
-- enchant_dict_free_suggestions(pdict->pdict, suggs);
-+ enchant_dict_free_string_list(pdict->pdict, suggs);
- }
-
-
-@@ -793,7 +793,7 @@ PHP_FUNCTION(enchant_dict_suggest)
- add_next_index_string(return_value, suggs[i]);
- }
-
-- enchant_dict_free_suggestions(pdict->pdict, suggs);
-+ enchant_dict_free_string_list(pdict->pdict, suggs);
- }
- }
- /* }}} */
-@@ -813,7 +813,7 @@ PHP_FUNCTION(enchant_dict_add_to_personal)
-
- PHP_ENCHANT_GET_DICT;
-
-- enchant_dict_add_to_personal(pdict->pdict, word, wordlen);
-+ enchant_dict_add(pdict->pdict, word, wordlen);
- }
- /* }}} */
-
-@@ -851,7 +851,7 @@ PHP_FUNCTION(enchant_dict_is_in_session)
-
- PHP_ENCHANT_GET_DICT;
-
-- RETURN_BOOL(enchant_dict_is_in_session(pdict->pdict, word, wordlen));
-+ RETURN_BOOL(enchant_dict_is_added(pdict->pdict, word, wordlen));
- }
- /* }}} */
-
diff --git a/srcpkgs/php/patches/php-fpm.patch b/srcpkgs/php/patches/php-fpm.patch
deleted file mode 100644
index 5e55e179f8a4..000000000000
--- a/srcpkgs/php/patches/php-fpm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/sapi/fpm/Makefile.frag 2017-04-15 23:58:56.965737425 +0200
-+++ b/sapi/fpm/Makefile.frag 2017-04-16 00:00:57.814831649 +0200
-@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH)
- else \
- echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \
- $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
-- $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
-- $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
-+ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
-+ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
- fi
-
- @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
diff --git a/srcpkgs/php/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php/patches/php-ltmain-sysroot-support.patch
deleted file mode 100644
index bbe0a514a9e8..000000000000
--- a/srcpkgs/php/patches/php-ltmain-sysroot-support.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/build/ltmain.sh 2021-09-09 15:19:14.822208365 +0200
-+++ b/build/ltmain.sh 2021-09-09 15:47:55.397011151 +0200
-@@ -2375,6 +2375,13 @@ EOF
- *) . ./$lib ;;
- esac
-
-+ newdependency_libs=
-+ for deplib in $dependency_libs; do
-+ deplib=$(echo "$deplib" | sed "s#^=\(.*\)#$(${CC} --print-sysroot)\1#")
-+ newdependency_libs="$newdependency_libs $deplib"
-+ done
-+ dependency_libs=${newdependency_libs}
-+
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan" ||
- { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -5750,6 +5757,13 @@ fi\
- case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
- esac
-+
-+ newdependency_libs=
-+ for deplib in $dependency_libs; do
-+ deplib=$(echo "$deplib" | sed "s#^$(${CC} --print-sysroot)#=#")
-+ newdependency_libs="$newdependency_libs $deplib"
-+ done
-+
- $echo > $output "\
- # $outputname - a libtool library file
- # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-@@ -5767,7 +5781,7 @@ library_names='$library_names'
- old_library='$old_library'
-
- # Libraries that this one depends upon.
--dependency_libs='$dependency_libs'
-+dependency_libs='$newdependency_libs'
-
- # Version information for $libname.
- current=$current
diff --git a/srcpkgs/php/patches/php-pear-cross.patch b/srcpkgs/php/patches/php-pear-cross.patch
deleted file mode 100644
index f9191a50a0b5..000000000000
--- a/srcpkgs/php/patches/php-pear-cross.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/pear/Makefile.frag 2020-03-17 11:40:21.000000000 +0100
-+++ b/pear/Makefile.frag 2020-04-12 22:29:31.846943414 +0200
-@@ -8,9 +8,10 @@ FETCH = `which fetch 2>/dev/null`
- PEAR_PREFIX = -dp a${program_prefix}
- PEAR_SUFFIX = -ds a$(program_suffix)
- PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
-+PEAR_PHP ?= $(top_builddir)/sapi/cli/php
-
- install-pear-installer: $(SAPI_CLI_PATH)
-- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
-+ @$(PEAR_PHP) $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
-
- install-pear:
- @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
-@@ -23,7 +24,7 @@ install-pear:
- elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
- "$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \
- else \
-- $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
-+ $(PEAR_PHP) -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
- fi \
- fi \
- fi
diff --git a/srcpkgs/php/patches/php-phar-cross.patch b/srcpkgs/php/patches/php-phar-cross.patch
deleted file mode 100644
index 1e4e627ec65b..000000000000
--- a/srcpkgs/php/patches/php-phar-cross.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/ext/phar/Makefile.frag 2020-04-13 12:18:23.998801926 +0200
-+++ b/ext/phar/Makefile.frag 2020-04-13 12:20:58.031795293 +0200
-@@ -8,12 +8,14 @@ $(srcdir)/phar_path_check.c: $(srcdir)/p
-
- pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
-
-+PHAR_PHP ?= $(top_builddir)/$(SAPI_CLI_PATH)
-+PHAR_PHP_MODULES ?= $(top_builddir)/modules
- PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
- PHP_PHARCMD_EXECUTABLE = ` \
-- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
-- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
-+ if test -x "$(PHAR_PHP)"; then \
-+ $(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP) -n"; \
- if test "x$(PHP_MODULES)" != "x"; then \
-- $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
-+ $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(PHAR_PHP_MODULES)"; \
- for i in bz2 zlib phar; do \
- if test -f "$(top_builddir)/modules/$$i.la"; then \
- . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
-@@ -21,7 +23,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
- done; \
- fi; \
- else \
-- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
-+ $(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP)"; \
- fi;`
- PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
-
diff --git a/srcpkgs/php/patches/php-phpize-sysroot-support.patch b/srcpkgs/php/patches/php-phpize-sysroot-support.patch
deleted file mode 100644
index 76cff3f81664..000000000000
--- a/srcpkgs/php/patches/php-phpize-sysroot-support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/scripts/phpize.m4 2020-03-17 11:40:21.000000000 +0100
-+++ b/scripts/phpize.m4 2020-04-15 12:27:36.400466387 +0200
-@@ -44,6 +44,12 @@ PHP_ARG_WITH([libdir],
- [lib],
- [no])
-
-+PHP_ARG_WITH([sysroot],,
-+ [AS_HELP_STRING([--with-sysroot=NAME],
-+ [System sysroot])],
-+ [no],
-+ [no])
-+
- PHP_RUNPATH_SWITCH
- PHP_SHLIB_SUFFIX_NAMES
-
-@@ -58,7 +64,11 @@ dnl For BC.
- PHP_CONFIG=$PHP_PHP_CONFIG
- prefix=`$PHP_CONFIG --prefix 2>/dev/null`
- phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
--INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
-+if test "x$PHP_SYSROOT" = xno; then :
-+ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
-+else
-+ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null | sed "s#-I#-I$PHP_SYSROOT#g"`
-+fi
- EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
- PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
-
diff --git a/srcpkgs/php/patches/php.ini.patch b/srcpkgs/php/patches/php.ini.patch
deleted file mode 100644
index 47197c778d34..000000000000
--- a/srcpkgs/php/patches/php.ini.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git php.ini-production php.ini-production
-index 794d3e8ddb..c7acf9c883 100644
---- a/php.ini-production
-+++ b/php.ini-production
-@@ -729,7 +729,7 @@ default_charset = "UTF-8"
- ;;;;;;;;;;;;;;;;;;;;;;;;;
-
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
-@@ -752,9 +752,7 @@ user_dir =
-
- ; Directory in which the loadable extensions (modules) reside.
- ; http://php.net/extension-dir
--;extension_dir = "./"
--; On windows:
--;extension_dir = "ext"
-+extension_dir = "/usr/lib/php/modules/"
-
- ; Directory where the temporary files should be placed.
- ; Defaults to the system default (see sys_get_temp_dir)
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3eb8e38cd928..a958bfc070ca 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,351 +1,105 @@
# Template file for 'php'
pkgname=php
-version=7.4.30
-revision=2
-hostmakedepends="bison pkg-config apache-devel"
-makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
- gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
- libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
- postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
- libffi-devel oniguruma-devel gd-devel"
-short_desc="HTML-embedded scripting language"
+version=8.1
+revision=1
+build_style=meta
+depends="php${version}"
+short_desc="PHP scripting language meta package"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="PHP-3.01"
homepage="https://www.php.net"
-changelog="https://www.php.net/ChangeLog-7.php"
-distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=ea72a34f32c67e79ac2da7dfe96177f3c451c3eefae5810ba13312ed398ba70d
-
-conf_files="/etc/php/php.ini"
-
-lib32disabled=yes
-replaces="php-mcrypt<7.2.0"
-
-if [ -n "$CROSS_BUILD" ]; then
- # php-pear needs php to build
- hostmakedepends+=" php"
- CFLAGS+=" -DHAVE_LIBDL
- -DHAVE_DLOPEN
- -DHAVE_DLSYM
- -DHAVE_SHM_IPC
- -DHAVE_SHM_MMAP_ANON
- -DHAVE_SHM_MMAP_ZERO
- -DHAVE_SHM_MMAP_POSIX
- -DHAVE_SHM_MMAP_FILE"
-fi
-
-do_build() {
- local _phpconfig="--srcdir=.. \
- --config-cache \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --sysconfdir=/etc/php \
- --localstatedir=/var \
- --with-layout=GNU \
- --with-config-file-path=/etc/php \
- --with-config-file-scan-dir=/etc/php/conf.d \
- --disable-rpath \
- --mandir=/usr/share/man \
- --with-pear=/usr/share/pear \
- "
-
- local _phpextensions="--enable-bcmath=shared \
- --enable-calendar=shared \
- --enable-exif=shared \
- --enable-ftp=shared \
- --enable-intl=shared \
- --enable-mbstring \
- --enable-opcache \
- --enable-pcntl \
- --enable-phar=shared \
- --enable-posix=shared \
- --enable-shmop=shared \
- --enable-soap=shared \
- --enable-sockets=shared \
- --enable-sysvmsg=shared \
- --enable-sysvsem=shared \
- --enable-sysvshm=shared \
- --enable-mysqlnd \
- --enable-gd=shared \
- --with-external-gd \
- --with-zip=shared \
- --with-ffi=shared \
- --with-bz2=shared,$XBPS_CROSS_BASE/usr/ \
- --with-curl=shared \
- --with-db4=$XBPS_CROSS_BASE/usr \
- --with-enchant=shared,$XBPS_CROSS_BASE/usr \
- --with-freetype-dir=$XBPS_CROSS_BASE/usr \
- --with-gdbm=$XBPS_CROSS_BASE/usr \
- --with-gettext=shared \
- --with-gmp=shared \
- --with-iconv=shared \
- --with-icu-dir=$XBPS_CROSS_BASE/usr \
- --with-jpeg-dir=$XBPS_CROSS_BASE/usr \
- --with-ldap=shared,$XBPS_CROSS_BASE/usr \
- --with-ldap-sasl \
- --with-libzip \
- --with-sodium=shared \
- --with-mhash \
- --with-mysql-sock=/run/mysqld/mysqld.sock \
- --with-mysqli=shared,mysqlnd \
- --with-openssl=shared \
- --with-pcre-regex=$XBPS_CROSS_BASE/usr \
- --with-pdo-mysql=shared,mysqlnd \
- --with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \
- --with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \
- --with-pdo-sqlite=shared,$XBPS_CROSS_BASE/usr \
- --with-pgsql=shared,$XBPS_CROSS_BASE/usr \
- --with-png-dir=$XBPS_CROSS_BASE/usr \
- --with-readline=$XBPS_CROSS_BASE/usr \
- --with-snmp=shared,$XBPS_CROSS_BASE/usr \
- --with-sqlite3=shared,$XBPS_CROSS_BASE/usr \
- --with-unixODBC=shared,$XBPS_CROSS_BASE/usr \
- --with-xsl=shared,$XBPS_CROSS_BASE/usr \
- --with-tidy=shared,$XBPS_CROSS_BASE/usr \
- --with-zlib \
- ${configure_args} \
- "
- if [ -n "$CROSS_BUILD" ]; then
- local _make_env="PHAR_PHP=/usr/bin/php PHAR_PHP_MODULES=/usr/lib/php/modules"
- fi
-
- EXTENSION_DIR=/usr/lib/php/modules
- export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
- export PEAR_INSTALLDIR
- EXTRA_LIBS="-ldl"
- export EXTRA_LIBS
-
- # cgi,cli,embed,fcgi,fpm
- mkdir -p build
- cd build
- ln -s ${wrksrc}/configure
- ./configure ${_phpconfig} \
- --host=${XBPS_CROSS_TRIPLET} \
- --enable-cgi \
- --enable-fpm \
- --with-fpm-user=http \
- --with-fpm-group=http \
- --enable-embed=shared \
- ${_phpextensions}
- make ${makejobs} ${_make_env}
-
- # apache
- # reuse the previous run; this will save us a lot of time
- cp -a ${wrksrc}/build ${wrksrc}/build-apache
- cd ${wrksrc}/build-apache
- ./configure ${_phpconfig} \
- --host=${XBPS_CROSS_TRIPLET} \
- --with-apxs2 \
- ${_phpextensions}
- make ${makejobs} ${_make_env}
-}
-
-do_install() {
- cd ${wrksrc}/build
- local _env="INSTALL_ROOT=${DESTDIR}"
- if [ -n "$CROSS_BUILD" ]; then
- _env+=" PHAR_PHP=/usr/bin/php"
- fi
- make ${_env} install-{modules,cli,build,headers,programs,pharcmd}
-
- # install php.ini
- vinstall ${wrksrc}/php.ini-production 644 etc/php php.ini
- # remove static modules
- rm -f ${DESTDIR}/usr/lib/php/modules/*.a
-}
php-devel_package() {
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/php/build
- vmove usr/bin/php-config
- vmove usr/bin/phpize
- vmove usr/share/man/man1/phpize.1
- vmove usr/share/man/man1/php-config.1
- }
+ depends="php${version}-devel"
+ short_desc="PHP development files meta package"
}
php-phpdbg_package() {
- short_desc+=" - interactive debugger"
- depends="php-${version}_${revision}"
- pkg_install() {
- cd ${wrksrc}/build
- make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg
- }
+ depends="php${version}-phpdbg"
+ short_desc="PHP interactive debugger meta package"
}
php-cgi_package() {
- short_desc+=' - CGI and FCGI SAPI'
- depends="php-${version}_${revision}"
- pkg_install() {
- cd ${wrksrc}/build
- make INSTALL_ROOT=${PKGDESTDIR} install-cgi
- }
+ depends="php${version}-cgi"
+ short_desc="PHP CGI and FCGI SAPI meta package"
}
php-apache_package() {
- short_desc+=' - Apache SAPI'
- depends="php-${version}_${revision}"
- conf_files="/etc/apache/extra/php7_module.conf"
- pkg_install() {
- vinstall ${wrksrc}/build-apache/libs/libphp7.so 755 usr/libexec/httpd/modules
- vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra php7_module.conf
- }
+ depends="php${version}-apache"
+ short_desc="PHP Apache SAPI meta package"
}
php-fpm_package() {
- short_desc+=' - FastCGI Process Manager'
- depends="php-${version}_${revision}"
- conf_files="/etc/php/php-fpm.conf /etc/php/php-fpm.d/*"
- pkg_install() {
- cd ${wrksrc}/build
- make INSTALL_ROOT=${PKGDESTDIR} install-fpm
- vsv php-fpm
- }
+ depends="php${version}-fpm"
+ short_desc="PHP FastCGI Process Manager meta package"
}
php-embed_package() {
- lib32disabled=yes
- depends="php-${version}_${revision}"
- short_desc+=' - Embed SAPI'
- pkg_install() {
- cd ${wrksrc}/build
- make INSTALL_ROOT=${PKGDESTDIR} PHP_SAPI=embed install-sapi
- }
-}
-
-php-pear_package() {
- lib32disabled=yes
- depends="php-${version}_${revision}"
- short_desc+=' - PHP Extension and Application Repository'
- conf_files="/etc/php/pear.conf"
- pkg_install() {
- cd ${wrksrc}/build
- local _env="INSTALL_ROOT=${PKGDESTDIR}"
- if [ -n "$CROSS_BUILD" ]; then
- _env+=" PEAR_PHP=/usr/bin/php"
- fi
- make install-pear ${_env}
- rm -rf ${PKGDESTDIR}/.{channels,depdb,depdblock,filemap,lock,registry}
- rm -rf ${PKGDESTDIR}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
- }
+ depends="php${version}-embed"
+ short_desc="PHP Embed SAPI meta package"
}
php-enchant_package() {
- lib32disabled=yes
- depends="php-${version}_${revision}"
- short_desc+=' - enchant module'
- pkg_install() {
- vmove usr/lib/php/modules/enchant.so
- }
+ depends="php${version}-enchant"
+ short_desc="PHP enchant module meta package"
}
php-gd_package() {
- lib32disabled=yes
- depends="php-${version}_${revision}"
- short_desc+=' - gd module'
- pkg_install() {
- vmove usr/lib/php/modules/gd.so
- }
+ depends="php${version}-gd"
+ short_desc="PHP gd module meta package"
}
php-intl_package() {
- lib32disabled=yes
- depends="php-${version}_${revision}"
- short_desc+=' - Internationalization module'
- pkg_install() {
- vmove usr/lib/php/modules/intl.so
- }
+ depends="php${version}-intl"
+ short_desc="PHP Internationalization module meta package"
}
php-ldap_package() {
- lib32disabled=yes
- depends="php-${version}_${revision}"
- short_desc+=' - LDAP module'
- pkg_install() {
- vmove usr/lib/php/modules/ldap.so
- }
+ depends="php${version}-ldap"
+ short_desc="PHP LDAP module meta package"
}
php-mysql_package() {
- lib32disabled=yes
- depends="php-${version}_${revision}"
- short_desc+=' - MySQL modules'
- pkg_install() {
- vmove "usr/lib/php/modules/*mysql*.so"
- }
+ depends="php${version}-mysql"
+ short_desc="PHP MySQL modules meta package"
}
php-odbc_package() {
- lib32disabled=yes
- depends="php-${version}_${revision}"
- short_desc+=' - ODBC modules'
- pkg_install() {
- vmove "usr/lib/php/modules/*odbc.so"
- }
+ depends="php${version}-odbc"
+ short_desc="PHP ODBC modules meta package"
}
php-pgsql_package() {
- lib32disabled=yes
- depends="php-${version}_${revision}"
- short_desc+=' - PostgreSQL modules'
- pkg_install() {
- vmove "usr/lib/php/modules/*pgsql.so"
- }
+ depends="php${version}-pgsql"
+ short_desc="PHP PostgreSQL modules meta package"
}
php-snmp_package() {
- lib32disabled=yes
- depends="php-${version}_${revision}"
- short_desc+=' - snmp module'
- pkg_install() {
- vmove usr/lib/php/modules/snmp.so
- }
+ depends="php${version}-snmp"
+ short_desc="PHP snmp module meta package"
}
php-sqlite_package() {
- lib32disabled=yes
- depends="php-${version}_${revision}"
- short_desc+=' - sqlite module'
- pkg_install() {
- vmove "usr/lib/php/modules/*sqlite*.so"
- }
+ depends="php${version}-sqlite"
+ short_desc="PHP sqlite module meta package"
}
php-tidy_package() {
- lib32disabled=yes
- depends="php-${version}_${revision}"
- short_desc+=' - tidy HTML module'
- pkg_install() {
- vmove "usr/lib/php/modules/*tidy*.so"
- }
+ depends="php${version}-tidy"
+ short_desc="PHP tidy HTML module meta package"
}
php-xsl_package() {
- lib32disabled=yes
- depends="php-${version}_${revision}"
- short_desc+=' - XSL module'
- pkg_install() {
- vmove usr/lib/php/modules/xsl.so
- }
+ depends="php${version}-xsl"
+ short_desc="PHP XSL module meta package"
}
php-sodium_package() {
- lib32disabled=yes
- depends="php-${version}_${revision}"
- short_desc+=' - sodium module'
- pkg_install() {
- vmove usr/lib/php/modules/sodium.so
- }
+ depends="php${version}-sodium"
+ short_desc="PHP sodium module meta package"
}
php-ffi_package() {
- lib32disabled=yes
- depends="php-${version}_${revision}"
- short_desc+=' - FFI module'
- pkg_install() {
- vmove usr/lib/php/modules/ffi.so
- }
+ depends="php${version}-ffi"
+ short_desc="PHP FFI module meta package"
}
diff --git a/srcpkgs/php/update b/srcpkgs/php/update
deleted file mode 100644
index ac2289b24b76..000000000000
--- a/srcpkgs/php/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="8.*"
From c4cebf1f56c87cadc514b153c5b43ff356926a55 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 8 Aug 2022 11:58:52 -0400
Subject: [PATCH 2/6] composer: turn into meta package
7.4 is EOL
---
srcpkgs/composer/template | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/composer/template b/srcpkgs/composer/template
index 81da2bf03aa2..2c1105f956e9 100644
--- a/srcpkgs/composer/template
+++ b/srcpkgs/composer/template
@@ -1,24 +1,15 @@
# Template file for 'composer'
pkgname=composer
-version=2.2.4
+version=8.1
revision=1
-build_style=fetch
-depends="php"
-short_desc="Dependency manager for PHP"
+build_style=meta
+depends="composer${version}"
+short_desc="Composer Dependency manager for PHP meta package"
maintainer="Felipe Nogueira <contato.fnog@gmail.com>"
license="MIT"
homepage="https://getcomposer.org/"
changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
-distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
- https://raw.githubusercontent.com/composer/composer/main/LICENSE"
-checksum="ba04e246960d193237d5ed6542bd78456898e7787fafb586f500c6807af7458d
- 7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
do_install() {
- vbin composer.phar composer
vlicense LICENSE
-
- vmkdir /etc/php/conf.d
- printf 'extension=%s\n' phar iconv openssl zip \
- >${DESTDIR}/etc/php/conf.d/composer.ini
}
From 4e46df0161f67ac5bd19ba99a88ffbc0fddf162c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 8 Aug 2022 11:36:52 -0400
Subject: [PATCH 3/6] php8.0: add php alternatives group.
---
srcpkgs/php8.0/template | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 9aa552c38e3a..e13e69dcffa5 100644
--- a/srcpkgs/php8.0/template
+++ b/srcpkgs/php8.0/template
@@ -1,7 +1,7 @@
# Template file for 'php8.0'
pkgname=php8.0
version=8.0.22
-revision=1
+revision=2
_php_version=8.0
wrksrc="php-${version}"
hostmakedepends="bison pkg-config apache-devel"
@@ -35,6 +35,14 @@ if [ -n "$CROSS_BUILD" ]; then
-DHAVE_SHM_MMAP_FILE"
fi
+alternatives="
+ php:phar.phar:/usr/bin/phar${_php_version}.phar
+ php:php:/usr/bin/php${_php_version}
+ php:phar:/usr/bin/phar${_php_version}
+ php:phar.1:/usr/share/man/man1/phar${_php_version}.1
+ php:phar.phar.1:/usr/share/man/man1/phar${_php_version}.phar.1
+ php:php.1:/usr/share/man/man1/php${_php_version}.1"
+
do_build() {
local _phpconfig="--srcdir=.. \
--config-cache \
@@ -158,6 +166,11 @@ do_install() {
php8.0-devel_package() {
short_desc+=" - development files"
+ alternatives="
+ php-devel:php-config:/usr/bin/php-config${_php_version}
+ php-devel:phpize:/usr/bin/phpize${_php_version}
+ php-devel:phpize.1:/usr/share/man/man1/phpize${_php_version}.1
+ php-devel:php-config.1:/usr/share/man/man1/php-config${_php_version}.1"
pkg_install() {
vmove usr/include
vmove "usr/lib/php${_php_version}/build"
@@ -171,6 +184,9 @@ php8.0-devel_package() {
php8.0-phpdbg_package() {
short_desc+=" - interactive debugger"
depends="php${_php_version}-${version}_${revision}"
+ alternatives="
+ phpdbg:phpdbg:/usr/bin/phpdbg${_php_version}
+ phpdbg:phpdbg.1:/usr/share/man/man1/phpdbg{_php_version}.1"
pkg_install() {
cd ${wrksrc}/build
make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg
@@ -180,6 +196,9 @@ php8.0-phpdbg_package() {
php8.0-cgi_package() {
short_desc+=' - CGI and FCGI SAPI'
depends="php${_php_version}-${version}_${revision}"
+ alternatives="
+ php-cgi:php-cgi:/usr/bin/php-cgi${_php_version}
+ php-cgi:php-cgi.1:/usr/share/man/man1/php-cgi${_php_version}.1"
pkg_install() {
cd ${wrksrc}/build
make INSTALL_ROOT=${PKGDESTDIR} install-cgi
@@ -200,6 +219,9 @@ php8.0-fpm_package() {
short_desc+=' - FastCGI Process Manager'
depends="php${_php_version}-${version}_${revision}"
conf_files="/etc/php${_php_version}/php-fpm.conf /etc/php${_php_version}/php-fpm.d/*"
+ alternatives="
+ php-fpm:php-fpm:/usr/bin/php-fpm${_php_version}
+ php-fpm:php-fpm.8:/usr/share/man/man8/php-fpm${_php_version}.8"
pkg_install() {
cd ${wrksrc}/build
make INSTALL_ROOT=${PKGDESTDIR} install-fpm
From b0900d5bd950e2fca7a21a7fa657530a7416ad94 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 8 Aug 2022 11:37:33 -0400
Subject: [PATCH 4/6] php8.1: add php alternatives group.
---
srcpkgs/php8.1/template | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index ae058f5fefdb..9132bfa16b1b 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
version=8.1.9
-revision=1
+revision=2
_php_version=8.1
wrksrc="php-${version}"
hostmakedepends="bison pkg-config apache-devel"
@@ -35,6 +35,14 @@ if [ -n "$CROSS_BUILD" ]; then
-DHAVE_SHM_MMAP_FILE"
fi
+alternatives="
+ php:phar.phar:/usr/bin/phar${_php_version}.phar
+ php:php:/usr/bin/php${_php_version}
+ php:phar:/usr/bin/phar${_php_version}
+ php:phar.1:/usr/share/man/man1/phar${_php_version}.1
+ php:phar.phar.1:/usr/share/man/man1/phar${_php_version}.phar.1
+ php:php.1:/usr/share/man/man1/php${_php_version}.1"
+
do_build() {
local _phpconfig="--srcdir=.. \
--config-cache \
@@ -158,6 +166,11 @@ do_install() {
php8.1-devel_package() {
short_desc+=" - development files"
+ alternatives="
+ php-devel:php-config:/usr/bin/php-config${_php_version}
+ php-devel:phpize:/usr/bin/phpize${_php_version}
+ php-devel:phpize.1:/usr/share/man/man1/phpize${_php_version}.1
+ php-devel:php-config.1:/usr/share/man/man1/php-config${_php_version}.1"
pkg_install() {
vmove usr/include
vmove "usr/lib/php${_php_version}/build"
@@ -171,6 +184,9 @@ php8.1-devel_package() {
php8.1-phpdbg_package() {
short_desc+=" - interactive debugger"
depends="php${_php_version}-${version}_${revision}"
+ alternatives="
+ phpdbg:phpdbg:/usr/bin/phpdbg${_php_version}
+ phpdbg:phpdbg.1:/usr/share/man/man1/phpdbg{_php_version}.1"
pkg_install() {
cd ${wrksrc}/build
make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg
@@ -180,6 +196,9 @@ php8.1-phpdbg_package() {
php8.1-cgi_package() {
short_desc+=' - CGI and FCGI SAPI'
depends="php${_php_version}-${version}_${revision}"
+ alternatives="
+ php-cgi:php-cgi:/usr/bin/php-cgi${_php_version}
+ php-cgi:php-cgi.1:/usr/share/man/man1/php-cgi${_php_version}.1"
pkg_install() {
cd ${wrksrc}/build
make INSTALL_ROOT=${PKGDESTDIR} install-cgi
@@ -200,6 +219,9 @@ php8.1-fpm_package() {
short_desc+=' - FastCGI Process Manager'
depends="php${_php_version}-${version}_${revision}"
conf_files="/etc/php${_php_version}/php-fpm.conf /etc/php${_php_version}/php-fpm.d/*"
+ alternatives="
+ php-fpm:php-fpm:/usr/bin/php-fpm${_php_version}
+ php-fpm:php-fpm.8:/usr/share/man/man8/php-fpm${_php_version}.8"
pkg_install() {
cd ${wrksrc}/build
make INSTALL_ROOT=${PKGDESTDIR} install-fpm
From d8544089ca9d9470dd0083c85e71271516e39bfa Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 8 Aug 2022 12:00:05 -0400
Subject: [PATCH 5/6] composer8.0: add composer alternatives group.
---
srcpkgs/composer8.0/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/composer8.0/template b/srcpkgs/composer8.0/template
index 4425abb2d320..de3c0f924142 100644
--- a/srcpkgs/composer8.0/template
+++ b/srcpkgs/composer8.0/template
@@ -1,7 +1,7 @@
# Template file for 'composer8.0'
pkgname=composer8.0
version=2.4.1
-revision=1
+revision=2
build_style=fetch
depends="php8.0"
short_desc="Dependency manager for PHP"
@@ -13,6 +13,7 @@ distfiles="https://github.com/composer/composer/releases/download/${version}/com
https://raw.githubusercontent.com/composer/composer/main/LICENSE"
checksum="ea8cf6308ec76ff9645c3818841a7588096b9dc2767345fbd4bd492dd8a6dca6
7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
+alternatives="composer:composer:/usr/bin/composer8.0"
do_install() {
vbin ${FILESDIR}/composer8.0
From 230f30f2401a7721025c0a95457567ba1f7849b4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 8 Aug 2022 12:00:48 -0400
Subject: [PATCH 6/6] composer8.1: add composer alternatives group.
---
srcpkgs/composer8.1/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/composer8.1/template b/srcpkgs/composer8.1/template
index a8068ac00d06..476abf9b9b56 100644
--- a/srcpkgs/composer8.1/template
+++ b/srcpkgs/composer8.1/template
@@ -1,7 +1,7 @@
# Template file for 'composer8.1'
pkgname=composer8.1
version=2.4.1
-revision=1
+revision=2
build_style=fetch
depends="php8.1"
short_desc="Dependency manager for PHP"
@@ -13,6 +13,7 @@ distfiles="https://github.com/composer/composer/releases/download/${version}/com
https://raw.githubusercontent.com/composer/composer/main/LICENSE"
checksum="ea8cf6308ec76ff9645c3818841a7588096b9dc2767345fbd4bd492dd8a6dca6
7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
+alternatives="composer:composer:/usr/bin/composer8.1"
do_install() {
vbin ${FILESDIR}/composer8.1
next prev parent reply other threads:[~2022-08-29 12:58 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-08 16:45 [PR PATCH] php/php8.0/php8.1 and composer/composer8.0/composer8.1: " TinfoilSubmarine
2022-08-08 23:37 ` paper42
2022-08-09 18:08 ` Chocimier
2022-08-09 18:43 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-08-09 18:45 ` TinfoilSubmarine
2022-08-29 12:37 ` [PR PATCH] [Updated] [NOMERGE] php/composer: turn into meta package as 7.4 is EOL; php8.[01] and composer8.[01]: " TinfoilSubmarine
2022-08-29 12:49 ` TinfoilSubmarine
2022-08-29 12:58 ` TinfoilSubmarine [this message]
2022-08-29 13:10 ` [PR PATCH] [Updated] [WIP] " TinfoilSubmarine
2022-08-29 13:18 ` TinfoilSubmarine
2022-08-29 13:47 ` TinfoilSubmarine
2022-08-29 14:57 ` TinfoilSubmarine
2022-08-30 18:42 ` TinfoilSubmarine
2022-08-30 21:19 ` [PR REVIEW] " paper42
2022-08-31 12:41 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-08-31 12:44 ` [PR REVIEW] " TinfoilSubmarine
2022-11-17 14:33 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-11-27 10:33 ` paper42
2022-11-28 20:01 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-12-01 13:15 ` TinfoilSubmarine
2022-12-04 13:52 ` [PR REVIEW] " paper42
2022-12-04 13:52 ` paper42
2022-12-04 13:52 ` paper42
2022-12-04 13:52 ` paper42
2022-12-04 13:52 ` paper42
2022-12-06 15:45 ` TinfoilSubmarine
2022-12-06 17:34 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-12-06 17:35 ` [PR REVIEW] " TinfoilSubmarine
2022-12-06 19:14 ` paper42
2022-12-06 19:14 ` paper42
2022-12-07 14:25 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-12-08 18:42 ` [PR REVIEW] " TinfoilSubmarine
2022-12-15 17:10 ` paper42
2022-12-15 17:47 ` TinfoilSubmarine
2022-12-25 0:00 ` paper42
2022-12-25 0:03 ` paper42
2023-01-04 20:41 ` TinfoilSubmarine
2023-01-20 15:38 ` [PR PATCH] [Updated] " TinfoilSubmarine
2023-01-20 15:43 ` [PR REVIEW] " TinfoilSubmarine
2023-02-15 19:29 ` [PR PATCH] [Updated] " TinfoilSubmarine
2023-02-21 18:34 ` [PR REVIEW] " TinfoilSubmarine
2023-02-21 23:50 ` paper42
2023-02-28 22:36 ` paper42
2023-03-01 13:23 ` [PR PATCH] [Updated] " TinfoilSubmarine
2023-03-01 13:26 ` [PR REVIEW] " TinfoilSubmarine
2023-03-02 21:25 ` paper42
2023-03-02 21:58 ` [PR PATCH] [Updated] " TinfoilSubmarine
2023-03-02 21:59 ` [PR REVIEW] " TinfoilSubmarine
2023-03-04 22:05 ` [PR PATCH] [Merged]: " paper42
2023-04-08 3:34 ` jchook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220829125801.8-tyM3uQNRkH8J1YGH_2VTelhvfvFsKtTeX4YzGLDS0@z \
--to=tinfoilsubmarine@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).