pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/databases
Module Name: pkgsrc
Committed By: jperkin
Date: Fri May 23 12:51:41 UTC 2025
Modified Files:
pkgsrc/databases/postgresql13: Makefile.common
pkgsrc/databases/postgresql14: Makefile.common
pkgsrc/databases/postgresql15: Makefile.common
pkgsrc/databases/postgresql16: Makefile.common
pkgsrc/databases/postgresql17: Makefile.common
Log Message:
postgresql*: Add missing CONFLICTS patterns.
For some reason the version-specific patterns were dropped since the
postgresql10 import and cargo-culted around since then. With this, the
latest pkgin is able to correctly upgrade php??-extensions from 2023Q4.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/databases/postgresql13/Makefile.common
cvs rdiff -u -r1.23 -r1.24 pkgsrc/databases/postgresql14/Makefile.common
cvs rdiff -u -r1.17 -r1.18 pkgsrc/databases/postgresql15/Makefile.common
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/postgresql16/Makefile.common
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/postgresql17/Makefile.common
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/databases/postgresql13/Makefile.common
diff -u pkgsrc/databases/postgresql13/Makefile.common:1.30 pkgsrc/databases/postgresql13/Makefile.common:1.31
--- pkgsrc/databases/postgresql13/Makefile.common:1.30 Fri May 9 13:46:30 2025
+++ pkgsrc/databases/postgresql13/Makefile.common Fri May 23 12:51:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2025/05/09 13:46:30 adam Exp $
+# $NetBSD: Makefile.common,v 1.31 2025/05/23 12:51:40 jperkin Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -26,10 +26,12 @@ HOMEPAGE= https://www.postgresql.org/
LICENSE= postgresql-license
CONFLICTS+= postgresql-[0-9]*
+CONFLICTS+= postgresql1[0-24-9]-[0-9]*
CONFLICTS+= postgresql[2-9][0-9]-[0-9]*
.if !empty(PKGNAME:M*-*-*)
module= ${PKGNAME:C/-[0-9].*$//:C/^.*-//}
+CONFLICTS+= postgresql1[0-24-9]-${module}-[0-9]*
CONFLICTS+= postgresql[2-9][0-9]-${module}-[0-9]*
.endif
Index: pkgsrc/databases/postgresql14/Makefile.common
diff -u pkgsrc/databases/postgresql14/Makefile.common:1.23 pkgsrc/databases/postgresql14/Makefile.common:1.24
--- pkgsrc/databases/postgresql14/Makefile.common:1.23 Fri May 9 13:46:31 2025
+++ pkgsrc/databases/postgresql14/Makefile.common Fri May 23 12:51:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2025/05/09 13:46:31 adam Exp $
+# $NetBSD: Makefile.common,v 1.24 2025/05/23 12:51:40 jperkin Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -26,10 +26,12 @@ HOMEPAGE= https://www.postgresql.org/
LICENSE= postgresql-license
CONFLICTS+= postgresql-[0-9]*
+CONFLICTS+= postgresql1[0-35-9]-[0-9]*
CONFLICTS+= postgresql[2-9][0-9]-[0-9]*
.if !empty(PKGNAME:M*-*-*)
module= ${PKGNAME:C/-[0-9].*$//:C/^.*-//}
+CONFLICTS+= postgresql1[0-35-9]-${module}-[0-9]*
CONFLICTS+= postgresql[2-9][0-9]-${module}-[0-9]*
.endif
Index: pkgsrc/databases/postgresql15/Makefile.common
diff -u pkgsrc/databases/postgresql15/Makefile.common:1.17 pkgsrc/databases/postgresql15/Makefile.common:1.18
--- pkgsrc/databases/postgresql15/Makefile.common:1.17 Fri May 9 13:46:32 2025
+++ pkgsrc/databases/postgresql15/Makefile.common Fri May 23 12:51:41 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2025/05/09 13:46:32 adam Exp $
+# $NetBSD: Makefile.common,v 1.18 2025/05/23 12:51:41 jperkin Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -26,10 +26,12 @@ HOMEPAGE= https://www.postgresql.org/
LICENSE= postgresql-license
CONFLICTS+= postgresql-[0-9]*
+CONFLICTS+= postgresql1[0-46-9]-[0-9]*
CONFLICTS+= postgresql[2-9][0-9]-[0-9]*
.if !empty(PKGNAME:M*-*-*)
module= ${PKGNAME:C/-[0-9].*$//:C/^.*-//}
+CONFLICTS+= postgresql1[0-46-9]-${module}-[0-9]*
CONFLICTS+= postgresql[2-9][0-9]-${module}-[0-9]*
.endif
Index: pkgsrc/databases/postgresql16/Makefile.common
diff -u pkgsrc/databases/postgresql16/Makefile.common:1.15 pkgsrc/databases/postgresql16/Makefile.common:1.16
--- pkgsrc/databases/postgresql16/Makefile.common:1.15 Fri May 9 13:46:33 2025
+++ pkgsrc/databases/postgresql16/Makefile.common Fri May 23 12:51:41 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2025/05/09 13:46:33 adam Exp $
+# $NetBSD: Makefile.common,v 1.16 2025/05/23 12:51:41 jperkin Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -26,10 +26,12 @@ HOMEPAGE= https://www.postgresql.org/
LICENSE= postgresql-license
CONFLICTS+= postgresql-[0-9]*
+CONFLICTS+= postgresql1[0-57-9]-[0-9]*
CONFLICTS+= postgresql[2-9][0-9]-[0-9]*
.if !empty(PKGNAME:M*-*-*)
module= ${PKGNAME:C/-[0-9].*$//:C/^.*-//}
+CONFLICTS+= postgresql1[0-57-9]-${module}-[0-9]*
CONFLICTS+= postgresql[2-9][0-9]-${module}-[0-9]*
.endif
Index: pkgsrc/databases/postgresql17/Makefile.common
diff -u pkgsrc/databases/postgresql17/Makefile.common:1.11 pkgsrc/databases/postgresql17/Makefile.common:1.12
--- pkgsrc/databases/postgresql17/Makefile.common:1.11 Fri May 9 13:46:34 2025
+++ pkgsrc/databases/postgresql17/Makefile.common Fri May 23 12:51:41 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2025/05/09 13:46:34 adam Exp $
+# $NetBSD: Makefile.common,v 1.12 2025/05/23 12:51:41 jperkin Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -26,10 +26,12 @@ HOMEPAGE= https://www.postgresql.org/
LICENSE= postgresql-license
CONFLICTS+= postgresql-[0-9]*
+CONFLICTS+= postgresql1[0-689]-[0-9]*
CONFLICTS+= postgresql[2-9][0-9]-[0-9]*
.if !empty(PKGNAME:M*-*-*)
module= ${PKGNAME:C/-[0-9].*$//:C/^.*-//}
+CONFLICTS+= postgresql1[0-689]-${module}-[0-9]*
CONFLICTS+= postgresql[2-9][0-9]-${module}-[0-9]*
.endif
Home |
Main Index |
Thread Index |
Old Index