CVS commit: pkgsrc/textproc

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Feb  8 03:20:15 UTC 2025

Modified Files:
        pkgsrc/textproc/php-enchant: Makefile
        pkgsrc/textproc/php-intl: Makefile
        pkgsrc/textproc/php-json: Makefile PLIST buildlink3.mk
        pkgsrc/textproc/php-pspell: Makefile
        pkgsrc/textproc/php-wddx: Makefile
        pkgsrc/textproc/php-xsl: Makefile

Log Message:
multiple PHP support

Also bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/php-enchant/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/textproc/php-intl/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/php-json/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/php-json/PLIST \
    pkgsrc/textproc/php-json/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/textproc/php-pspell/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/textproc/php-wddx/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/textproc/php-xsl/Makefile

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

Modified files:

Index: pkgsrc/textproc/php-enchant/Makefile
diff -u pkgsrc/textproc/php-enchant/Makefile:1.15 pkgsrc/textproc/php-enchant/Makefile:1.16
--- pkgsrc/textproc/php-enchant/Makefile:1.15   Sun Apr 28 10:06:35 2024
+++ pkgsrc/textproc/php-enchant/Makefile        Sat Feb  8 03:20:14 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2024/04/28 10:06:35 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2025/02/08 03:20:14 taca Exp $
 
 MODNAME=               enchant
+PKGREVISION=           4
 CATEGORIES+=           textproc
 COMMENT=               PHP extension for ENCHANT (spelling) support
-PKGREVISION=           3
 
 CONFIGURE_ARGS+=       --with-enchant=shared,${BUILDLINK_PREFIX.enchant2}
 

Index: pkgsrc/textproc/php-intl/Makefile
diff -u pkgsrc/textproc/php-intl/Makefile:1.56 pkgsrc/textproc/php-intl/Makefile:1.57
--- pkgsrc/textproc/php-intl/Makefile:1.56      Thu Nov 14 22:21:54 2024
+++ pkgsrc/textproc/php-intl/Makefile   Sat Feb  8 03:20:14 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.56 2024/11/14 22:21:54 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2025/02/08 03:20:14 taca Exp $
 
 MODNAME=               intl
+PKGREVISION=           15
 CATEGORIES+=           textproc
 COMMENT=               PHP extension for i18n
-PKGREVISION=           15
 LICENSE=               php
 
 USE_LANGUAGES=         c c++

Index: pkgsrc/textproc/php-json/Makefile
diff -u pkgsrc/textproc/php-json/Makefile:1.12 pkgsrc/textproc/php-json/Makefile:1.13
--- pkgsrc/textproc/php-json/Makefile:1.12      Wed Jan 17 15:05:44 2024
+++ pkgsrc/textproc/php-json/Makefile   Sat Feb  8 03:20:14 2025
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2024/01/17 15:05:44 gdt Exp $
+# $NetBSD: Makefile,v 1.13 2025/02/08 03:20:14 taca Exp $
 
 # NB: Do not depend on this package directly.  Instead, use
 #   .include "../../lang/php/json.mk"
 # so that it is included only when needed.
 
 MODNAME=               json
+PKGREVISION=           1
 CATEGORIES+=           textproc
 COMMENT=               PHP extension for JSON serialization support
 
@@ -19,7 +20,7 @@ PHP_VERSIONS_ACCEPTED=        56 74
 
 .include "../../lang/php/ext.mk"
 
-INSTALLATION_DIRS+=    include/php/ext/json
+INSTALLATION_DIRS+=    ${PHP_INCDIR}/ext/json
 JSON_INCLUDES=         php_json.h
 PLIST_SRC+=            ${.CURDIR}/../../textproc/php-json/PLIST
 
@@ -27,6 +28,6 @@ MAKE_ENV+=            RE2C=re2c
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/${JSON_INCLUDES} \
-           ${DESTDIR}${PREFIX}/include/php/ext/json/${JSON_INCLUDES}
+           ${DESTDIR}${PREFIX}/${PHP_INCDIR}/ext/json/${JSON_INCLUDES}
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/php-json/PLIST
diff -u pkgsrc/textproc/php-json/PLIST:1.1 pkgsrc/textproc/php-json/PLIST:1.2
--- pkgsrc/textproc/php-json/PLIST:1.1  Wed Dec 13 11:42:41 2017
+++ pkgsrc/textproc/php-json/PLIST      Sat Feb  8 03:20:14 2025
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2017/12/13 11:42:41 jperkin Exp $
-include/php/ext/json/php_json.h
+@comment $NetBSD: PLIST,v 1.2 2025/02/08 03:20:14 taca Exp $
+${PHP_INCDIR}/ext/json/php_json.h
Index: pkgsrc/textproc/php-json/buildlink3.mk
diff -u pkgsrc/textproc/php-json/buildlink3.mk:1.1 pkgsrc/textproc/php-json/buildlink3.mk:1.2
--- pkgsrc/textproc/php-json/buildlink3.mk:1.1  Wed Dec 13 11:42:41 2017
+++ pkgsrc/textproc/php-json/buildlink3.mk      Sat Feb  8 03:20:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/12/13 11:42:41 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2025/02/08 03:20:14 taca Exp $
 
 BUILDLINK_TREE+=       php-json
 
@@ -8,7 +8,7 @@ PHP_JSON_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.php-json+=       ${PHP_PKG_PREFIX}-json>0
 BUILDLINK_PKGSRCDIR.php-json?=         ../../textproc/php-json
 BUILDLINK_DEPMETHOD.php-json?=         build
-BUILDLINK_INCDIRS.php-json?=           include/php/ext/json
+BUILDLINK_INCDIRS.php-json?=           ${PHP_INCDIR}/ext/json
 .endif  # PHP_JSON_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -php-json

Index: pkgsrc/textproc/php-pspell/Makefile
diff -u pkgsrc/textproc/php-pspell/Makefile:1.14 pkgsrc/textproc/php-pspell/Makefile:1.15
--- pkgsrc/textproc/php-pspell/Makefile:1.14    Thu Oct 25 06:56:46 2012
+++ pkgsrc/textproc/php-pspell/Makefile Sat Feb  8 03:20:14 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2012/10/25 06:56:46 asau Exp $
+# $NetBSD: Makefile,v 1.15 2025/02/08 03:20:14 taca Exp $
 
 MODNAME=               pspell
+PKGREVISION=           1
 CATEGORIES+=           textproc
 COMMENT=               PHP extension for pspell support
 

Index: pkgsrc/textproc/php-wddx/Makefile
diff -u pkgsrc/textproc/php-wddx/Makefile:1.34 pkgsrc/textproc/php-wddx/Makefile:1.35
--- pkgsrc/textproc/php-wddx/Makefile:1.34      Thu Nov 14 22:21:54 2024
+++ pkgsrc/textproc/php-wddx/Makefile   Sat Feb  8 03:20:14 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2024/11/14 22:21:54 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2025/02/08 03:20:14 taca Exp $
 
 MODNAME=               wddx
+PKGREVISION=           13
 CATEGORIES+=           textproc
 COMMENT=               PHP extension for WDDX support
-PKGREVISION=           12
 
 CONFLICTS=     php-wddx-[0-9]*
 
@@ -15,7 +15,7 @@ USE_PHP_EXT_PATCHES=  # defined
 
 # appease some PHP build assumpsions
 CFLAGS+=       -I${BUILDLINK_DIR}/include/libxml2 \
-               -I${BUILDLINK_DIR}/include/php/ext/date/lib
+               -I${BUILDLINK_DIR}/${PHP_INCDIR}/ext/date/lib
 
 .include "../../lang/php/phpversion.mk"
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/textproc/php-xsl/Makefile
diff -u pkgsrc/textproc/php-xsl/Makefile:1.23 pkgsrc/textproc/php-xsl/Makefile:1.24
--- pkgsrc/textproc/php-xsl/Makefile:1.23       Thu Nov 14 22:21:54 2024
+++ pkgsrc/textproc/php-xsl/Makefile    Sat Feb  8 03:20:14 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2024/11/14 22:21:54 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2025/02/08 03:20:14 taca Exp $
 
 MODNAME=               xsl
+PKGREVISION=           13
 CATEGORIES+=           textproc
 COMMENT=               PHP extension for XSLT functions
-PKGREVISION=           12
 
 CONFLICTS=     php-xsl-[0-9]*