[pkgsrc/trunk]: pkgsrc/databases Register self-CONFLICTS between postgresql m...

[cheusov <cheusov%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7759cbc701f6
branches:  trunk
changeset: 610226:7759cbc701f6
user:      cheusov <cheusov%pkgsrc.org@localhost>
date:      Sun Oct 21 13:52:15 2012 +0000

description:
Register self-CONFLICTS between postgresql modules.
This also fixes some minor pkglint warnings.

diffstat:

 databases/postgresql83/Makefile.common |   8 +++++++-
 databases/postgresql84/Makefile.common |   8 +++++++-
 databases/postgresql90/Makefile.common |  12 +++++++++---
 databases/postgresql91/Makefile.common |  12 +++++++++---
 databases/postgresql92/Makefile.common |  12 +++++++++---
 5 files changed, 41 insertions(+), 11 deletions(-)

diffs (122 lines):

diff -r cbd5fb0e2ba1 -r 7759cbc701f6 databases/postgresql83/Makefile.common
--- a/databases/postgresql83/Makefile.common    Sun Oct 21 13:37:12 2012 +0000
+++ b/databases/postgresql83/Makefile.common    Sun Oct 21 13:52:15 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2012/10/05 22:28:47 adam Exp $
+# $NetBSD: Makefile.common,v 1.27 2012/10/21 13:52:15 cheusov Exp $
 #
 # used by databases/postgresql83-adminpack/Makefile
 # used by databases/postgresql83-client/Makefile
@@ -29,6 +29,12 @@
 CONFLICTS+=    postgresql8[0-24-9]-*
 CONFLICTS+=    postgresql9[0-9]-*
 
+.if !empty(PKGNAME:M*-*-*)
+module=                ${PKGNAME:C/-[0-9].*$//:C/^.*-//}
+CONFLICTS+=    postgresql8[0-24-9]-${module}-[0-9]*
+CONFLICTS+=    postgresql9[0-9]-${module}-[0-9]*
+.endif
+
 DISTINFO_FILE?=                ${.CURDIR}/../postgresql83/distinfo
 COMMON_FILESDIR?=      ${.CURDIR}/../postgresql83/files
 PATCHDIR?=             ${.CURDIR}/../postgresql83/patches
diff -r cbd5fb0e2ba1 -r 7759cbc701f6 databases/postgresql84/Makefile.common
--- a/databases/postgresql84/Makefile.common    Sun Oct 21 13:37:12 2012 +0000
+++ b/databases/postgresql84/Makefile.common    Sun Oct 21 13:52:15 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2012/10/05 22:15:35 adam Exp $
+# $NetBSD: Makefile.common,v 1.23 2012/10/21 13:52:15 cheusov Exp $
 #
 # used by databases/postgresql84-adminpack/Makefile
 # used by databases/postgresql84-client/Makefile
@@ -31,6 +31,12 @@
 CONFLICTS+=    postgresql8[0-3]-*
 CONFLICTS+=    postgresql9[0-9]-*
 
+.if !empty(PKGNAME:M*-*-*)
+module=                ${PKGNAME:C/-[0-9].*$//:C/^.*-//}
+CONFLICTS+=    postgresql8[0-35-9]-${module}-[0-9]*
+CONFLICTS+=    postgresql9[0-9]-${module}-[0-9]*
+.endif
+
 DISTINFO_FILE?=                ${.CURDIR}/../postgresql84/distinfo
 COMMON_FILESDIR?=      ${.CURDIR}/../postgresql84/files
 PATCHDIR?=             ${.CURDIR}/../postgresql84/patches
diff -r cbd5fb0e2ba1 -r 7759cbc701f6 databases/postgresql90/Makefile.common
--- a/databases/postgresql90/Makefile.common    Sun Oct 21 13:37:12 2012 +0000
+++ b/databases/postgresql90/Makefile.common    Sun Oct 21 13:52:15 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2012/10/05 22:15:36 adam Exp $
+# $NetBSD: Makefile.common,v 1.21 2012/10/21 13:52:15 cheusov Exp $
 #
 # used by databases/postgresql90-adminpack/Makefile
 # used by databases/postgresql90-client/Makefile
@@ -31,8 +31,14 @@
 LICENSE=       postgresql-license
 
 CONFLICTS+=    postgresql-[0-9]*
-CONFLICTS+=    postgresql[0-8][0-9]-*
-CONFLICTS+=    postgresql9[1-9]-*
+CONFLICTS+=    postgresql[0-8][0-9]-[0-9]*
+CONFLICTS+=    postgresql9[1-9]-[0-9]*
+
+.if !empty(PKGNAME:M*-*-*)
+module=                ${PKGNAME:C/-[0-9].*$//:C/^.*-//}
+CONFLICTS+=    postgresql[0-8][0-9]-${module}-[0-9]*
+CONFLICTS+=    postgresql9[1-9]-${module}-[0-9]*
+.endif
 
 DISTINFO_FILE?=                ${.CURDIR}/../../databases/postgresql90/distinfo
 COMMON_FILESDIR?=      ${.CURDIR}/../../databases/postgresql90/files
diff -r cbd5fb0e2ba1 -r 7759cbc701f6 databases/postgresql91/Makefile.common
--- a/databases/postgresql91/Makefile.common    Sun Oct 21 13:37:12 2012 +0000
+++ b/databases/postgresql91/Makefile.common    Sun Oct 21 13:52:15 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2012/10/05 22:15:36 adam Exp $
+# $NetBSD: Makefile.common,v 1.11 2012/10/21 13:52:15 cheusov Exp $
 #
 # used by databases/postgresql91-adminpack/Makefile
 # used by databases/postgresql91-client/Makefile
@@ -31,8 +31,14 @@
 LICENSE=       postgresql-license
 
 CONFLICTS+=    postgresql-[0-9]*
-CONFLICTS+=    postgresql[0-8][0-9]-*
-CONFLICTS+=    postgresql9[02-9]-*
+CONFLICTS+=    postgresql[0-8][0-9]-[0-9]*
+CONFLICTS+=    postgresql9[02-9]-[0-9]*
+
+.if !empty(PKGNAME:M*-*-*)
+module=                ${PKGNAME:C/-[0-9].*$//:C/^.*-//}
+CONFLICTS+=    postgresql[0-8][0-9]-${module}-[0-9]*
+CONFLICTS+=    postgresql9[02-9]-${module}-[0-9]*
+.endif
 
 DISTINFO_FILE?=                ${.CURDIR}/../../databases/postgresql91/distinfo
 COMMON_FILESDIR?=      ${.CURDIR}/../../databases/postgresql91/files
diff -r cbd5fb0e2ba1 -r 7759cbc701f6 databases/postgresql92/Makefile.common
--- a/databases/postgresql92/Makefile.common    Sun Oct 21 13:37:12 2012 +0000
+++ b/databases/postgresql92/Makefile.common    Sun Oct 21 13:52:15 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2012/10/05 21:03:10 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2012/10/21 13:52:15 cheusov Exp $
 #
 # used by databases/postgresql92-adminpack/Makefile
 # used by databases/postgresql92-client/Makefile
@@ -31,8 +31,14 @@
 LICENSE=       postgresql-license
 
 CONFLICTS+=    postgresql-[0-9]*
-CONFLICTS+=    postgresql[0-8][0-9]-*
-CONFLICTS+=    postgresql9[013-9]-*
+CONFLICTS+=    postgresql[0-8][0-9]-[0-9]*
+CONFLICTS+=    postgresql9[013-9]-[0-9]*
+
+.if !empty(PKGNAME:M*-*-*)
+module=                ${PKGNAME:C/-[0-9].*$//:C/^.*-//}
+CONFLICTS+=    postgresql[0-8][0-9]-${module}-[0-9]*
+CONFLICTS+=    postgresql9[013-9]-${module}-[0-9]*
+.endif
 
 DISTINFO_FILE?=                ${.CURDIR}/../../databases/postgresql92/distinfo
 COMMON_FILESDIR?=      ${.CURDIR}/../../databases/postgresql92/files