CONFLICTS fix

This commit is contained in:
adam 2007-05-04 19:44:52 +00:00
parent 11b39cc7a2
commit 21a05ef06a
2 changed files with 9 additions and 9 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.11 2007/04/30 13:37:22 adam Exp $
# $NetBSD: Makefile.common,v 1.12 2007/05/04 19:44:52 adam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@ -20,9 +20,9 @@ MAINTAINER?= jlam@NetBSD.org
HOMEPAGE?= http://www.postgresql.org/
CONFLICTS+= postgresql-[0-9]*
CONFLICTS+= postgresql73-[0-9]*
CONFLICTS+= postgresql80-[0-9]*
CONFLICTS+= postgresql82-[0-9]*
CONFLICTS+= postgresql73-*
CONFLICTS+= postgresql80-*
CONFLICTS+= postgresql82-*
DISTINFO_FILE?= ${.CURDIR}/../postgresql81/distinfo
COMMON_FILESDIR?= ${.CURDIR}/../postgresql81/files

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.5 2007/04/30 13:37:00 adam Exp $
# $NetBSD: Makefile.common,v 1.6 2007/05/04 19:45:52 adam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@ -20,10 +20,10 @@ MAINTAINER?= adam@NetBSD.org
HOMEPAGE?= http://www.postgresql.org/
CONFLICTS+= postgresql-[0-9]*
CONFLICTS+= postgresql73-[0-9]*
CONFLICTS+= postgresql74-[0-9]*
CONFLICTS+= postgresql80-[0-9]*
CONFLICTS+= postgresql81-[0-9]*
CONFLICTS+= postgresql73-*
CONFLICTS+= postgresql74-*
CONFLICTS+= postgresql80-*
CONFLICTS+= postgresql81-*
DISTINFO_FILE?= ${.CURDIR}/../postgresql82/distinfo
COMMON_FILESDIR?= ${.CURDIR}/../postgresql82/files