aboutsummaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorJose Alonso Cardenas Marquez <acm@FreeBSD.org>2012-08-09 19:48:14 +0000
committerJose Alonso Cardenas Marquez <acm@FreeBSD.org>2012-08-09 19:48:14 +0000
commita39410a82b49c400514019a6d032424bf97f9d1d (patch)
tree5b117d995ef86789f19cd7c23226150c82df711a /databases
parentd9852fb0c7772cc8b4a0364c80199c5be5ee7da7 (diff)
downloadports-a39410a82b49c400514019a6d032424bf97f9d1d.tar.gz
ports-a39410a82b49c400514019a6d032424bf97f9d1d.zip
Notes
Diffstat (limited to 'databases')
-rw-r--r--databases/firebird25-server/Makefile7
-rw-r--r--databases/firebird25-server/files/pkg-message.in8
-rw-r--r--databases/firebird25-server/pkg-plist2
3 files changed, 12 insertions, 5 deletions
diff --git a/databases/firebird25-server/Makefile b/databases/firebird25-server/Makefile
index 4c139e29d930..94f892a9f930 100644
--- a/databases/firebird25-server/Makefile
+++ b/databases/firebird25-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= firebird
PORTVERSION= 2.5.1
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.0//}-Release/
PKGNAMESUFFIX?= -server
@@ -82,7 +82,7 @@ USE_RC_SUBR= firebird
SUB_FILES= pkg-install pkg-message
UTIL_SBIN= fb_inet_server fb_lock_print fb_smp_server
-UTIL_BIN= fbguard fbstat fbsvcmgr fbtracemgr gbak gdef gfix gsec gsplit \
+UTIL_BIN= fbguard fbsplit fbstat fbsvcmgr fbtracemgr gbak gdef gfix gsec \
nbackup
UDF_SO= ib_udf.so fbudf.so
UDF_SQL= src/extlib/ib_udf2.sql src/extlib/fbudf/fbudf.sql
@@ -111,7 +111,8 @@ post-patch:
${FIND} ${WRKSRC} -name "*.sh" -exec ${CHMOD} +x {} \+
${REINPLACE_CMD} -e \
's|/isql|/isql-fb|g' -e \
- 's|/gstat|/fbstat|g' ${WRKSRC}/builds/posix/make.defaults
+ 's|/gstat|/fbstat|g' -e \
+ 's|/gsplit|/fbsplit|g' ${WRKSRC}/builds/posix/make.defaults
.include <bsd.port.pre.mk>
diff --git a/databases/firebird25-server/files/pkg-message.in b/databases/firebird25-server/files/pkg-message.in
index 2b644c0802a7..39f945fa3c47 100644
--- a/databases/firebird25-server/files/pkg-message.in
+++ b/databases/firebird25-server/files/pkg-message.in
@@ -26,6 +26,12 @@ before doing anything serious with Firebird.
5) See documentation in %%DOCSDIR%%/ for more information.
-6) Enjoy it ;)
+6) Some firebird tools were renamed for avoid conflicts with some other ports
+
+ %%PREFIX%%/bin/isql -> %%PREFIX%%/bin/isql-fb
+ %%PREFIX%%/bin/gstat -> %%PREFIX%%/bin/fbstat
+ %%PREFIX%%/bin/gsplit -> %%PREFIX%%/bin/fbsplit
+
+7) Enjoy it ;)
################################################################################
diff --git a/databases/firebird25-server/pkg-plist b/databases/firebird25-server/pkg-plist
index 324b1efec8ba..5d0a89dd8e80 100644
--- a/databases/firebird25-server/pkg-plist
+++ b/databases/firebird25-server/pkg-plist
@@ -1,5 +1,6 @@
@comment $FreeBSD$
bin/fbguard
+bin/fbsplit
bin/fbstat
bin/fbsvcmgr
bin/fbtracemgr
@@ -7,7 +8,6 @@ bin/gbak
bin/gdef
bin/gfix
bin/gsec
-bin/gsplit
bin/nbackup
sbin/fb_inet_server
sbin/fb_lock_print