From owner-freebsd-ports@FreeBSD.ORG Wed Jun 18 12:39:12 2003 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C8C237B401 for ; Wed, 18 Jun 2003 12:39:12 -0700 (PDT) Received: from freebsd.org.ru (freebsd.org.ru [194.84.67.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F45A43FB1 for ; Wed, 18 Jun 2003 12:39:11 -0700 (PDT) (envelope-from osa@freebsd.org.ru) Received: by freebsd.org.ru (Postfix, from userid 1000) id 4B05B2E3; Wed, 18 Jun 2003 23:39:10 +0400 (MSD) Date: Wed, 18 Jun 2003 23:39:10 +0400 From: "Sergey A. Osokin" To: freebsd-ports@FreeBSD.org Message-ID: <20030618193910.GW86248@freebsd.org.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="oPmsXEqKQNHCSXW7" Content-Disposition: inline User-Agent: Mutt/1.5.4i Subject: little heads up (for gigabase users) X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2003 19:39:12 -0000 --oPmsXEqKQNHCSXW7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello. I'm planning to commit following patch for databases/gigabase. It fix problem with database/fastdb port. Both ports have a subsql and libcli_r.[a.so], but tool and libraries of ports are 1) uncompatible 2) have the same names Thanks. -- Rgdz, /"\ ASCII RIBBON CAMPAIGN Sergey Osokin aka oZZ, \ / AGAINST HTML MAIL http://ozz.pp.ru/ X AND NEWS / \ --oPmsXEqKQNHCSXW7 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-gigabase Index: ports/databases/gigabase/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/gigabase/Makefile,v retrieving revision 1.52 diff -u -r1.52 Makefile --- ports/databases/gigabase/Makefile 10 Jun 2003 13:06:58 -0000 1.52 +++ ports/databases/gigabase/Makefile 18 Jun 2003 16:30:47 -0000 @@ -7,6 +7,7 @@ PORTNAME= gigabase PORTVERSION= 2.90 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= http://www.garret.ru/~knizhnik/ Index: ports/databases/gigabase/pkg-plist =================================================================== RCS file: /home/pcvs/ports/databases/gigabase/pkg-plist,v retrieving revision 1.5 diff -u -r1.5 pkg-plist --- ports/databases/gigabase/pkg-plist 20 Nov 2002 12:24:10 -0000 1.5 +++ ports/databases/gigabase/pkg-plist 18 Jun 2003 16:30:20 -0000 @@ -1,4 +1,4 @@ -bin/subsql +bin/subsql_gb include/gigabase/array.h include/gigabase/blob.h include/gigabase/btree.h @@ -19,9 +19,9 @@ include/gigabase/stdtp.h include/gigabase/sync.h include/gigabase/wwwapi.h -lib/libcli_r.a -lib/libcli_r.so -lib/libcli_r.so.2 +lib/libcligb_r.a +lib/libcligb_r.so +lib/libcligb_r.so.2 lib/libgigabase_r.a lib/libgigabase_r.so lib/libgigabase_r.so.2 Index: ports/databases/gigabase/files/patch-aa =================================================================== RCS file: /home/pcvs/ports/databases/gigabase/files/patch-aa,v retrieving revision 1.5 diff -u -r1.5 patch-aa --- ports/databases/gigabase/files/patch-aa 20 Nov 2002 12:24:10 -0000 1.5 +++ ports/databases/gigabase/files/patch-aa 18 Jun 2003 16:30:00 -0000 @@ -1,5 +1,5 @@ ---- Makefile.in.orig Wed Nov 6 01:30:34 2002 -+++ Makefile.in Mon Nov 11 20:07:30 2002 +--- Makefile.in.orig Sat May 3 20:35:46 2003 ++++ Makefile.in Wed Jun 18 20:04:48 2003 @@ -7,6 +7,8 @@ VPATH = @srcdir@ LIBTOOL = $(srcdir)/libtool @@ -9,6 +9,15 @@ # Coment this for AIX/xlC 5.0 LIBEXT=la +@@ -41,7 +43,7 @@ + SUFF=@SUFF@ + + GB_LIB = libgigabase$(SUFF).${LIBEXT} +-CLI_LIB = libcli$(SUFF).${LIBEXT} ++CLI_LIB = libcligb$(SUFF).${LIBEXT} + EXES = subsql + + EXAMPLES = guess testdb testjoin testddl testperf testspat testperf2 testsync testiref testtrav testidx testidx2 clitest testblob testleak @@ -49,7 +51,7 @@ CXX = @CXX@ @@ -29,10 +38,10 @@ mkdir -p $(bindir) if test -x .libs/subsql ; then \ - cp .libs/subsql $(bindir); \ -+ $(INSTALL_PROGRAM) .libs/subsql $(bindir); \ ++ $(INSTALL_PROGRAM) .libs/subsql $(bindir)/subsql_gb; \ else \ - cp subsql $(bindir); \ -+ $(INSTALL_PROGRAM) subsql $(bindir); \ ++ $(INSTALL_PROGRAM) subsql $(bindir)/subsql_gb; \ fi # strip $(bindir)/subsql --oPmsXEqKQNHCSXW7--