pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www
Module Name: pkgsrc
Committed By: taca
Date: Sat Feb 8 03:22:19 UTC 2025
Modified Files:
pkgsrc/www/ap-php: Makefile PLIST
pkgsrc/www/php-curl: Makefile
pkgsrc/www/php-fpm: Makefile PLIST
pkgsrc/www/php-fpm/files: php_fpm.sh
pkgsrc/www/php-fpm/files/smf: manifest.xml
pkgsrc/www/php-tidy: Makefile
Added Files:
pkgsrc/www/php-fpm: ALTERNATIVES
Log Message:
multiple PHP support
Also bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/www/ap-php/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/ap-php/PLIST
cvs rdiff -u -r1.62 -r1.63 pkgsrc/www/php-curl/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/php-fpm/ALTERNATIVES
cvs rdiff -u -r1.43 -r1.44 pkgsrc/www/php-fpm/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/php-fpm/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/php-fpm/files/php_fpm.sh
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/php-fpm/files/smf/manifest.xml
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/php-tidy/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/ap-php/Makefile
diff -u pkgsrc/www/ap-php/Makefile:1.60 pkgsrc/www/ap-php/Makefile:1.61
--- pkgsrc/www/ap-php/Makefile:1.60 Sun Dec 1 16:17:18 2024
+++ pkgsrc/www/ap-php/Makefile Sat Feb 8 03:22:18 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2024/12/01 16:17:18 taca Exp $
+# $NetBSD: Makefile,v 1.61 2025/02/08 03:22:18 taca Exp $
PKGNAME= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION= 11
-COMMENT= Apache (${PKG_APACHE}) module for ${PKG_PHP}
+PKGREVISION= 12
+COMMENT= Apache (${PKG_APACHE}) module for ${PHP_PKG_PREFIX}
CONFLICTS= ap-php-[0-9]*
@@ -17,7 +17,7 @@ SSP_SUPPORTED= no
.include "../../lang/php/phpversion.mk"
-.if ${PKG_PHP_MAJOR_VERS} < 7
+.if ${PHP_VER} == 56
USE_TOOLS+= autoconf269
.else
USE_TOOLS+= autoconf
@@ -34,15 +34,15 @@ pre-configure:
cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
do-install:
- if [ -f ${WRKSRC}/.libs/libphp${PKG_PHP_MAJOR_VERS}.so ]; then \
- ${INSTALL_DATA} ${WRKSRC}/.libs/libphp${PKG_PHP_MAJOR_VERS}.so \
- ${DESTDIR}${PREFIX}/lib/httpd/mod_php${PKG_PHP_MAJOR_VERS}.so; \
- elif [ -f ${WRKSRC}/libs/libphp${PKG_PHP_MAJOR_VERS}.so ]; then \
- ${INSTALL_DATA} ${WRKSRC}/libs/libphp${PKG_PHP_MAJOR_VERS}.so \
- ${DESTDIR}${PREFIX}/lib/httpd/mod_php${PKG_PHP_MAJOR_VERS}.so; \
+ if [ -f ${WRKSRC}/.libs/libphp${PHP_VER}.so ]; then \
+ ${INSTALL_DATA} ${WRKSRC}/.libs/libphp${PHP_VER}.so \
+ ${DESTDIR}${PREFIX}/lib/httpd/mod_php${PHP_VER}.so; \
+ elif [ -f ${WRKSRC}/libs/libphp${PHP_VER}.so ]; then \
+ ${INSTALL_DATA} ${WRKSRC}/libs/libphp${PHP_VER}.so \
+ ${DESTDIR}${PREFIX}/lib/httpd/mod_php${PHP_VER}.so; \
elif [ -f ${WRKSRC}/.libs/libphp.so ]; then \
${INSTALL_DATA} ${WRKSRC}/.libs/libphp.so \
- ${DESTDIR}${PREFIX}/lib/httpd/mod_php${PKG_PHP_MAJOR_VERS}.so; \
+ ${DESTDIR}${PREFIX}/lib/httpd/mod_php${PHP_VER}.so; \
fi
.include "${PHPPKGSRCDIR}/buildlink3.mk"
Index: pkgsrc/www/ap-php/PLIST
diff -u pkgsrc/www/ap-php/PLIST:1.2 pkgsrc/www/ap-php/PLIST:1.3
--- pkgsrc/www/ap-php/PLIST:1.2 Sat Mar 27 18:20:10 2010
+++ pkgsrc/www/ap-php/PLIST Sat Feb 8 03:22:18 2025
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2010/03/27 18:20:10 tron Exp $
-lib/httpd/mod_php${PKG_PHP_MAJOR_VERS}.so
+@comment $NetBSD: PLIST,v 1.3 2025/02/08 03:22:18 taca Exp $
+lib/httpd/mod_php${PHP_VER}.so
Index: pkgsrc/www/php-curl/Makefile
diff -u pkgsrc/www/php-curl/Makefile:1.62 pkgsrc/www/php-curl/Makefile:1.63
--- pkgsrc/www/php-curl/Makefile:1.62 Thu Nov 14 22:22:09 2024
+++ pkgsrc/www/php-curl/Makefile Sat Feb 8 03:22:18 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.62 2024/11/14 22:22:09 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2025/02/08 03:22:18 taca Exp $
MODNAME= curl
+PKGREVISION= 22
CATEGORIES+= www
COMMENT= PHP extension for curl functions
-PKGREVISION= 21
CONFLICTS= php-curl-[0-9]*
Index: pkgsrc/www/php-fpm/Makefile
diff -u pkgsrc/www/php-fpm/Makefile:1.43 pkgsrc/www/php-fpm/Makefile:1.44
--- pkgsrc/www/php-fpm/Makefile:1.43 Sun Dec 1 16:17:37 2024
+++ pkgsrc/www/php-fpm/Makefile Sat Feb 8 03:22:18 2025
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.43 2024/12/01 16:17:37 taca Exp $
+# $NetBSD: Makefile,v 1.44 2025/02/08 03:22:18 taca Exp $
PKGNAME= ${PHP_PKG_PREFIX}-fpm-${PHP_VERSION}
-PKGREVISION= 11
+PKGREVISION= 12
HOMEPAGE= https://php-fpm.org/
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-COMMENT= FPM interface for ${PKG_PHP}
+COMMENT= FPM interface for ${PHP_PKG_PREFIX}
LICENSE= 2-clause-bsd
USE_TOOLS+= pkg-config
@@ -27,13 +26,11 @@ PKG_USERS= ${FPM_USER}:${FPM_GROUP}
PKG_GECOS.${FPM_USER}= PHP FPM daemon user
PKG_SHELL.${FPM_USER}= ${NOLOGIN}
-EGDIR= ${PREFIX}/share/examples/php
-CONF_FILES= ${EGDIR}/php-fpm.conf ${PKG_SYSCONFDIR}/php-fpm.conf
-AUTO_MKDIRS= yes
+CONF_FILES= ${PREFIX}/${PHP_EGDIR}/php-fpm.conf ${PKG_SYSCONFDIR}/php-fpm.conf
.include "../../lang/php/phpversion.mk"
-.if ${PKG_PHP_MAJOR_VERS} < 7
+.if ${PHP_VER} == 56
USE_TOOLS+= autoconf269
.else
USE_TOOLS+= autoconf
@@ -41,31 +38,34 @@ USE_TOOLS+= autoconf
PLIST_VARS+= fpmdotd
-.if ${PKG_PHP_VERSION} >= 70
-CONF_FILES+= ${EGDIR}/php-fpm.d/www.conf ${PKG_SYSCONFDIR}/php-fpm.d/www.conf
+.if ${PHP_VER} >= 70
+CONF_FILES+= ${PREFIX}/${PHP_EGDIR}/php-fpm.d/www.conf ${PKG_SYSCONFDIR}/php-fpm.d/www.conf
OWN_DIRS+= ${PKG_SYSCONFDIR}/php-fpm.d
-INSTALLATION_DIRS+= ${EGDIR}/php-fpm.d
+INSTALLATION_DIRS+= ${PREFIX}/${PHP_EGDIR}/php-fpm.d
PLIST.fpmdotd= yes
.endif
CONFIGURE_ARGS+= --enable-fpm
CONFIGURE_ARGS+= --with-fpm-user=${FPM_USER}
CONFIGURE_ARGS+= --with-fpm-group=${FPM_GROUP}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-SMF_NAME= php-fpm
-RCD_SCRIPTS= php_fpm
-MESSAGE_SUBST+= CGIDIR=${CGIDIR}
-MESSAGE_SUBST+= VARBASE=${VARBASE}
+SMF_NAME= php-fpm${PHP_VER}
+RCD_SCRIPTS= php_fpm${PHP_VER}
+RCD_SCRIPT_SRC.php_fpm${PHP_VER}= ${FILESDIR}/php_fpm.sh
+
+MESSAGE_SUBST+= CGIDIR=${CGIDIR} VARBASE=${VARBASE}
+INSTALLATION_DIRS+= ${PREFIX}/${PHP_EGDIR} ${PKGMANDIR}/man8 sbin
pre-configure:
cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/sapi/fpm/php-fpm ${DESTDIR}${PREFIX}/sbin/php-fpm
- ${INSTALL_MAN} ${WRKSRC}/sapi/fpm/php-fpm.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
- ${INSTALL_DATA} ${WRKSRC}/sapi/fpm/php-fpm.conf ${DESTDIR}${EGDIR}
-.if ${PKG_PHP_VERSION} >= 70
- ${INSTALL_DATA} ${WRKSRC}/sapi/fpm/www.conf ${DESTDIR}${EGDIR}/php-fpm.d
+ ${INSTALL_PROGRAM} ${WRKSRC}/sapi/fpm/php-fpm ${DESTDIR}${PREFIX}/sbin/php-fpm${PHP_VER}
+ ${INSTALL_MAN} ${WRKSRC}/sapi/fpm/php-fpm.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/php-fpm${PHP_VER}.8
+ ${INSTALL_DATA} ${WRKSRC}/sapi/fpm/php-fpm.conf ${DESTDIR}${PREFIX}/${PHP_EGDIR}
+.if ${PHP_VER} >= 70
+ ${INSTALL_DATA} ${WRKSRC}/sapi/fpm/www.conf ${DESTDIR}${PREFIX}/${PHP_EGDIR}/php-fpm.d
.endif
.include "${PHPPKGSRCDIR}/Makefile.php"
Index: pkgsrc/www/php-fpm/PLIST
diff -u pkgsrc/www/php-fpm/PLIST:1.3 pkgsrc/www/php-fpm/PLIST:1.4
--- pkgsrc/www/php-fpm/PLIST:1.3 Tue Feb 16 15:10:48 2016
+++ pkgsrc/www/php-fpm/PLIST Sat Feb 8 03:22:18 2025
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2016/02/16 15:10:48 jperkin Exp $
-man/man8/php-fpm.8
-sbin/php-fpm
-share/examples/php/php-fpm.conf
-${PLIST.fpmdotd}share/examples/php/php-fpm.d/www.conf
+@comment $NetBSD: PLIST,v 1.4 2025/02/08 03:22:18 taca Exp $
+man/man8/php-fpm${PHP_VER}.8
+sbin/php-fpm${PHP_VER}
+${PHP_EGDIR}/php-fpm.conf
+${PLIST.fpmdotd}${PHP_EGDIR}/php-fpm.d/www.conf
Index: pkgsrc/www/php-fpm/files/php_fpm.sh
diff -u pkgsrc/www/php-fpm/files/php_fpm.sh:1.3 pkgsrc/www/php-fpm/files/php_fpm.sh:1.4
--- pkgsrc/www/php-fpm/files/php_fpm.sh:1.3 Wed May 18 20:40:32 2022
+++ pkgsrc/www/php-fpm/files/php_fpm.sh Sat Feb 8 03:22:19 2025
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: php_fpm.sh,v 1.3 2022/05/18 20:40:32 triaxx Exp $
+# $NetBSD: php_fpm.sh,v 1.4 2025/02/08 03:22:19 taca Exp $
#
# PROVIDE: php_fpm
# REQUIRE: DAEMON
@@ -13,11 +13,11 @@
$_rc_subr_loaded . @SYSCONFBASE@/rc.subr
-name="php_fpm"
+name="php_fpm@PHP_VER@"
rcvar=${name}
-command="@PREFIX@/sbin/php-fpm"
+command="@PREFIX@/sbin/php-fpm@PHP_VER@"
required_files="@PKG_SYSCONFDIR@/php-fpm.conf"
-pidfile="@VARBASE@/run/php-fpm.pid"
+pidfile="@VARBASE@/run/php-fpm@PHP_VER@.pid"
sig_reload="USR2"
extra_commands="reload"
Index: pkgsrc/www/php-fpm/files/smf/manifest.xml
diff -u pkgsrc/www/php-fpm/files/smf/manifest.xml:1.4 pkgsrc/www/php-fpm/files/smf/manifest.xml:1.5
--- pkgsrc/www/php-fpm/files/smf/manifest.xml:1.4 Wed Jun 8 10:16:57 2016
+++ pkgsrc/www/php-fpm/files/smf/manifest.xml Sat Feb 8 03:22:19 2025
@@ -11,7 +11,7 @@
<service_fmri value="svc:/system/filesystem/local" />
</dependency>
<method_context></method_context>
- <exec_method type="method" name="start" exec="@PREFIX@/sbin/php-fpm -y %{config_file}" timeout_seconds="60" />
+ <exec_method type="method" name="start" exec="@PREFIX@/sbin/php-fpm@PHP_VER@ -y %{config_file}" timeout_seconds="60" />
<exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
<property_group name="startd" type="framework">
<propval name="duration" type="astring" value="contract" />
Index: pkgsrc/www/php-tidy/Makefile
diff -u pkgsrc/www/php-tidy/Makefile:1.4 pkgsrc/www/php-tidy/Makefile:1.5
--- pkgsrc/www/php-tidy/Makefile:1.4 Fri Oct 27 08:49:01 2017
+++ pkgsrc/www/php-tidy/Makefile Sat Feb 8 03:22:19 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/10/27 08:49:01 taca Exp $
+# $NetBSD: Makefile,v 1.5 2025/02/08 03:22:19 taca Exp $
MODNAME= tidy
+PKGREVISION= 1
CATEGORIES+= www
COMMENT= PHP extension for tidy functions
LICENSE= php
Added files:
Index: pkgsrc/www/php-fpm/ALTERNATIVES
diff -u /dev/null pkgsrc/www/php-fpm/ALTERNATIVES:1.1
--- /dev/null Sat Feb 8 03:22:19 2025
+++ pkgsrc/www/php-fpm/ALTERNATIVES Sat Feb 8 03:22:18 2025
@@ -0,0 +1 @@
+sbin/php-fpm @PREFIX@/sbin/php-fpm@PHP_VER@
Home |
Main Index |
Thread Index |
Old Index