CVS commit: pkgsrc/www

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www
From: "Takahiro Kambe" <taca%netbsd.org@localhost>
Date: Sat, 8 Feb 2025 04:08:59 +0000

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Feb  8 04:08:59 UTC 2025

Modified Files:
        pkgsrc/www/phraseanet: Makefile
        pkgsrc/www/unit: Makefile.common distinfo
Added Files:
        pkgsrc/www/unit/patches: patch-auto_modules_php

Log Message:
multiple PHP support

* Use PHP_BASE_VERS in DEPENDS if required.
* Use REPLACE_PHP.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/phraseanet/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/unit/Makefile.common
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/unit/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/unit/patches/patch-auto_modules_php

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

Modified files:

Index: pkgsrc/www/phraseanet/Makefile
diff -u pkgsrc/www/phraseanet/Makefile:1.24 pkgsrc/www/phraseanet/Makefile:1.25
--- pkgsrc/www/phraseanet/Makefile:1.24 Mon Jan 20 16:06:14 2025
+++ pkgsrc/www/phraseanet/Makefile      Sat Feb  8 04:08:58 2025
@@ -1,30 +1,28 @@
-# $NetBSD: Makefile,v 1.24 2025/01/20 16:06:14 taca Exp $
+# $NetBSD: Makefile,v 1.25 2025/02/08 04:08:58 taca Exp $
 
 .include "../../www/phraseanet/Makefile.common"
 PKGNAME=       phraseanet-${VERS}
-PKGREVISION=   7
+PKGREVISION=   8
 
 USE_TOOLS+=    pax
 
 PHP_VERSIONS_ACCEPTED= 56
 
-.include "../../lang/php/phpversion.mk"
-
 DEPENDS+=      ${PHP_PKG_PREFIX}-phrasea2-[0-9]*:../../www/php-phrasea2
-DEPENDS+=      ${PHP_PKG_PREFIX}-opcache-[0-9]*:../../devel/php-opcache
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-gettext-[0-9]*:../../devel/php-gettext
-DEPENDS+=      ${PHP_PKG_PREFIX}-exif-[0-9]*:../../graphics/php-exif
-DEPENDS+=      ${PHP_PKG_PREFIX}-ftp-[0-9]*:../../net/php-ftp
-DEPENDS+=      ${PHP_PKG_PREFIX}-curl-[0-9]*:../../www/php-curl
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd-[0-9]*:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
-DEPENDS+=      ${PHP_PKG_PREFIX}-iconv-[0-9]*:../../converters/php-iconv
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysql-[0-9]*:../../databases/php-mysql
-DEPENDS+=      ${PHP_PKG_PREFIX}-sockets-[0-9]*:../../net/php-sockets
-DEPENDS+=      ${PHP_PKG_PREFIX}-xsl-[0-9]*:../../textproc/php-xsl
-DEPENDS+=      ${PHP_PKG_PREFIX}-zip-[0-9]*:../../archivers/php-zip
-DEPENDS+=      ${PHP_PKG_PREFIX}-zlib-[0-9]*:../../archivers/php-zlib
+DEPENDS+=      ${PHP_PKG_PREFIX}-opcache>=${PHP_BASE_VERS}:../../devel/php-opcache
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-gettext>=${PHP_BASE_VERS}:../../devel/php-gettext
+DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=${PHP_BASE_VERS}:../../graphics/php-exif
+DEPENDS+=      ${PHP_PKG_PREFIX}-ftp>=${PHP_BASE_VERS}:../../net/php-ftp
+DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=${PHP_BASE_VERS}:../../www/php-curl
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-json>=${PHP_BASE_VERS}:../../textproc/php-json
+DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
+DEPENDS+=      ${PHP_PKG_PREFIX}-mysql>=${PHP_BASE_VERS}:../../databases/php-mysql
+DEPENDS+=      ${PHP_PKG_PREFIX}-sockets>=${PHP_BASE_VERS}:../../net/php-sockets
+DEPENDS+=      ${PHP_PKG_PREFIX}-xsl>=${PHP_BASE_VERS}:../../textproc/php-xsl
+DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
+DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
 DEPENDS+=      ${PHP_PKG_PREFIX}-memcache>=2.2.7<3:../../devel/php-memcache2
 DEPENDS+=      phraseanet-indexer-${VERS}{,nb*}:../../www/phraseanet-indexer
 DEPENDS+=      ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=5.2:../../www/ap-php
@@ -61,6 +59,8 @@ MAKE_DIRS_PERMS+= ${PHRASEANETDIR}/tmp/d
 MAKE_DIRS_PERMS+= ${PHRASEANETDIR}/tmp/download ${APACHE_DIRS_PERMS}
 MAKE_DIRS_PERMS+= ${PHRASEANETDIR}/tmp/batches ${APACHE_DIRS_PERMS}
 
+REPLACE_PHP+=  bin/console
+
 do-build:
 
 pre-install:
@@ -78,5 +78,6 @@ do-install:
               -e "s|@VARBASE@|${VARBASE}|g" ${FILESDIR}/phrasea.conf > \
                ${DESTDIR}${PREFIX}/share/examples/phraseanet/phrasea.conf
 
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/unit/Makefile.common
diff -u pkgsrc/www/unit/Makefile.common:1.5 pkgsrc/www/unit/Makefile.common:1.6
--- pkgsrc/www/unit/Makefile.common:1.5 Mon May 15 22:24:38 2023
+++ pkgsrc/www/unit/Makefile.common     Sat Feb  8 04:08:59 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2023/05/15 22:24:38 osa Exp $
+# $NetBSD: Makefile.common,v 1.6 2025/02/08 04:08:59 taca Exp $
 #
 # used by devel/libunit/Makefile
 # used by www/unit/Makefile
@@ -61,5 +61,3 @@ INSTALLATION_DIRS+=   sbin ${UNIT_EXTENSIO
 MAKE_DIRS+=            ${UNIT_PIDDIR} ${UNIT_DATADIR} ${UNIT_RUNDIR}
 OWN_DIRS=              ${UNIT_LOGDIR} ${UNIT_RUNDIR}
 OWN_DIRS_PERMS+=       ${UNIT_DATADIR} ${UNIT_USER} ${UNIT_GROUP} 0700
-
-USE_LANGUAGES= c

Index: pkgsrc/www/unit/distinfo
diff -u pkgsrc/www/unit/distinfo:1.25 pkgsrc/www/unit/distinfo:1.26
--- pkgsrc/www/unit/distinfo:1.25       Tue Jan 14 18:07:35 2025
+++ pkgsrc/www/unit/distinfo    Sat Feb  8 04:08:59 2025
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.25 2025/01/14 18:07:35 osa Exp $
+$NetBSD: distinfo,v 1.26 2025/02/08 04:08:59 taca Exp $
 
 BLAKE2s (unit-1.34.1.tar.gz) = 3a896ada7fc552b50a40e5efb0513a6c80c165610c8e55c4b722923a4e55bdf6
 SHA512 (unit-1.34.1.tar.gz) = 51bcab68d9a015f4e2710312af28afd7f7179a4b9c57dfc26f5bd4a94ad93c1cd4246a92e131a4ff460d51f3003acae636b5a62c2f257671b26eea3080858352
 Size (unit-1.34.1.tar.gz) = 1054774 bytes
 SHA1 (patch-auto_events) = 0556b5d3db6b88d23d686d9da1f3274187079973
+SHA1 (patch-auto_modules_php) = df85739053db94b606282253fe36e22e67dc192f
 SHA1 (patch-auto_os_conf) = 6d1cd7aef662a60d4288014eb6fadbe8c1268e55
 SHA1 (patch-auto_shmem) = cb37c368c19205c2cc1750f4a847af23be8bfa25
 SHA1 (patch-src_nxt__kqueue__engine.c) = c341425f4b21d4cff6e003958f88a04b53dc4ee1

Added files:

Index: pkgsrc/www/unit/patches/patch-auto_modules_php
diff -u /dev/null pkgsrc/www/unit/patches/patch-auto_modules_php:1.1
--- /dev/null   Sat Feb  8 04:08:59 2025
+++ pkgsrc/www/unit/patches/patch-auto_modules_php      Sat Feb  8 04:08:59 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-auto_modules_php,v 1.1 2025/02/08 04:08:59 taca Exp $
+
+* Adjust libphp${PHP_VER}.
+* Require <stdio.h> for using printf(3).
+
+--- auto/modules/php.orig      2024-12-19 01:30:03.000000000 +0000
++++ auto/modules/php
+@@ -102,11 +102,7 @@ if /bin/sh -c "${NXT_PHP_CONFIG} --versi
+                          `${NXT_PHP_CONFIG} --libs`"
+ 
+     else
+-        if [ $NXT_PHP_MAJOR_VERSION -ge 8 ]; then
+-            NXT_PHP_LIB="-lphp"
+-        else
+-            NXT_PHP_LIB="-lphp${NXT_PHP_VERSION%%.*}"
+-        fi
++        NXT_PHP_LIB="-lphp${PHP_VER}"
+ 
+         if [ "$NXT_PHP_LIB_PATH" != "" ]; then
+             # "php-config --ldflags" does not contain path to libphp, but
+@@ -129,6 +125,7 @@ nxt_feature_run=value
+ nxt_feature_incs="${NXT_PHP_INCLUDE}"
+ nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}"
+ nxt_feature_test="
++    #include <stdio.h>
+     #include <php.h>
+ 
+     int main(void) {

Prev by Date: CVS commit: pkgsrc/www
Next by Date: CVS commit: pkgsrc/meta-pkgs/bulk-medium
Previous by Thread: CVS commit: pkgsrc/www
Next by Thread: CVS commit: pkgsrc/meta-pkgs/bulk-medium
Indexes:

Home | Main Index | Thread Index | Old Index