diff options
| -rw-r--r-- | databases/firebird20-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/firebird20-server/Makefile | 7 | ||||
| -rw-r--r-- | databases/firebird20-server/pkg-plist.client | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/databases/firebird20-client/Makefile b/databases/firebird20-client/Makefile index 038e9a964ffe..ee737500da6b 100644 --- a/databases/firebird20-client/Makefile +++ b/databases/firebird20-client/Makefile @@ -15,6 +15,5 @@ MASTERDIR= ${.CURDIR}/../firebird20-server PLIST= ${PKGDIR}/pkg-plist.client CLIENT_ONLY= yes -CONFLICTS= unixODBC-* virtuoso-* .include "${MASTERDIR}/Makefile" diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile index fde4a5ee779a..269b653e9055 100644 --- a/databases/firebird20-server/Makefile +++ b/databases/firebird20-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= firebird PORTVERSION= 2.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= databases MASTER_SITES= SF/firebird/OldFiles PKGNAMESUFFIX?= -server @@ -77,7 +77,7 @@ ALL_TARGET= firebird_basic libfbembed embed_isql embed_gpre \ # client_gpre client_gdef client_isql client_qli extlib USE_LDCONFIG= yes -CLIENT_BIN= gpre isql qli +CLIENT_BIN= gpre isql-fb qli CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -103,6 +103,9 @@ post-patch: @${MKDIR} ${WRKSRC}/m4 ${CP} ${FILESDIR}/*.m4 ${WRKSRC}/m4 ${FIND} ${WRKSRC} -name "*.sh" -exec ${CHMOD} +x {} \+ +.if defined(CLIENT_ONLY) + ${REINPLACE_CMD} -e 's|/isql|/isql-fb|g' ${WRKSRC}/builds/posix/make.defaults +.endif .include <bsd.port.pre.mk> diff --git a/databases/firebird20-server/pkg-plist.client b/databases/firebird20-server/pkg-plist.client index 1d085133e190..c3aa7270cf22 100644 --- a/databases/firebird20-server/pkg-plist.client +++ b/databases/firebird20-server/pkg-plist.client @@ -1,6 +1,6 @@ @comment $FreeBSD$ bin/gpre -bin/isql +bin/isql-fb bin/qli include/blr.h include/ib_util.h |