pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/lang



Module Name:    pkgsrc
Committed By:   taca
Date:           Sat May 17 05:37:25 UTC 2025

Modified Files:
        pkgsrc/lang/php56: Makefile Makefile.php
        pkgsrc/lang/php74: Makefile Makefile.php
        pkgsrc/lang/php81: Makefile Makefile.php
        pkgsrc/lang/php82: Makefile Makefile.php
        pkgsrc/lang/php83: Makefile Makefile.php
        pkgsrc/lang/php84: Makefile Makefile.php

Log Message:
lang/php{56,74,81,82,83}: explictly specify libdir and datadir

Explictly specify libdir and datadir to set PHP_LIBDIR and PHP_DATADIR
correctly.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/lang/php56/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/php56/Makefile.php
cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/php74/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/php74/Makefile.php
cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/php81/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php81/Makefile.php
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/php82/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php82/Makefile.php
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/php83/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/php83/Makefile.php
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php84/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php84/Makefile.php

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

Modified files:

Index: pkgsrc/lang/php56/Makefile
diff -u pkgsrc/lang/php56/Makefile:1.42 pkgsrc/lang/php56/Makefile:1.43
--- pkgsrc/lang/php56/Makefile:1.42     Wed May 14 15:54:26 2025
+++ pkgsrc/lang/php56/Makefile  Sat May 17 05:37:25 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.42 2025/05/14 15:54:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.43 2025/05/17 05:37:25 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            lang
 
 COMMENT=               PHP Hypertext Preprocessor version 5.6

Index: pkgsrc/lang/php56/Makefile.php
diff -u pkgsrc/lang/php56/Makefile.php:1.10 pkgsrc/lang/php56/Makefile.php:1.11
--- pkgsrc/lang/php56/Makefile.php:1.10 Sat Feb  8 02:57:59 2025
+++ pkgsrc/lang/php56/Makefile.php      Sat May 17 05:37:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.10 2025/02/08 02:57:59 taca Exp $
+# $NetBSD: Makefile.php,v 1.11 2025/05/17 05:37:25 taca Exp $
 # used by lang/php56/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -24,9 +24,10 @@ PRINT_PLIST_AWK+=    /${PHP_VER}/ { sub(/${
 CONFIGURE_ARGS+=       --program-suffix=${PHP_VER}
 CONFIGURE_ARGS+=       --with-config-file-path=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d
-CONFIGURE_ARGS+=       --with-pear=${PREFIX}/${PHP_LIBDIR}
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --libdir=${PREFIX}/${PHP_LIBDIR}
+CONFIGURE_ARGS+=       --datadir=${PREFIX}/${PHP_SHAREDIR}
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 
 CONFIGURE_ARGS+=       --with-regex=system

Index: pkgsrc/lang/php74/Makefile
diff -u pkgsrc/lang/php74/Makefile:1.29 pkgsrc/lang/php74/Makefile:1.30
--- pkgsrc/lang/php74/Makefile:1.29     Wed May 14 15:54:26 2025
+++ pkgsrc/lang/php74/Makefile  Sat May 17 05:37:25 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2025/05/14 15:54:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.30 2025/05/17 05:37:25 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            lang
 
 COMMENT=               PHP Hypertext Preprocessor version 7.4

Index: pkgsrc/lang/php74/Makefile.php
diff -u pkgsrc/lang/php74/Makefile.php:1.6 pkgsrc/lang/php74/Makefile.php:1.7
--- pkgsrc/lang/php74/Makefile.php:1.6  Sat Feb  8 02:58:55 2025
+++ pkgsrc/lang/php74/Makefile.php      Sat May 17 05:37:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.6 2025/02/08 02:58:55 taca Exp $
+# $NetBSD: Makefile.php,v 1.7 2025/05/17 05:37:25 taca Exp $
 # used by lang/php74/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -34,9 +34,10 @@ PRINT_PLIST_AWK+=    /${PHP_VER}/ { sub(/${
 CONFIGURE_ARGS+=       --program-suffix=${PHP_VER}
 CONFIGURE_ARGS+=       --with-config-file-path=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d
-CONFIGURE_ARGS+=       --with-pear=${PREFIX}/${PHP_LIBDIR}
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --libdir=${PREFIX}/${PHP_LIBDIR}
+CONFIGURE_ARGS+=       --datadir=${PREFIX}/${PHP_SHAREDIR}
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 
 CONFIGURE_ARGS+=       --without-mysqli

Index: pkgsrc/lang/php81/Makefile
diff -u pkgsrc/lang/php81/Makefile:1.31 pkgsrc/lang/php81/Makefile:1.32
--- pkgsrc/lang/php81/Makefile:1.31     Wed May 14 15:54:26 2025
+++ pkgsrc/lang/php81/Makefile  Sat May 17 05:37:25 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.31 2025/05/14 15:54:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.32 2025/05/17 05:37:25 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            lang
 
 COMMENT=               PHP Hypertext Preprocessor version 8.1

Index: pkgsrc/lang/php81/Makefile.php
diff -u pkgsrc/lang/php81/Makefile.php:1.3 pkgsrc/lang/php81/Makefile.php:1.4
--- pkgsrc/lang/php81/Makefile.php:1.3  Sat Feb  8 02:59:29 2025
+++ pkgsrc/lang/php81/Makefile.php      Sat May 17 05:37:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.3 2025/02/08 02:59:29 taca Exp $
+# $NetBSD: Makefile.php,v 1.4 2025/05/17 05:37:25 taca Exp $
 # used by lang/php81/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -34,9 +34,10 @@ PRINT_PLIST_AWK+=    /${PHP_VER}/ { sub(/${
 CONFIGURE_ARGS+=       --program-suffix=${PHP_VER}
 CONFIGURE_ARGS+=       --with-config-file-path=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d
-CONFIGURE_ARGS+=       --with-pear=${PREFIX}/${PHP_LIBDIR}
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --libdir=${PREFIX}/${PHP_LIBDIR}
+CONFIGURE_ARGS+=       --datadir=${PREFIX}/${PHP_SHAREDIR}
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 
 CONFIGURE_ARGS+=       --without-mysqli

Index: pkgsrc/lang/php82/Makefile
diff -u pkgsrc/lang/php82/Makefile:1.18 pkgsrc/lang/php82/Makefile:1.19
--- pkgsrc/lang/php82/Makefile:1.18     Wed May 14 15:54:26 2025
+++ pkgsrc/lang/php82/Makefile  Sat May 17 05:37:25 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2025/05/14 15:54:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2025/05/17 05:37:25 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            lang
 
 COMMENT=               PHP Hypertext Preprocessor version 8.2

Index: pkgsrc/lang/php82/Makefile.php
diff -u pkgsrc/lang/php82/Makefile.php:1.3 pkgsrc/lang/php82/Makefile.php:1.4
--- pkgsrc/lang/php82/Makefile.php:1.3  Sat Feb  8 02:59:45 2025
+++ pkgsrc/lang/php82/Makefile.php      Sat May 17 05:37:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.3 2025/02/08 02:59:45 taca Exp $
+# $NetBSD: Makefile.php,v 1.4 2025/05/17 05:37:25 taca Exp $
 # used by lang/php82/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -34,9 +34,10 @@ PRINT_PLIST_AWK+=    /${PHP_VER}/ { sub(/${
 CONFIGURE_ARGS+=       --program-suffix=${PHP_VER}
 CONFIGURE_ARGS+=       --with-config-file-path=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d
-CONFIGURE_ARGS+=       --with-pear=${PREFIX}/${PHP_LIBDIR}
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --libdir=${PREFIX}/${PHP_LIBDIR}
+CONFIGURE_ARGS+=       --datadir=${PREFIX}/${PHP_SHAREDIR}
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 
 CONFIGURE_ARGS+=       --without-mysqli

Index: pkgsrc/lang/php83/Makefile
diff -u pkgsrc/lang/php83/Makefile:1.13 pkgsrc/lang/php83/Makefile:1.14
--- pkgsrc/lang/php83/Makefile:1.13     Wed May 14 15:54:26 2025
+++ pkgsrc/lang/php83/Makefile  Sat May 17 05:37:25 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2025/05/14 15:54:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2025/05/17 05:37:25 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            lang
 
 COMMENT=               PHP Hypertext Preprocessor version 8.3

Index: pkgsrc/lang/php83/Makefile.php
diff -u pkgsrc/lang/php83/Makefile.php:1.4 pkgsrc/lang/php83/Makefile.php:1.5
--- pkgsrc/lang/php83/Makefile.php:1.4  Mon Apr  7 17:27:38 2025
+++ pkgsrc/lang/php83/Makefile.php      Sat May 17 05:37:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.4 2025/04/07 17:27:38 taca Exp $
+# $NetBSD: Makefile.php,v 1.5 2025/05/17 05:37:25 taca Exp $
 # used by lang/php83/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -34,9 +34,10 @@ PRINT_PLIST_AWK+=    /${PHP_VER}/ { sub(/${
 CONFIGURE_ARGS+=       --program-suffix=${PHP_VER}
 CONFIGURE_ARGS+=       --with-config-file-path=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d
-CONFIGURE_ARGS+=       --with-pear=${PREFIX}/${PHP_LIBDIR}
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --libdir=${PREFIX}/${PHP_LIBDIR}
+CONFIGURE_ARGS+=       --datadir=${PREFIX}/${PHP_SHAREDIR}
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 
 CONFIGURE_ARGS+=       --without-mysqli

Index: pkgsrc/lang/php84/Makefile
diff -u pkgsrc/lang/php84/Makefile:1.3 pkgsrc/lang/php84/Makefile:1.4
--- pkgsrc/lang/php84/Makefile:1.3      Wed May 14 15:54:26 2025
+++ pkgsrc/lang/php84/Makefile  Sat May 17 05:37:25 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2025/05/14 15:54:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2025/05/17 05:37:25 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            lang
 
 COMMENT=               PHP Hypertext Preprocessor version 8.4

Index: pkgsrc/lang/php84/Makefile.php
diff -u pkgsrc/lang/php84/Makefile.php:1.1 pkgsrc/lang/php84/Makefile.php:1.2
--- pkgsrc/lang/php84/Makefile.php:1.1  Sat Feb 22 15:27:55 2025
+++ pkgsrc/lang/php84/Makefile.php      Sat May 17 05:37:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.1 2025/02/22 15:27:55 taca Exp $
+# $NetBSD: Makefile.php,v 1.2 2025/05/17 05:37:25 taca Exp $
 # used by lang/php84/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -34,9 +34,10 @@ PRINT_PLIST_AWK+=    /${PHP_VER}/ { sub(/${
 CONFIGURE_ARGS+=       --program-suffix=${PHP_VER}
 CONFIGURE_ARGS+=       --with-config-file-path=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d
-CONFIGURE_ARGS+=       --with-pear=${PREFIX}/{PHP_LIBDIR}
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --libdir=${PREFIX}/${PHP_LIBDIR}
+CONFIGURE_ARGS+=       --datadir=${PREFIX}/${PHP_SHAREDIR}
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 
 CONFIGURE_ARGS+=       --without-mysqli



Home | Main Index | Thread Index | Old Index