summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 8862bf332c6..3fd9d369c0e 100644
--- a/databases/postgresql73/Makefile.common
+++ b/databases/postgresql73/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2005/02/05 14:49:03 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.7 2005/02/07 04:27:27 dan 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-*
+CONFLICTS+= postgresql-[0-9]* postgresql74-* postgresql80-*
DISTINFO_FILE?= ${.CURDIR}/../postgresql73/distinfo
COMMON_FILESDIR?= ${.CURDIR}/../postgresql73/files
diff --git a/databases/postgresql74/Makefile.common b/databases/postgresql74/Makefile.common
index 28893f169c3..1fbcfc6ae50 100644
--- a/databases/postgresql74/Makefile.common
+++ b/databases/postgresql74/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/02/05 14:50:52 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/02/07 04:27:28 dan 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-*
+CONFLICTS+= postgresql-[0-9]* postgresql73-* postgresql80-*
DISTINFO_FILE?= ${.CURDIR}/../postgresql74/distinfo
COMMON_FILESDIR?= ${.CURDIR}/../postgresql74/files