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 04:07:20 UTC 2025

Modified Files:
        pkgsrc/www/php-http3: Makefile
        pkgsrc/www/php-phalcon: Makefile
        pkgsrc/www/php-phalcon4: Makefile
        pkgsrc/www/php-phrasea2: Makefile
        pkgsrc/www/php-piwigo: Makefile
        pkgsrc/www/php-propro: Makefile PLIST
        pkgsrc/www/php-propro2: Makefile PLIST
        pkgsrc/www/php-soycms: Makefile
        pkgsrc/www/php-tiki6: Makefile
        pkgsrc/www/php-tt-rss: Makefile
        pkgsrc/www/php-tt-rss-fever-plugin: Makefile
        pkgsrc/www/php-uploadprogress: Makefile
        pkgsrc/www/typo3-13: Makefile
        pkgsrc/www/typo3_62: Makefile
        pkgsrc/www/websvn: Makefile
        pkgsrc/www/wordpress: Makefile
        pkgsrc/www/z-push: Makefile

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.42 -r1.43 pkgsrc/www/php-http3/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/php-phalcon/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/php-phalcon4/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/php-phrasea2/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/php-piwigo/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/php-propro/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/php-propro/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/php-propro2/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/php-propro2/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/php-soycms/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/php-tiki6/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/php-tt-rss/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/php-tt-rss-fever-plugin/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/php-uploadprogress/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/typo3-13/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/typo3_62/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/www/websvn/Makefile
cvs rdiff -u -r1.111 -r1.112 pkgsrc/www/wordpress/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/z-push/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/php-http3/Makefile
diff -u pkgsrc/www/php-http3/Makefile:1.42 pkgsrc/www/php-http3/Makefile:1.43
--- pkgsrc/www/php-http3/Makefile:1.42  Thu Nov 14 22:22:09 2024
+++ pkgsrc/www/php-http3/Makefile       Sat Feb  8 04:07:17 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2024/11/14 22:22:09 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2025/02/08 04:07:17 taca Exp $
 
 MODNAME=               http
 PECL_VERSION=          3.3.0
+PKGREVISION=           11
 CATEGORIES+=           www
 
 PECL_DISTNAME=         pecl_http-${PECL_VERSION}
@@ -9,7 +10,6 @@ PECL_DISTNAME=         pecl_http-${PECL_VERSION
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://pecl.php.net/package/pecl_http
 COMMENT=               PHP extension for extended HTTP support
-PKGREVISION=           10
 LICENSE=               2-clause-bsd AND isc
 
 CONFLICTS=             php-http-[0-9]*

Index: pkgsrc/www/php-phalcon/Makefile
diff -u pkgsrc/www/php-phalcon/Makefile:1.10 pkgsrc/www/php-phalcon/Makefile:1.11
--- pkgsrc/www/php-phalcon/Makefile:1.10        Tue Jun  6 12:42:48 2023
+++ pkgsrc/www/php-phalcon/Makefile     Sat Feb  8 04:07:18 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2023/06/06 12:42:48 riastradh Exp $
+# $NetBSD: Makefile,v 1.11 2025/02/08 04:07:18 taca Exp $
 #
 
 MODNAME=               phalcon
+PKGREVISION=           1
 PECL_VERSION=          3.4.5
 PKGNAME=               ${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=            www
@@ -19,18 +20,18 @@ USE_LANGUAGES=              c c++
 USE_TOOLS+=            gmake pkg-config
 
 TOOL_DEPENDS+=         re2c>=0.15.3:../../devel/re2c
-DEPENDS+=              ${PHP_PKG_PREFIX}-curl>=5.6.0:../../www/php-curl
-DEPENDS+=              ${PHP_PKG_PREFIX}-gd>=5.6.0:../../graphics/php-gd
-DEPENDS+=              ${PHP_PKG_PREFIX}-json>=5.6.0:../../textproc/php-json
-DEPENDS+=              ${PHP_PKG_PREFIX}-mbstring>=5.6.0:../../converters/php-mbstring
-DEPENDS+=              ${PHP_PKG_PREFIX}-pdo>=5.6.0:../../databases/php-pdo
-DEPENDS+=              ${PHP_PKG_PREFIX}-pdo_mysql>=5.6.0:../../databases/php-pdo_mysql
+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}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+DEPENDS+=              ${PHP_PKG_PREFIX}-pdo>=${PHP_BASE_VERS}:../../databases/php-pdo
+DEPENDS+=              ${PHP_PKG_PREFIX}-pdo_mysql>=${PHP_BASE_VERS}:../../databases/php-pdo_mysql
 
 PHP_VERSIONS_ACCEPTED= 56
 
 .include "../../lang/php/phpversion.mk"
 
-PHPSETUPSUBDIR=                build/php${PKG_PHP_MAJOR_VERS}/${"${MACHINE_ARCH:Mx86_64}":?64:32}bits
+PHPSETUPSUBDIR=                build/php${PHP_MAJOR_VERS}/${"${MACHINE_ARCH:Mx86_64}":?64:32}bits
 MODULESDIR=            ${WRKSRC}/${PHPSETUPSUBDIR}/modules
 CONFIGURE_DIRS+=       ${PHPSETUPSUBDIR}
 

Index: pkgsrc/www/php-phalcon4/Makefile
diff -u pkgsrc/www/php-phalcon4/Makefile:1.4 pkgsrc/www/php-phalcon4/Makefile:1.5
--- pkgsrc/www/php-phalcon4/Makefile:1.4        Tue Jun  6 12:42:48 2023
+++ pkgsrc/www/php-phalcon4/Makefile    Sat Feb  8 04:07:18 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2023/06/06 12:42:48 riastradh Exp $
+# $NetBSD: Makefile,v 1.5 2025/02/08 04:07:18 taca Exp $
 #
 
 MODNAME=               phalcon
 PECL_VERSION=          4.1.0
+PKGREVISION=           1
 PKGNAME=               ${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=            www
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=phalcon/}
@@ -23,16 +24,16 @@ USE_LANGUAGES=              c c++
 USE_TOOLS+=            gmake pkg-config
 
 TOOL_DEPENDS+=         re2c>=0.15.3:../../devel/re2c
-DEPENDS+=              ${PHP_PKG_PREFIX}-curl>=7.2.0:../../www/php-curl
-DEPENDS+=              ${PHP_PKG_PREFIX}-gettext>=7.2.0:../../devel/php-gettext
-DEPENDS+=              ${PHP_PKG_PREFIX}-json>=7.2.0:../../textproc/php-json
-DEPENDS+=              ${PHP_PKG_PREFIX}-mbstring>=7.2.0:../../converters/php-mbstring
-DEPENDS+=              ${PHP_PKG_PREFIX}-pdo>=7.2.0:../../databases/php-pdo
+DEPENDS+=              ${PHP_PKG_PREFIX}-curl>=${PHP_BASE_VERS}:../../www/php-curl
+DEPENDS+=              ${PHP_PKG_PREFIX}-gettext>=${PHP_BASE_VERS}:../../devel/php-gettext
+DEPENDS+=              ${PHP_PKG_PREFIX}-json>=${PHP_BASE_VERS}:../../textproc/php-json
+DEPENDS+=              ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+DEPENDS+=              ${PHP_PKG_PREFIX}-pdo>=${PHP_BASE_VERS}:../../databases/php-pdo
 DEPENDS+=              ${PHP_PKG_PREFIX}-psr>=1.0.0:../../devel/php-psr
 
 .include "../../lang/php/phpversion.mk"
 
-PHPSETUPSUBDIR=                build/php${PKG_PHP_MAJOR_VERS}/${"${MACHINE_ARCH:Mx86_64}":?64:32}bits
+PHPSETUPSUBDIR=                build/php${PHP_MAJOR_VERS}/${"${MACHINE_ARCH:Mx86_64}":?64:32}bits
 MODULESDIR=            ${WRKSRC}/${PHPSETUPSUBDIR}/modules
 CONFIGURE_DIRS+=       ${PHPSETUPSUBDIR}
 

Index: pkgsrc/www/php-phrasea2/Makefile
diff -u pkgsrc/www/php-phrasea2/Makefile:1.16 pkgsrc/www/php-phrasea2/Makefile:1.17
--- pkgsrc/www/php-phrasea2/Makefile:1.16       Wed Jun 23 20:33:18 2021
+++ pkgsrc/www/php-phrasea2/Makefile    Sat Feb  8 04:07:18 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2021/06/23 20:33:18 nia Exp $
+# $NetBSD: Makefile,v 1.17 2025/02/08 04:07:18 taca Exp $
 #
 
 .include "../../www/phraseanet/Makefile.common"
 
 MODNAME=                       phrasea2
-PKGREVISION=                   3
+PKGREVISION=                   4
 PECL_VERSION=                  ${VERS}
 PECL_LEGACY_VERSION_SCHEME=    yes
 EXTRACT_ELEMENTS=              ${DISTNAME}/bin/src/php_phrasea2

Index: pkgsrc/www/php-piwigo/Makefile
diff -u pkgsrc/www/php-piwigo/Makefile:1.9 pkgsrc/www/php-piwigo/Makefile:1.10
--- pkgsrc/www/php-piwigo/Makefile:1.9  Fri Dec 20 14:35:01 2024
+++ pkgsrc/www/php-piwigo/Makefile      Sat Feb  8 04:07:18 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2024/12/20 14:35:01 manu Exp $
+# $NetBSD: Makefile,v 1.10 2025/02/08 04:07:18 taca Exp $
 #
 
 PWVER=         15.1.0
+PKGREVISION=   1
 DISTNAME=      piwigo-${PWVER}
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=    www
@@ -13,9 +14,9 @@ HOMEPAGE=     https://piwigo.org/
 COMMENT=       Piwigo is photo gallery software for the web
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=5.2.0:../../graphics/php-exif
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=5.2.0:../../databases/php-mysqli
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=${PHP_BASE_VERS}:../../graphics/php-exif
+DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=${PHP_BASE_VERS}:../../databases/php-mysqli
 
 WRKSRC=                ${WRKDIR}/piwigo
 USE_LANGUAGES= # none

Index: pkgsrc/www/php-propro/Makefile
diff -u pkgsrc/www/php-propro/Makefile:1.6 pkgsrc/www/php-propro/Makefile:1.7
--- pkgsrc/www/php-propro/Makefile:1.6  Tue Jun  6 12:42:48 2023
+++ pkgsrc/www/php-propro/Makefile      Sat Feb  8 04:07:18 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2023/06/06 12:42:48 riastradh Exp $
+# $NetBSD: Makefile,v 1.7 2025/02/08 04:07:18 taca Exp $
 
 MODNAME=       propro
 PECL_VERSION=  1.0.2
+PKGREVISION=   1
 CATEGORIES=    www
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -16,14 +17,14 @@ PHP_VERSIONS_ACCEPTED=      56
 USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
 
-INSTALLATION_DIRS+=    include/php/ext/propro
+INSTALLATION_DIRS+=    ${PHP_INCDIR}/ext/propro
 PLIST_SRC+=            PLIST
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/php_propro.h \
-               ${DESTDIR}${PREFIX}/include/php/ext/propro
+               ${DESTDIR}${PREFIX}/${PHP_INCDIR}/ext/propro
        ${INSTALL_DATA} ${WRKSRC}/src/php_propro_api.h \
-               ${DESTDIR}${PREFIX}/include/php/ext/propro
+               ${DESTDIR}${PREFIX}/${PHP_INCDIR}/ext/propro
 
 .include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/php-propro/PLIST
diff -u pkgsrc/www/php-propro/PLIST:1.2 pkgsrc/www/php-propro/PLIST:1.3
--- pkgsrc/www/php-propro/PLIST:1.2     Sat Mar 12 08:34:33 2016
+++ pkgsrc/www/php-propro/PLIST Sat Feb  8 04:07:18 2025
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2016/03/12 08:34:33 fhajny Exp $
-include/php/ext/propro/php_propro.h
-include/php/ext/propro/php_propro_api.h
+@comment $NetBSD: PLIST,v 1.3 2025/02/08 04:07:18 taca Exp $
+${PHP_INCDIR}/ext/propro/php_propro.h
+${PHP_INCDIR}/ext/propro/php_propro_api.h

Index: pkgsrc/www/php-propro2/Makefile
diff -u pkgsrc/www/php-propro2/Makefile:1.8 pkgsrc/www/php-propro2/Makefile:1.9
--- pkgsrc/www/php-propro2/Makefile:1.8 Tue Jun  6 12:42:49 2023
+++ pkgsrc/www/php-propro2/Makefile     Sat Feb  8 04:07:18 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2023/06/06 12:42:49 riastradh Exp $
+# $NetBSD: Makefile,v 1.9 2025/02/08 04:07:18 taca Exp $
 
 MODNAME=       propro
 PECL_VERSION=  2.1.0
+PKGREVISION=   1
 CATEGORIES=    www
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -16,14 +17,14 @@ PHP_VERSIONS_ACCEPTED=      74
 USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
 
-INSTALLATION_DIRS+=    include/php/ext/propro
+INSTALLATION_DIRS+=    ${PHP_INCDIR}/ext/propro
 PLIST_SRC+=            PLIST
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/php_propro.h \
-               ${DESTDIR}${PREFIX}/include/php/ext/propro
+               ${DESTDIR}${PREFIX}/${PHP_INCDIR}/ext/propro
        ${INSTALL_DATA} ${WRKSRC}/src/php_propro_api.h \
-               ${DESTDIR}${PREFIX}/include/php/ext/propro
+               ${DESTDIR}${PREFIX}/${PHP_INCDIR}/ext/propro
 
 .include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/php-propro2/PLIST
diff -u pkgsrc/www/php-propro2/PLIST:1.1 pkgsrc/www/php-propro2/PLIST:1.2
--- pkgsrc/www/php-propro2/PLIST:1.1    Sat Mar 12 09:12:52 2016
+++ pkgsrc/www/php-propro2/PLIST        Sat Feb  8 04:07:18 2025
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2016/03/12 09:12:52 fhajny Exp $
-include/php/ext/propro/php_propro.h
-include/php/ext/propro/php_propro_api.h
+@comment $NetBSD: PLIST,v 1.2 2025/02/08 04:07:18 taca Exp $
+${PHP_INCDIR}/ext/propro/php_propro.h
+${PHP_INCDIR}/ext/propro/php_propro_api.h

Index: pkgsrc/www/php-soycms/Makefile
diff -u pkgsrc/www/php-soycms/Makefile:1.6 pkgsrc/www/php-soycms/Makefile:1.7
--- pkgsrc/www/php-soycms/Makefile:1.6  Sun Mar  7 13:21:58 2021
+++ pkgsrc/www/php-soycms/Makefile      Sat Feb  8 04:07:18 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2021/03/07 13:21:58 taca Exp $
+# $NetBSD: Makefile,v 1.7 2025/02/08 04:07:18 taca Exp $
 
 DISTNAME=      soycms_1.4.0c_mysql
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME:S/_/-/:S/_mysql//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  http://ryo-on.users.sourceforge.net/distrib/
 # https://www.soycms.net/download
@@ -13,11 +13,11 @@ HOMEPAGE=   https://www.soycms.net/
 COMMENT=       Flexible and pluggable CMS
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-pdo>=5.3.0:../../databases/php-pdo
-DEPENDS+=      ${PHP_PKG_PREFIX}-pdo_mysql>=5.3.0:../../databases/php-pdo_mysql
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=5.3.0:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=5.3.0:../../archivers/php-zip
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.3.0:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-pdo>=${PHP_BASE_VERS}:../../databases/php-pdo
+DEPENDS+=      ${PHP_PKG_PREFIX}-pdo_mysql>=${PHP_BASE_VERS}:../../databases/php-pdo_mysql
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
 
 WRKSRC=                ${WRKDIR}
 USE_LANGUAGES= # none

Index: pkgsrc/www/php-tiki6/Makefile
diff -u pkgsrc/www/php-tiki6/Makefile:1.13 pkgsrc/www/php-tiki6/Makefile:1.14
--- pkgsrc/www/php-tiki6/Makefile:1.13  Wed Dec 29 06:05:19 2021
+++ pkgsrc/www/php-tiki6/Makefile       Sat Feb  8 04:07:18 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2021/12/29 06:05:19 taca Exp $
+# $NetBSD: Makefile,v 1.14 2025/02/08 04:07:18 taca Exp $
 #
 
 DISTNAME=      tiki-6.8
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME:S/tiki-/tiki6-/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tikiwiki/}
 EXTRACT_SUFX=  .tar.bz2
@@ -13,10 +13,10 @@ HOMEPAGE=   http://info.tiki.org/
 COMMENT=       Tiki Wiki CMS Groupware web-based application
 LICENSE=       gnu-lgpl-v2.1
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=5.2.0:../../converters/php-iconv
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=5.2.0:../../databases/php-mysqli
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-xmlrpc>=5.2.0:../../net/php-xmlrpc
+DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
+DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=${PHP_BASE_VERS}:../../databases/php-mysqli
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-xmlrpc>=${PHP_BASE_VERS}:../../net/php-xmlrpc
 DEPENDS+=      ${PHP_PKG_PREFIX}-pear>=1.9.4:../../lang/pear
 
 USE_LANGUAGES= # none

Index: pkgsrc/www/php-tt-rss/Makefile
diff -u pkgsrc/www/php-tt-rss/Makefile:1.13 pkgsrc/www/php-tt-rss/Makefile:1.14
--- pkgsrc/www/php-tt-rss/Makefile:1.13 Sun Mar  7 13:21:58 2021
+++ pkgsrc/www/php-tt-rss/Makefile      Sat Feb  8 04:07:19 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2021/03/07 13:21:58 taca Exp $
+# $NetBSD: Makefile,v 1.14 2025/02/08 04:07:19 taca Exp $
 
 TTRVER=                1.12
 DISTNAME=      Tiny-Tiny-RSS-${TTRVER}
 PKGNAME=       ${PHP_PKG_PREFIX}-tt-rss-${TTRVER}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  -http://github.com/gothfox/Tiny-Tiny-RSS/archive/${TTRVER}.tar.gz
 
@@ -12,8 +12,8 @@ HOMEPAGE=     https://tt-rss.org/
 COMMENT=       Tiny Tiny RSS is an open source web-based RSS feed reader
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-iconv-[0-9]*:../../converters/php-iconv
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
 
 .include "options.mk"
 

Index: pkgsrc/www/php-tt-rss-fever-plugin/Makefile
diff -u pkgsrc/www/php-tt-rss-fever-plugin/Makefile:1.4 pkgsrc/www/php-tt-rss-fever-plugin/Makefile:1.5
--- pkgsrc/www/php-tt-rss-fever-plugin/Makefile:1.4     Mon Oct  9 08:21:24 2017
+++ pkgsrc/www/php-tt-rss-fever-plugin/Makefile Sat Feb  8 04:07:19 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2017/10/09 08:21:24 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2025/02/08 04:07:19 taca Exp $
 
 DISTNAME=      fever-1.2
 PKGNAME=       ${PHP_PKG_PREFIX}-tt-rss-${DISTNAME:S/-/-plugin-/}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=dasmurphy/}
 EXTRACT_SUFX=  .zip

Index: pkgsrc/www/php-uploadprogress/Makefile
diff -u pkgsrc/www/php-uploadprogress/Makefile:1.8 pkgsrc/www/php-uploadprogress/Makefile:1.9
--- pkgsrc/www/php-uploadprogress/Makefile:1.8  Mon Dec 13 14:46:09 2021
+++ pkgsrc/www/php-uploadprogress/Makefile      Sat Feb  8 04:07:19 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2021/12/13 14:46:09 taca Exp $
+# $NetBSD: Makefile,v 1.9 2025/02/08 04:07:19 taca Exp $
 #
 
 MODNAME=       uploadprogress
 PECL_VERSION=  2.0.2
+PKGREVISION=   1
 CATEGORIES=    www
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/typo3-13/Makefile
diff -u pkgsrc/www/typo3-13/Makefile:1.1 pkgsrc/www/typo3-13/Makefile:1.2
--- pkgsrc/www/typo3-13/Makefile:1.1    Wed Feb  5 12:50:49 2025
+++ pkgsrc/www/typo3-13/Makefile        Sat Feb  8 04:07:19 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2025/02/05 12:50:49 wen Exp $
+# $NetBSD: Makefile,v 1.2 2025/02/08 04:07:19 taca Exp $
 
 DISTNAME=      typo3_src-${VER}
 PKGNAME=       ${PHP_PKG_PREFIX}-typo3-${VER}
@@ -10,12 +10,12 @@ HOMEPAGE=   https://typo3.com/
 COMMENT=       The TYPO3 content management system, 13 LTS release
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=8.2.0:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=8.2.0:../../archivers/php-zlib
-DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=8.2.0:../../textproc/php-intl
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=8.2.0:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-pdo>=8.2.0:../../databases/php-pdo
-DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=8.2.0:../../graphics/php-exif
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
+DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-pdo>=${PHP_BASE_VERS}:../../databases/php-pdo
+DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=${PHP_BASE_VERS}:../../graphics/php-exif
 
 PHP_VERSIONS_ACCEPTED= 82 83 # 84
 
@@ -58,7 +58,6 @@ do-install:
        cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${PREFIX}/${TYPO3DIR}
 
 
-.include "../../lang/php/replace.mk"
-.include "../../lang/php/json.mk"
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/typo3_62/Makefile
diff -u pkgsrc/www/typo3_62/Makefile:1.25 pkgsrc/www/typo3_62/Makefile:1.26
--- pkgsrc/www/typo3_62/Makefile:1.25   Sun Dec 15 18:25:22 2019
+++ pkgsrc/www/typo3_62/Makefile        Sat Feb  8 04:07:19 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2019/12/15 18:25:22 taca Exp $
+# $NetBSD: Makefile,v 1.26 2025/02/08 04:07:19 taca Exp $
 #
 
 DISTNAME=      ${TYPO3NAME}
 PKGNAME=       ${PHP_PKG_PREFIX}-typo3-${VER}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=typo3/}
 
@@ -12,13 +13,14 @@ COMMENT=    The TYPO3 content management sy
 LICENSE=       gnu-gpl-v2
 
 DEPENDS+=      ${PHP_PKG_PREFIX}-{mysqli,pgsql}>=5.1.0:../../databases/php-mysqli
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.3.7:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-soap>=5.3.7:../../net/php-soap
-DEPENDS+=      ${PHP_PKG_PREFIX}-json>=5.3.7:../../textproc/php-json
-DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=5.3.7:../../archivers/php-zip
-DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=5.3.7:../../archivers/php-zlib
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-soap>=${PHP_BASE_VERS}:../../net/php-soap
+DEPENDS+=      ${PHP_PKG_PREFIX}-json>=${PHP_BASE_VERS}:../../textproc/php-json
+DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
+DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
 
 PHP_VERSIONS_ACCEPTED= 56
+PHP_MINIMUM_TEENY=     7
 
 VER=           6.2.31
 NO_BUILD=      yes
@@ -27,15 +29,10 @@ USE_TOOLS+= bash:run pax
 TYPO3NAME=     typo3_src-${VER}
 WRKSRC=                ${WRKDIR}/${DISTNAME}
 
-# maybe resides in lang/php/phpversion.mk
-REPLACE_INTERPRETER+=  php
-REPLACE.php.old=       .*php[^ ]*
-REPLACE.php.new=       ${PREFIX}/bin/php
-REPLACE_FILES.php=     typo3/cli_dispatch.phpsh
-
 REPLACE_BASH=  typo3/sysext/core/Build/Scripts/xlfcheck.sh \
        typo3/sysext/core/Build/Scripts/splitFunctionalTests.sh \
        typo3/sysext/core/Build/Scripts/update-static-composer.sh
+REPLACE_PHP+=  typo3/cli_dispatch.phpsh
 
 OWN_DIRS_PERMS+=       ${TYPO3DIR}/${SITEDIR} ${REAL_ROOT_USER} ${APACHE_GROUP} 0770
 

Index: pkgsrc/www/websvn/Makefile
diff -u pkgsrc/www/websvn/Makefile:1.26 pkgsrc/www/websvn/Makefile:1.27
--- pkgsrc/www/websvn/Makefile:1.26     Fri Dec 22 17:51:18 2023
+++ pkgsrc/www/websvn/Makefile  Sat Feb  8 04:07:19 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2023/12/22 17:51:18 zafer Exp $
+# $NetBSD: Makefile,v 1.27 2025/02/08 04:07:19 taca Exp $
 #
 
 DISTNAME=      websvn-2.2.1
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    www
 MASTER_SITES=  #
 
@@ -10,8 +10,8 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.websvn.info/
 COMMENT=       Subversion repository web frontend
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-iconv-[0-9]*:../../converters/php-iconv
-DEPENDS+=      ${PHP_PKG_PREFIX}-zlib-[0-9]*:../../archivers/php-zlib
+DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
+DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
 
 NO_BUILD=      yes
 USE_TOOLS+=    pax

Index: pkgsrc/www/wordpress/Makefile
diff -u pkgsrc/www/wordpress/Makefile:1.111 pkgsrc/www/wordpress/Makefile:1.112
--- pkgsrc/www/wordpress/Makefile:1.111 Thu Jan  2 12:02:37 2025
+++ pkgsrc/www/wordpress/Makefile       Sat Feb  8 04:07:19 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.111 2025/01/02 12:02:37 wen Exp $
+# $NetBSD: Makefile,v 1.112 2025/02/08 04:07:19 taca Exp $
 
 DISTNAME=              wordpress-${VERSION}
 PKGNAME=               ${PHP_PKG_PREFIX}-${DISTNAME}
 VERSION=               6.7.1
+PKGREVISION=           1
 CATEGORIES=            www
 MASTER_SITES=          https://wordpress.org/
 EXTRACT_SUFX=          .zip
@@ -41,11 +42,11 @@ OWN_DIRS_PERMS+=    ${WPHOME}/wp-content/up
 
 INSTALLATION_DIRS+=    ${DOCDIR} ${WPHOME} ${EGDIR}
 
-DEPENDS+=              ${PHP_PKG_PREFIX}-mysqli>=5.6.20:../../databases/php-mysqli
-DEPENDS+=              ${PHP_PKG_PREFIX}-gd>=5.6.20:../../graphics/php-gd
-DEPENDS+=              ${PHP_PKG_PREFIX}-curl>=5.6.20:../../www/php-curl
-DEPENDS+=              ${PHP_PKG_PREFIX}-zip>=5.6.20:../../archivers/php-zip
-DEPENDS+=              ${PHP_PKG_PREFIX}-zlib>=5.6.20:../../archivers/php-zlib
+DEPENDS+=              ${PHP_PKG_PREFIX}-mysqli>=${PHP_BASE_VERS}:../../databases/php-mysqli
+DEPENDS+=              ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=              ${PHP_PKG_PREFIX}-curl>=${PHP_BASE_VERS}:../../www/php-curl
+DEPENDS+=              ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
+DEPENDS+=              ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
 
 SUBST_CLASSES+=                conf
 SUBST_MESSAGE.conf=    Fixing pathnames in configuration file.

Index: pkgsrc/www/z-push/Makefile
diff -u pkgsrc/www/z-push/Makefile:1.9 pkgsrc/www/z-push/Makefile:1.10
--- pkgsrc/www/z-push/Makefile:1.9      Mon Feb 19 15:43:36 2024
+++ pkgsrc/www/z-push/Makefile  Sat Feb  8 04:07:19 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2024/02/19 15:43:36 taca Exp $
+# $NetBSD: Makefile,v 1.10 2025/02/08 04:07:19 taca Exp $
 #
 
 DISTNAME=      z-push-${ZPUSH_VERSION}
 ZPUSH_VERSION= 2.2.10
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    www
 MASTER_SITES=  http://download.z-push.org/final/2.2/
 
@@ -26,8 +26,6 @@ USE_TOOLS=    pax
 
 INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR} bin ${ZPUSHDIR}
 
-.include "../../lang/php/phpversion.mk"
-
 DEPENDS+=      ${PHP_PKG_PREFIX}-soap>=${PHP_BASE_VERS}:../../net/php-soap
 DEPENDS+=      ${PHP_PKG_PREFIX}-pcntl>=${PHP_BASE_VERS}:../../devel/php-pcntl
 DEPENDS+=      ${PHP_PKG_PREFIX}-posix>=${PHP_BASE_VERS}:../../devel/php-posix
@@ -53,13 +51,10 @@ CONF_FILES_PERMS+=  ${EGDIR}/config.php $
 CONF_FILES_PERMS+=     ${EGDIR}/z-push.conf ${PKG_SYSCONFDIR}/z-push.conf \
                        ${REAL_ROOT_USER} ${APACHE_GROUP} 0640
 
-REPLACE_INTERPRETER+=  php
-REPLACE.php.old=       .*php
-REPLACE.php.new=       ${PREFIX}/bin/php
-REPLACE_FILES.php=     z-push-admin.php
-REPLACE_FILES.php+=    z-push-top.php
-REPLACE_FILES.php+=    backend/zarafa/listfolders.php
-REPLACE_FILES.php+=    tools/migrate-2.0.x-2.1.0.php
+REPLACE_PHP+=  z-push-admin.php
+REPLACE_PHP+=  z-push-top.php
+REPLACE_PHP+=  backend/zarafa/listfolders.php
+REPLACE_PHP+=  tools/migrate-2.0.x-2.1.0.php
 
 SUBST_CLASSES+=                conf
 SUBST_STAGE.conf=      pre-configure



Home | Main Index | Thread Index | Old Index