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: jperkin
Date: Wed May 14 15:54:26 UTC 2025
Modified Files:
pkgsrc/lang/php56: Makefile
pkgsrc/lang/php74: Makefile
pkgsrc/lang/php81: Makefile
pkgsrc/lang/php82: Makefile
pkgsrc/lang/php83: Makefile
pkgsrc/lang/php84: Makefile
Log Message:
php*: Improve SUPERSEDES matches.
By using a generic catch-all of php-[0-9]* it was impossible for tools to
correctly determine what package should be the successor when there are
multiple to choose from.
Matching against exact versions will mean that improved SUPERSEDES handling
in the next version of pkgin should hopefully be able to support upgrades
Past the php renovation. At least with a hand-modified pkgin.db and a test
pkgin binary it correctly detects the php-8.2.26 => php82-8.2.28nb1 rename.
Bump PKGREVISION for each.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/lang/php56/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/php74/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/php81/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/php82/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/php83/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/php84/Makefile
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.41 pkgsrc/lang/php56/Makefile:1.42
--- pkgsrc/lang/php56/Makefile:1.41 Thu Apr 17 21:51:22 2025
+++ pkgsrc/lang/php56/Makefile Wed May 14 15:54:26 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.41 2025/04/17 21:51:22 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2025/05/14 15:54:26 jperkin Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
COMMENT= PHP Hypertext Preprocessor version 5.6
@@ -18,7 +18,7 @@ LIBTOOL_OVERRIDE= # empty
PHP_VERSIONS_ACCEPTED= 56
CONFLICTS+= php-[0-9]*
-SUPERSEDES+= php-[0-9]*
+SUPERSEDES+= php>=5.6<5.7
.include "Makefile.php"
Index: pkgsrc/lang/php74/Makefile
diff -u pkgsrc/lang/php74/Makefile:1.28 pkgsrc/lang/php74/Makefile:1.29
--- pkgsrc/lang/php74/Makefile:1.28 Thu Apr 17 21:51:22 2025
+++ pkgsrc/lang/php74/Makefile Wed May 14 15:54:26 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2025/04/17 21:51:22 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2025/05/14 15:54:26 jperkin Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
COMMENT= PHP Hypertext Preprocessor version 7.4
@@ -18,7 +18,7 @@ LIBTOOL_OVERRIDE= # empty
PHP_VERSIONS_ACCEPTED= 74
CONFLICTS+= php-[0-9]*
-SUPERSEDES+= php-[0-9]*
+SUPERSEDES+= php>=7.4<7.5
.include "Makefile.php"
Index: pkgsrc/lang/php81/Makefile
diff -u pkgsrc/lang/php81/Makefile:1.30 pkgsrc/lang/php81/Makefile:1.31
--- pkgsrc/lang/php81/Makefile:1.30 Thu Apr 17 21:51:22 2025
+++ pkgsrc/lang/php81/Makefile Wed May 14 15:54:26 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2025/04/17 21:51:22 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2025/05/14 15:54:26 jperkin Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
COMMENT= PHP Hypertext Preprocessor version 8.1
@@ -18,7 +18,7 @@ LIBTOOL_OVERRIDE= # empty
PHP_VERSIONS_ACCEPTED= 81
CONFLICTS+= php-[0-9]*
-SUPERSEDES+= php-[0-9]*
+SUPERSEDES+= php>=8.1<8.2
.include "Makefile.php"
Index: pkgsrc/lang/php82/Makefile
diff -u pkgsrc/lang/php82/Makefile:1.17 pkgsrc/lang/php82/Makefile:1.18
--- pkgsrc/lang/php82/Makefile:1.17 Thu Apr 17 21:51:22 2025
+++ pkgsrc/lang/php82/Makefile Wed May 14 15:54:26 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2025/04/17 21:51:22 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2025/05/14 15:54:26 jperkin Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
COMMENT= PHP Hypertext Preprocessor version 8.2
@@ -18,7 +18,7 @@ LIBTOOL_OVERRIDE= # empty
PHP_VERSIONS_ACCEPTED= 82
CONFLICTS+= php-[0-9]*
-SUPERSEDES+= php-[0-9]*
+SUPERSEDES+= php>=8.2<8.3
.include "Makefile.php"
Index: pkgsrc/lang/php83/Makefile
diff -u pkgsrc/lang/php83/Makefile:1.12 pkgsrc/lang/php83/Makefile:1.13
--- pkgsrc/lang/php83/Makefile:1.12 Thu Apr 17 21:51:22 2025
+++ pkgsrc/lang/php83/Makefile Wed May 14 15:54:26 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2025/04/17 21:51:22 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2025/05/14 15:54:26 jperkin Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
COMMENT= PHP Hypertext Preprocessor version 8.3
@@ -18,7 +18,7 @@ LIBTOOL_OVERRIDE= # empty
PHP_VERSIONS_ACCEPTED= 83
CONFLICTS+= php-[0-9]*
-SUPERSEDES+= php-[0-9]*
+SUPERSEDES+= php>=8.3<8.4
.include "Makefile.php"
Index: pkgsrc/lang/php84/Makefile
diff -u pkgsrc/lang/php84/Makefile:1.2 pkgsrc/lang/php84/Makefile:1.3
--- pkgsrc/lang/php84/Makefile:1.2 Thu Apr 17 21:51:22 2025
+++ pkgsrc/lang/php84/Makefile Wed May 14 15:54:26 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2025/04/17 21:51:22 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2025/05/14 15:54:26 jperkin Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
COMMENT= PHP Hypertext Preprocessor version 8.4
@@ -18,7 +18,7 @@ LIBTOOL_OVERRIDE= # empty
PHP_VERSIONS_ACCEPTED= 84
CONFLICTS+= php-[0-9]*
-SUPERSEDES+= php-[0-9]*
+SUPERSEDES+= php>=8.4<8.5
.include "Makefile.php"
Home |
Main Index |
Thread Index |
Old Index