CVS commit: pkgsrc/time

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Feb  8 03:56:22 UTC 2025

Modified Files:
        pkgsrc/time/kronolith: Makefile
        pkgsrc/time/pear-Date: Makefile
        pkgsrc/time/php-framadate: Makefile
        pkgsrc/time/php-mrbs: 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.29 -r1.30 pkgsrc/time/kronolith/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/time/pear-Date/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/time/php-framadate/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/time/php-mrbs/Makefile

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

Modified files:

Index: pkgsrc/time/kronolith/Makefile
diff -u pkgsrc/time/kronolith/Makefile:1.29 pkgsrc/time/kronolith/Makefile:1.30
--- pkgsrc/time/kronolith/Makefile:1.29 Sat Apr 24 11:37:29 2021
+++ pkgsrc/time/kronolith/Makefile      Sat Feb  8 03:56:22 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2021/04/24 11:37:29 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2025/02/08 03:56:22 taca Exp $
 
 DISTNAME=      kronolith-h3-${KRONOLITHVER}
 PKGNAME=       kronolith-${KRONOLITHVER}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    www time
 #MASTER_SITES+=        ftp://ftp.horde.org/pub/kronolith/
 
@@ -12,7 +12,7 @@ COMMENT=      Horde calendar application
 LICENSE=       gnu-gpl-v2
 
 DEPENDS+=      horde>=3.2:../../www/horde
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql
+DEPENDS+=      ${PHP_PKG_PREFIX}-mysql>=${PHP_BASE_VERS}:../../databases/php-mysql
 DEPENDS+=      ${PHP_PKG_PREFIX}-pear-Date-[0-9]*:../../time/pear-Date
 
 PHP_VERSIONS_ACCEPTED= 56

Index: pkgsrc/time/pear-Date/Makefile
diff -u pkgsrc/time/pear-Date/Makefile:1.14 pkgsrc/time/pear-Date/Makefile:1.15
--- pkgsrc/time/pear-Date/Makefile:1.14 Sun Aug 30 15:00:52 2015
+++ pkgsrc/time/pear-Date/Makefile      Sat Feb  8 03:56:22 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2015/08/30 15:00:52 taca Exp $
+# $NetBSD: Makefile,v 1.15 2025/02/08 03:56:22 taca Exp $
 
 DISTNAME=      Date-1.5.0a4
+PKGREVISION=   1
 CATEGORIES=    time
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/time/php-framadate/Makefile
diff -u pkgsrc/time/php-framadate/Makefile:1.2 pkgsrc/time/php-framadate/Makefile:1.3
--- pkgsrc/time/php-framadate/Makefile:1.2      Sun Jan 26 18:02:49 2025
+++ pkgsrc/time/php-framadate/Makefile  Sat Feb  8 03:56:22 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2025/01/26 18:02:49 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2025/02/08 03:56:22 taca Exp $
 
 DISTNAME=      framadate-1.1.19
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    time www
 MASTER_SITES=  https://framagit.org/framasoft/framadate/framadate/-/archive/1.1.19/
 EXTRACT_SUFX=  .tar.bz2
@@ -19,13 +19,13 @@ PHP_VERSIONS_INCOMPATIBLE=  56
 USE_LANGUAGES= # none
 USE_TOOLS=     pax
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-intl-[0-9]*:../../textproc/php-intl
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
 
 TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-composer-[0-9]*:../../devel/php-composer
 TOOL_DEPENDS+= git-base-[0-9]*:../../devel/git-base
-TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-curl-[0-9]*:../../www/php-curl
-TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-intl-[0-9]*:../../textproc/php-intl
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-curl>=${PHP_BASE_VERS}:../../www/php-curl
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -44,20 +44,19 @@ MAKE_DIRS_PERMS+=   ${WWWDIR}/app/inc ${AP
 
 INSTALLATION_DIRS+=    ${DOCDIR} ${WWWDIR}
 
+REPLACE_SH+=   vendor/smarty/smarty/run-tests-for-all-php-versions.sh
+
+post-extract:
+       cd ${WRKSRC} && ${SETENV} COMPOSER_HOME=${WRKDIR}/composer composer${PHP_VER} update < /dev/null
+
 do-build:
-       cd ${WRKSRC} && ${SETENV} COMPOSER_HOME=${WRKDIR}/composer composer update
        cd ${WRKSRC} && ${CHMOD} -R og-w .
        ${GREP} -rl '^#!/usr/bin/env' ${WRKSRC}/vendor | while read f ; do \
                ${CP} $$f $$f.orig && \
-               ${SED} "s|^#!/usr/bin/env php|#!${PREFIX}/bin/php|" \
+               ${SED} "s|^#!/usr/bin/env php|#!${PREFIX}/bin/php${PHP_VER}|" \
                        $$f.orig > $$f && \
                ${RM} $$f.orig ; \
        done
-       f=${WRKSRC}/vendor/smarty/smarty/run-tests-for-all-php-versions.sh && \
-               ${CP} $$f $$f.orig && \
-               ${SED} "s|^#!/bin/bash|#!/bin/sh|" \
-                       $$f.orig > $$f && \
-               ${RM} $$f.orig
 
 do-install:
        for f in ${DOC_FILES} ; do \
@@ -70,5 +69,4 @@ do-install:
                ${DESTDIR}${PREFIX}/${WWWDIR}/.htaccess
 
 .include "../../lang/php/phpversion.mk"
-.include "../../lang/php/replace.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/time/php-mrbs/Makefile
diff -u pkgsrc/time/php-mrbs/Makefile:1.8 pkgsrc/time/php-mrbs/Makefile:1.9
--- pkgsrc/time/php-mrbs/Makefile:1.8   Tue Jan 21 14:29:39 2025
+++ pkgsrc/time/php-mrbs/Makefile       Sat Feb  8 03:56:22 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2025/01/21 14:29:39 manu Exp $
+# $NetBSD: Makefile,v 1.9 2025/02/08 03:56:22 taca Exp $
 #
 
 DISTNAME=      mrbs-1.11.6
+PKGREVISION=   1
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=    time www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mrbs/}/