CVS commit: pkgsrc/databases

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Wed Apr  2 12:27:43 UTC 2025

Modified Files:
        pkgsrc/databases/postgresql17: Makefile.common
        pkgsrc/databases/postgresql17-client: Makefile
        pkgsrc/databases/postgresql17-contrib: Makefile
        pkgsrc/databases/postgresql17-docs: Makefile
        pkgsrc/databases/postgresql17-plperl: Makefile
        pkgsrc/databases/postgresql17-plpython: Makefile
        pkgsrc/databases/postgresql17-pltcl: Makefile
        pkgsrc/databases/postgresql17-server: Makefile

Log Message:
Render postgresql17 CONFLICTS as harmless as those of postgresql16


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/postgresql17/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/postgresql17-client/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql17-contrib/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql17-docs/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/postgresql17-plperl/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql17-plpython/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql17-pltcl/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/postgresql17-server/Makefile

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

Modified files:

Index: pkgsrc/databases/postgresql17/Makefile.common
diff -u pkgsrc/databases/postgresql17/Makefile.common:1.7 pkgsrc/databases/postgresql17/Makefile.common:1.8
--- pkgsrc/databases/postgresql17/Makefile.common:1.7   Sun Mar 30 21:10:41 2025
+++ pkgsrc/databases/postgresql17/Makefile.common       Wed Apr  2 12:27:42 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2025/03/30 21:10:41 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2025/04/02 12:27:42 prlw1 Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -30,7 +30,7 @@ CONFLICTS+=   postgresql[2-9][0-9]-[0-9]*
 
 .if !empty(PKGNAME:M*-*-*)
 module=                ${PKGNAME:C/-[0-9].*$//:C/^.*-//}
-CONFLICTS+=    postgresql[1-9][0-9]-${module}-[0-9]*
+CONFLICTS+=    postgresql[2-9][0-9]-${module}-[0-9]*
 .endif
 
 DISTINFO_FILE?=                ${.CURDIR}/../../databases/postgresql17/distinfo

Index: pkgsrc/databases/postgresql17-client/Makefile
diff -u pkgsrc/databases/postgresql17-client/Makefile:1.4 pkgsrc/databases/postgresql17-client/Makefile:1.5
--- pkgsrc/databases/postgresql17-client/Makefile:1.4   Sun Mar 30 21:10:41 2025
+++ pkgsrc/databases/postgresql17-client/Makefile       Wed Apr  2 12:27:42 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2025/03/30 21:10:41 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2025/04/02 12:27:42 prlw1 Exp $
 
 PKGNAME=       ${DISTNAME:S/-/17-client-/}
+PKGREVISION=   1
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql17/Makefile.common"

Index: pkgsrc/databases/postgresql17-contrib/Makefile
diff -u pkgsrc/databases/postgresql17-contrib/Makefile:1.3 pkgsrc/databases/postgresql17-contrib/Makefile:1.4
--- pkgsrc/databases/postgresql17-contrib/Makefile:1.3  Sat Nov 16 10:13:52 2024
+++ pkgsrc/databases/postgresql17-contrib/Makefile      Wed Apr  2 12:27:43 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2024/11/16 10:13:52 adam Exp $
+# $NetBSD: Makefile,v 1.4 2025/04/02 12:27:43 prlw1 Exp $
 
 PKGNAME=       ${DISTNAME:S/-/17-contrib-/}
+PKGREVISION=   1
 COMMENT=       Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql17/Makefile.common"

Index: pkgsrc/databases/postgresql17-docs/Makefile
diff -u pkgsrc/databases/postgresql17-docs/Makefile:1.3 pkgsrc/databases/postgresql17-docs/Makefile:1.4
--- pkgsrc/databases/postgresql17-docs/Makefile:1.3     Sat Nov 16 10:13:52 2024
+++ pkgsrc/databases/postgresql17-docs/Makefile Wed Apr  2 12:27:43 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2024/11/16 10:13:52 adam Exp $
+# $NetBSD: Makefile,v 1.4 2025/04/02 12:27:43 prlw1 Exp $
 
 PKGNAME=       ${DISTNAME:S/-/17-docs-/}
+PKGREVISION=   1
 COMMENT=       PostgreSQL database documentation
 
 .include "../../databases/postgresql17/Makefile.common"

Index: pkgsrc/databases/postgresql17-plperl/Makefile
diff -u pkgsrc/databases/postgresql17-plperl/Makefile:1.5 pkgsrc/databases/postgresql17-plperl/Makefile:1.6
--- pkgsrc/databases/postgresql17-plperl/Makefile:1.5   Mon Nov 25 20:13:26 2024
+++ pkgsrc/databases/postgresql17-plperl/Makefile       Wed Apr  2 12:27:43 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2024/11/25 20:13:26 adam Exp $
+# $NetBSD: Makefile,v 1.6 2025/04/02 12:27:43 prlw1 Exp $
 
 PKGNAME=       ${DISTNAME:S/-/17-plperl-/}
+PKGREVISION=   1
 COMMENT=       PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=      postgresql17-server>=${PKGVERSION_NOREV}:../../databases/postgresql17-server

Index: pkgsrc/databases/postgresql17-plpython/Makefile
diff -u pkgsrc/databases/postgresql17-plpython/Makefile:1.3 pkgsrc/databases/postgresql17-plpython/Makefile:1.4
--- pkgsrc/databases/postgresql17-plpython/Makefile:1.3 Sat Nov 16 10:13:52 2024
+++ pkgsrc/databases/postgresql17-plpython/Makefile     Wed Apr  2 12:27:43 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2024/11/16 10:13:52 adam Exp $
+# $NetBSD: Makefile,v 1.4 2025/04/02 12:27:43 prlw1 Exp $
 
 PKGNAME=       ${DISTNAME:S/-/17-plpython-/}
+PKGREVISION=   1
 COMMENT=       PL/Python procedural language for the PostgreSQL backend
 
 DEPENDS+=      postgresql17-server>=${PKGVERSION_NOREV}:../../databases/postgresql17-server

Index: pkgsrc/databases/postgresql17-pltcl/Makefile
diff -u pkgsrc/databases/postgresql17-pltcl/Makefile:1.3 pkgsrc/databases/postgresql17-pltcl/Makefile:1.4
--- pkgsrc/databases/postgresql17-pltcl/Makefile:1.3    Sat Nov 16 10:13:52 2024
+++ pkgsrc/databases/postgresql17-pltcl/Makefile        Wed Apr  2 12:27:43 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2024/11/16 10:13:52 adam Exp $
+# $NetBSD: Makefile,v 1.4 2025/04/02 12:27:43 prlw1 Exp $
 
 PKGNAME=       ${DISTNAME:S/-/17-pltcl-/}
+PKGREVISION=   1
 COMMENT=       PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=      postgresql17-server>=${PKGVERSION_NOREV}:../../databases/postgresql17-server

Index: pkgsrc/databases/postgresql17-server/Makefile
diff -u pkgsrc/databases/postgresql17-server/Makefile:1.4 pkgsrc/databases/postgresql17-server/Makefile:1.5
--- pkgsrc/databases/postgresql17-server/Makefile:1.4   Sat Nov 16 10:13:52 2024
+++ pkgsrc/databases/postgresql17-server/Makefile       Wed Apr  2 12:27:43 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2024/11/16 10:13:52 adam Exp $
+# $NetBSD: Makefile,v 1.5 2025/04/02 12:27:43 prlw1 Exp $
 
 PKGNAME=       ${DISTNAME:S/-/17-server-/}
+PKGREVISION=   1
 COMMENT=       PostgreSQL database server programs
 
 # mips has no TAS implementation