summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2006-01-08 13:41:29 +0000
committerabs <abs@pkgsrc.org>2006-01-08 13:41:29 +0000
commit6a623f016af074c81525ec53fca63469f4632b70 (patch)
tree774d27c92897ce4bec2ef02e101f8cf02d25c89a /databases
parentb0529eaf75d5cf068f0cab716fc827b5855243a7 (diff)
downloadpkgsrc-6a623f016af074c81525ec53fca63469f4632b70.tar.gz
conflict with postgres81
Diffstat (limited to 'databases')
-rw-r--r--databases/postgresql73/Makefile.common4
-rw-r--r--databases/postgresql74/Makefile.common4
2 files changed, 4 insertions, 4 deletions
diff --git a/databases/postgresql73/Makefile.common b/databases/postgresql73/Makefile.common
index 5a1e811d2b7..b086d8f0bc6 100644
--- a/databases/postgresql73/Makefile.common
+++ b/databases/postgresql73/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2005/12/05 23:55:04 rillig Exp $
+# $NetBSD: Makefile.common,v 1.14 2006/01/08 13:41:29 abs Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -21,7 +21,7 @@ MASTER_SITES?= http://www.postgresql.org/ftpsite/source/v${DIST_VERS}/ \
MAINTAINER?= tech-pkg@NetBSD.org
HOMEPAGE?= http://www.postgresql.org/
-CONFLICTS+= postgresql-[0-9]* postgresql74-* postgresql80-*
+CONFLICTS+= postgresql-[0-9]* postgresql74-* postgresql80-* postgresql81-*
DISTINFO_FILE?= ${.CURDIR}/../postgresql73/distinfo
COMMON_FILESDIR?= ${.CURDIR}/../postgresql73/files
diff --git a/databases/postgresql74/Makefile.common b/databases/postgresql74/Makefile.common
index 1726370a476..02d6e035855 100644
--- a/databases/postgresql74/Makefile.common
+++ b/databases/postgresql74/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2005/12/05 23:55:04 rillig Exp $
+# $NetBSD: Makefile.common,v 1.29 2006/01/08 13:41:29 abs Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -24,7 +24,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER?= recht@NetBSD.org
HOMEPAGE?= http://www.postgresql.org/
-CONFLICTS+= postgresql-[0-9]* postgresql73-* postgresql80-*
+CONFLICTS+= postgresql-[0-9]* postgresql73-* postgresql80-* postgresql81-*
DISTINFO_FILE?= ${.CURDIR}/../postgresql74/distinfo
COMMON_FILESDIR?= ${.CURDIR}/../postgresql74/files