From owner-cvs-ports@FreeBSD.ORG  Tue Nov  8 15:44:47 2005
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
X-Original-To: cvs-ports@FreeBSD.org
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3435716A41F;
	Tue,  8 Nov 2005 15:44:47 +0000 (GMT)
	(envelope-from mnag@FreeBSD.org)
Received: from mail.grupos.com.br (mail.grupos.com.br [200.203.183.72])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9F3BC43D4C;
	Tue,  8 Nov 2005 15:44:46 +0000 (GMT)
	(envelope-from mnag@FreeBSD.org)
Received: from corp.grupos.com.br
	(201-3-244-86.fnsce701.e.brasiltelecom.net.br [201.3.244.86])
	by mail.grupos.com.br (Postfix) with ESMTP id 1B1C711E0A8;
	Tue,  8 Nov 2005 13:44:44 -0200 (BRST)
Received: from [150.162.166.51] (marcus.grupos.com.br [150.162.166.51])
	(Authenticated sender: marcus@corp.grupos.com.br)
	by corp.grupos.com.br (Postfix) with ESMTP id 570B6552F;
	Tue,  8 Nov 2005 13:44:43 -0200 (BRST)
Message-ID: <4370C7E6.80301@FreeBSD.org>
Date: Tue, 08 Nov 2005 13:44:38 -0200
From: Marcus Alves Grando <mnag@FreeBSD.org>
User-Agent: Thunderbird 1.5 (X11/20051107)
MIME-Version: 1.0
To: Hajimu UMEMOTO <ume@FreeBSD.org>
References: <200511080902.jA892qPW075737@repoman.freebsd.org>
	<yge1x1rrwhn.wl%ume@mahoroba.org>
In-Reply-To: <yge1x1rrwhn.wl%ume@mahoroba.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Clement Laforet <clement@FreeBSD.org>, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org, ports-committers@FreeBSD.org
Subject: Re: cvs commit: ports CHANGES ports/Mk bsd.apache.mk bsd.database.mk
 bsd.java.mk bsd.port.mk bsd.port.subdir.mk bsd.tcl.mk
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Nov 2005 15:44:47 -0000

Hajimu UMEMOTO wrote:
> Hi,
> 
>>>>>> On Tue, 8 Nov 2005 09:02:52 +0000 (UTC)
>>>>>> Clement Laforet <clement@FreeBSD.org> said:
> 
> clement>     - add support for Berkley DB and SQLite (via USE_BDB and USE_SQLITE
> clement>       knobs).
> 
> It seems there is a problem in LIB_DEPENDS for USE_SQLITE.  Here is a
> patch:
> 
> Index: Mk/bsd.database.mk
> diff -u Mk/bsd.database.mk.orig Mk/bsd.database.mk
> --- Mk/bsd.database.mk.orig	Tue Nov  8 18:02:51 2005
> +++ Mk/bsd.database.mk	Wed Nov  9 00:21:00 2005
> @@ -224,7 +224,7 @@
>  IGNORE=	"Unknown sqlite version: ${_SQLITE_VER}"
>  .endif
>  
> -LIB_DEPENDS+=	sqlite${_SQLITE_VER}:${PORTSDIR}/databases/sqlite${_SQLITE_VER}
> +LIB_DEPENDS+=	sqlite.${_SQLITE_VER}:${PORTSDIR}/databases/sqlite${_SQLITE_VER}

No. it's not right.

 From sqlite3 (valid values are sqlite3 and sqlite3.8, not sqlite.3)
lib/libsqlite3.so.8

 From sqlite2 (possible are sqlite and sqlite.2)
lib/libsqlite.so.2

Patch:
-.if ${_SQLITE_VER} != "3" && ${_SQLITE_VER} != "2"
+# USE_SQLITE is specified incorrectly, so mark this as IGNORE
+.if ${_SQLITE_VER} == "3"
+LIB_DEPENDS+= 
sqlite${_SQLITE_VER}:${PORTSDIR}/databases/sqlite${_SQLITE_VER}
+.elif ${_SQLITE_VER} == "2"
+LIB_DEPENDS+= 
sqlite.${_SQLITE_VER}:${PORTSDIR}/databases/sqlite${_SQLITE_VER}
+.else
  IGNORE=        "Unknown sqlite version: ${_SQLITE_VER}"
  .endif

I submit followup in 88661 to fix this too.

-- 
Marcus Alves Grando
marcus(at)corp.grupos.com.br  |  Grupos Internet S/A
   mnag(at)FreeBSD.org         |  FreeBSD.org