diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-10-21 11:13:52 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-10-21 11:13:52 +0800 |
| commit | e4e56217dd19275b28de54376915d9538b3b9ba2 (patch) | |
| tree | fce176a8d5a05ad7aebb76c1d91cce885b9b4c21 | |
| parent | 49b45bea1fda24a938491c9be30601448b46f9ee (diff) | |
| download | marcuscom-ports-e4e56217dd19275b28de54376915d9538b3b9ba2.tar marcuscom-ports-e4e56217dd19275b28de54376915d9538b3b9ba2.tar.gz marcuscom-ports-e4e56217dd19275b28de54376915d9538b3b9ba2.tar.bz2 marcuscom-ports-e4e56217dd19275b28de54376915d9538b3b9ba2.tar.lz marcuscom-ports-e4e56217dd19275b28de54376915d9538b3b9ba2.tar.xz marcuscom-ports-e4e56217dd19275b28de54376915d9538b3b9ba2.tar.zst marcuscom-ports-e4e56217dd19275b28de54376915d9538b3b9ba2.zip | |
Do not enable firebird if there is firebird2 exists in system, which it causes
build failure.
PR: ports/115995
Submitted by: Scot Hetzel <swhetzel@gmail.com>
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9851 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | databases/libgda2/Makefile | 8 | ||||
| -rw-r--r-- | databases/libgda3/Makefile | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile index 59b787afc..1c8025189 100644 --- a/databases/libgda2/Makefile +++ b/databases/libgda2/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/libgda2/Makefile,v 1.39 2007/08/04 03:51:28 marcus Exp $ +# $MCom: ports/databases/libgda2/Makefile,v 1.40 2007/10/10 05:09:46 mezz Exp $ # PORTNAME= libgda2 @@ -60,8 +60,10 @@ WITH_MYSQL= yes WITH_LDAP=yes .endif -.if exists(${LOCALBASE}/lib/libgds.so) +.if exists(${LOCALBASE}/lib/libgds.so.1) WITH_FIREBIRD= yes +.elif exists(${LOCALBASE}/lib/libgds.so.2) +WITHOUT_FIREBIRD=yes .endif .if exists(${LOCALBASE}/lib/libtds.so) @@ -116,7 +118,7 @@ LIB_DEPENDS+= gds.1:${PORTSDIR}/databases/firebird-client CONFIGURE_ARGS+= --with-firebird=${LOCALBASE} PLIST_SUB+= FIREBIRD:="" .else -CONFIGURE_ARGS+= --without-interbase +CONFIGURE_ARGS+= --without-firebird PLIST_SUB+= FIREBIRD:="@comment " .endif diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile index e411f9814..e845a4cd9 100644 --- a/databases/libgda3/Makefile +++ b/databases/libgda3/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/libgda3/Makefile,v 1.2 2006/09/10 00:51:06 mezz Exp $ +# $MCom: ports/databases/libgda3/Makefile,v 1.4 2007/07/23 19:43:19 mezz Exp $ # PORTNAME= libgda3 @@ -58,6 +58,8 @@ WITH_LDAP=yes .if exists(${LOCALBASE}/lib/libgds.so.1) WITH_FIREBIRD= yes +.elif exists(${LOCALBASE}/lib/libgds.so.2) +WITHOUT_FIREBIRD=yes .endif .if exists(${LOCALBASE}/lib/libtds.so.2) @@ -112,7 +114,7 @@ LIB_DEPENDS+= gds.1:${PORTSDIR}/databases/firebird-client CONFIGURE_ARGS+= --with-firebird=${LOCALBASE} PLIST_SUB+= FIREBIRD:="" .else -CONFIGURE_ARGS+= --without-interbase +CONFIGURE_ARGS+= --without-firebird PLIST_SUB+= FIREBIRD:="@comment " .endif |