CVS commit: pkgsrc/lang/php74

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Dec  1 16:13:14 UTC 2024

Modified Files:
        pkgsrc/lang/php74: Makefile distinfo
        pkgsrc/lang/php74/patches: patch-configure.ac
Added Files:
        pkgsrc/lang/php74/patches: patch-build_php.m4
Removed Files:
        pkgsrc/lang/php74/patches: patch-configure

Log Message:
lang/php74: fix build problem

* Completely switch to using autoconf instead of manually patch configure.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/php74/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/lang/php74/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php74/patches/patch-build_php.m4
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/php74/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php74/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/lang/php74/Makefile
diff -u pkgsrc/lang/php74/Makefile:1.25 pkgsrc/lang/php74/Makefile:1.26
--- pkgsrc/lang/php74/Makefile:1.25     Thu Nov 14 22:20:30 2024
+++ pkgsrc/lang/php74/Makefile  Sun Dec  1 16:13:14 2024
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.25 2024/11/14 22:20:30 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2024/12/01 16:13:14 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               php-${PHP_VERSION:S/RC/rc/}
-PKGREVISION=           8
+PKGREVISION=           9
 
 COMMENT=               PHP Hypertext Preprocessor version 7.4
 LICENSE=               php
 
 TEST_TARGET=           test
 
-USE_TOOLS+=            gmake lex
+USE_TOOLS+=            autoconf gmake lex
 LIBTOOL_OVERRIDE=      # empty
 PHP_CHECK_INSTALLED=   No
 
@@ -46,7 +46,6 @@ REPLACE_PHP=          ext/phar/phar/phar.php run
 SUBST_CLASSES+=                path
 SUBST_MESSAGE.path=    Fixing common paths.
 SUBST_STAGE.path=      pre-configure
-SUBST_FILES.path=      configure
 SUBST_FILES.path+=     php.ini-development php.ini-production
 SUBST_FILES.path+=     sapi/cgi/Makefile.frag
 SUBST_VARS.path=       CGIDIR
@@ -66,6 +65,9 @@ INSTALL_UNSTRIPPED=   yes
 CFLAGS+=       -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
 .endif
 
+pre-configure:
+       cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
+
 post-install:
        cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
                ${DESTDIR}${EGDIR}

Index: pkgsrc/lang/php74/distinfo
diff -u pkgsrc/lang/php74/distinfo:1.40 pkgsrc/lang/php74/distinfo:1.41
--- pkgsrc/lang/php74/distinfo:1.40     Tue Jul 23 09:18:17 2024
+++ pkgsrc/lang/php74/distinfo  Sun Dec  1 16:13:14 2024
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.40 2024/07/23 09:18:17 jperkin Exp $
+$NetBSD: distinfo,v 1.41 2024/12/01 16:13:14 taca Exp $
 
 BLAKE2s (php-7.4.33.tar.xz) = 11ec78e0a566d33168e9867e60796f25b8edc4efa03868929251a6297021e79d
 SHA512 (php-7.4.33.tar.xz) = 499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d
 Size (php-7.4.33.tar.xz) = 10420144 bytes
 SHA1 (patch-build_libtool.m4) = 3656eb516fb14defd4b0964fe21e117c630be856
-SHA1 (patch-configure) = 5e9c9c06f6d819d5ba2832d648f41363f40f3108
-SHA1 (patch-configure.ac) = 13a720fc341d5b1975e8a91e98f761333319af7d
+SHA1 (patch-build_php.m4) = ade566ac591442ed81a7e95f0c5c679cb148f8e5
+SHA1 (patch-configure.ac) = 1be1a9d15b1c4b602c1c21025e2eea1d09e511a8
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = b0ded220ffa42b77228d66696f00212caf37b4aa
 SHA1 (patch-ext_intl_collator_collator__sort.c) = 7fdb751cabb24eb4097cfb5cf23ba217a9893530

Index: pkgsrc/lang/php74/patches/patch-configure.ac
diff -u pkgsrc/lang/php74/patches/patch-configure.ac:1.1 pkgsrc/lang/php74/patches/patch-configure.ac:1.2
--- pkgsrc/lang/php74/patches/patch-configure.ac:1.1    Tue Jul 23 09:18:17 2024
+++ pkgsrc/lang/php74/patches/patch-configure.ac        Sun Dec  1 16:13:14 2024
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure.ac,v 1.1 2024/07/23 09:18:17 jperkin Exp $
+$NetBSD: patch-configure.ac,v 1.2 2024/12/01 16:13:14 taca Exp $
 
-Don't automatically add libgcc on SunOS. Reported upstream as #75941.
+* Don't automatically add libgcc on SunOS. Reported upstream as #75941.
 
 --- configure.ac.orig  2024-07-23 08:44:26.300593600 +0000
 +++ configure.ac

Added files:

Index: pkgsrc/lang/php74/patches/patch-build_php.m4
diff -u /dev/null pkgsrc/lang/php74/patches/patch-build_php.m4:1.1
--- /dev/null   Sun Dec  1 16:13:14 2024
+++ pkgsrc/lang/php74/patches/patch-build_php.m4        Sun Dec  1 16:13:14 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-build_php.m4,v 1.1 2024/12/01 16:13:14 taca Exp $
+
+* Do not include "PKG_CONFIG*" in CONFIGURE_OPTIONS.
+
+--- build/php.m4.orig  2022-10-31 10:36:05.000000000 +0000
++++ build/php.m4
+@@ -2151,6 +2151,10 @@ EOF
+    else
+     break
+    fi
++   case "$CURRENT_ARG" in
++       \'PKG_CONFIG\=*)       CURRENT_ARG="'PKG_CONFIG=@TOOLS_PATH.pkg-config@'";;
++       \'PKG_CONFIG_LIBDIR\=*)        CURRENT_ARG="'PKG_CONFIG_LIBDIR=@PHP_PKGCONFIG_PATH@'";;
++   esac
+    $as_echo "$CURRENT_ARG \\" >>$1
+    CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG"
+   done