From owner-svn-ports-all@FreeBSD.ORG  Thu Aug  9 19:48:15 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3C625106566C;
	Thu,  9 Aug 2012 19:48:15 +0000 (UTC) (envelope-from acm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1E7A48FC08;
	Thu,  9 Aug 2012 19:48:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q79JmE54046232;
	Thu, 9 Aug 2012 19:48:14 GMT (envelope-from acm@svn.freebsd.org)
Received: (from acm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q79JmEgp046228;
	Thu, 9 Aug 2012 19:48:14 GMT (envelope-from acm@svn.freebsd.org)
Message-Id: <201208091948.q79JmEgp046228@svn.freebsd.org>
From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
Date: Thu, 9 Aug 2012 19:48:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r302356 - in head/databases/firebird25-server: . files
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2012 19:48:15 -0000

Author: acm
Date: Thu Aug  9 19:48:14 2012
New Revision: 302356
URL: http://svn.freebsd.org/changeset/ports/302356

Log:
  - Rename gsplit to fbsplit for avoid conflict with sysutils/coreutils port
  - Add entry to pkg-message
  - Bump PORTREVISION
  
  PR:		ports/170329
  Submitted by:	Alfred Bartsch <bartsch   at  dssgmbh.de>

Modified:
  head/databases/firebird25-server/Makefile
  head/databases/firebird25-server/files/pkg-message.in
  head/databases/firebird25-server/pkg-plist

Modified: head/databases/firebird25-server/Makefile
==============================================================================
--- head/databases/firebird25-server/Makefile	Thu Aug  9 19:47:19 2012	(r302355)
+++ head/databases/firebird25-server/Makefile	Thu Aug  9 19:48:14 2012	(r302356)
@@ -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>
 

Modified: head/databases/firebird25-server/files/pkg-message.in
==============================================================================
--- head/databases/firebird25-server/files/pkg-message.in	Thu Aug  9 19:47:19 2012	(r302355)
+++ head/databases/firebird25-server/files/pkg-message.in	Thu Aug  9 19:48:14 2012	(r302356)
@@ -26,6 +26,12 @@ before doing anything serious with Fireb
 
 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 ;)
 
 ################################################################################

Modified: head/databases/firebird25-server/pkg-plist
==============================================================================
--- head/databases/firebird25-server/pkg-plist	Thu Aug  9 19:47:19 2012	(r302355)
+++ head/databases/firebird25-server/pkg-plist	Thu Aug  9 19:48:14 2012	(r302356)
@@ -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