summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorJimmy Olgeni <olgeni@FreeBSD.org>2009-08-11 13:32:57 +0000
committerJimmy Olgeni <olgeni@FreeBSD.org>2009-08-11 13:32:57 +0000
commit49d6c1e892cb770b93d42319776332620f375823 (patch)
treebe8edf94727474a385d6ed199a210ce85ed89565 /databases
parentUpdate to 0.3.9. (diff)
USE_BISON (build) and pet portlint about CONFLICTS (a version number
is required).
Notes
Notes: svn path=/head/; revision=239320
Diffstat (limited to 'databases')
-rw-r--r--databases/slony1/Makefile3
-rw-r--r--databases/slony1v2/Makefile3
2 files changed, 4 insertions, 2 deletions
diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile
index 25d24f80a5de..987043a23dfc 100644
--- a/databases/slony1/Makefile
+++ b/databases/slony1/Makefile
@@ -18,6 +18,7 @@ COMMENT= PostgreSQL master to multiple replicas replication system
BUILD_DEPENDS= ${LOCALBASE}/bin/postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
GNU_CONFIGURE= yes
+USE_BISON= build
USE_PGSQL= yes
USE_GMAKE= yes
USE_BZIP2= yes
@@ -28,7 +29,7 @@ SUB_LIST+= NAME=slon
OPTIONS= PERLTOOLS "Install perl configuration tools" Off
-CONFLICTS?= slony1v2-*
+CONFLICTS?= slony1v2-2*
.include <bsd.port.pre.mk>
diff --git a/databases/slony1v2/Makefile b/databases/slony1v2/Makefile
index 0e3c1d770c26..c9490ab18137 100644
--- a/databases/slony1v2/Makefile
+++ b/databases/slony1v2/Makefile
@@ -19,6 +19,7 @@ COMMENT= PostgreSQL master to multiple replicas replication system
BUILD_DEPENDS= ${LOCALBASE}/bin/postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
GNU_CONFIGURE= yes
+USE_BISON= build
USE_PGSQL= yes
USE_GMAKE= yes
USE_BZIP2= yes
@@ -29,7 +30,7 @@ SUB_LIST+= NAME=slon
OPTIONS= PERLTOOLS "Install perl configuration tools" Off
-CONFLICTS?= slony1-*
+CONFLICTS?= slony1-1*
.include <bsd.port.pre.mk>