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

[Marcus Alves Grando]

Hajimu UMEMOTO wrote:
> Hi,
> 
>>>>>> On Tue, 8 Nov 2005 09:02:52 +0000 (UTC)
>>>>>> Clement Laforet <clement at 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