From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Sep 18 15:40:23 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF0DA16A416 for ; Mon, 18 Sep 2006 15:40:23 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C535843D53 for ; Mon, 18 Sep 2006 15:40:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k8IFeMxU069921 for ; Mon, 18 Sep 2006 15:40:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8IFeMUD069920; Mon, 18 Sep 2006 15:40:22 GMT (envelope-from gnats) Resent-Date: Mon, 18 Sep 2006 15:40:22 GMT Resent-Message-Id: <200609181540.k8IFeMUD069920@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, skv@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C8AD416A403 for ; Mon, 18 Sep 2006 15:34:51 +0000 (UTC) (envelope-from skv@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD39443D55 for ; Mon, 18 Sep 2006 15:34:50 +0000 (GMT) (envelope-from skv@FreeBSD.org) Received: from freefall.freebsd.org (skv@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k8IFYoqM069671 for ; Mon, 18 Sep 2006 15:34:50 GMT (envelope-from skv@freefall.freebsd.org) Received: (from skv@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8IFYoq4069670; Mon, 18 Sep 2006 15:34:50 GMT (envelope-from skv) Message-Id: <200609181534.k8IFYoq4069670@freefall.freebsd.org> Date: Mon, 18 Sep 2006 15:34:50 GMT From: skv@FreeBSD.org To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.2 Cc: Subject: ports/103357: [bsd.database.mk]: add USE_FIREBIRD X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: skv@FreeBSD.org List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2006 15:40:24 -0000 >Number: 103357 >Category: ports >Synopsis: [bsd.database.mk]: add USE_FIREBIRD >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Sep 18 15:40:22 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Sergey Skvortsov >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: >Description: Add new variable USE_FIREBIRD for ports depened on Firebird RDBMS. Possible values: USE_FIREBIRD= yes # set default Firebird version ('2') USE_FIREBIRD= 2 # port depends on databases/firebird2-client USE_FIREBIRD= 1 # port depends on databases/firebird-client Desired Firebird version can be set in /etc/make.conf: WITH_FIREBIRD_VER= 2 >How-To-Repeat: >Fix: Index: bsd.database.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.database.mk,v retrieving revision 1.14 diff -u -r1.14 bsd.database.mk --- bsd.database.mk 5 Jul 2006 02:18:08 -0000 1.14 +++ bsd.database.mk 18 Sep 2006 15:29:03 -0000 @@ -78,6 +78,14 @@ # 3 and 2. If version is not specified directly then # sqlite3 is used (if USE_SQLITE= yes). # SQLITE_VER - Detected sqlite version. +## +# USE_FIREBIRD - Add dependency on Firebird library. Valid values are: +# 2 and 1. If no version is given by the maintainer (if +# USE_FIREBIRD= yes) and the user did not define +# WITH_FIREBIRD_VER variable, fall back to default "2". +# WITH_FIREBIRD_VER +# - User defined variable to set Firebird version. +# FIREBIRD_VER - Detected Firebird version. .if defined(USE_MYSQL) DEFAULT_MYSQL_VER?= 50 @@ -378,4 +386,26 @@ .endif # defined(USE_SQLITE) +.if defined(USE_FIREBIRD) + +.if defined(WITH_FIREBIRD_VER) +USE_FIREBIRD= ${WITH_FIREBIRD_VER} +.endif + +.if ${USE_FIREBIRD:L} == "yes" +FIREBIRD_VER= 2 +.else +FIREBIRD_VER= ${USE_FIREBIRD} +.endif + +.if ${FIREBIRD_VER} == "2" +LIB_DEPENDS+= fbclient.2:${PORTSDIR}/databases/firebird2-client +.elif ${FIREBIRD_VER} == "1" +LIB_DEPENDS+= fbclient.1:${PORTSDIR}/databases/firebird-client +.else +IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER} +.endif + +.endif # defined(USE_FIREBIRD) + .endif # defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.541 diff -u -r1.541 bsd.port.mk --- bsd.port.mk 15 Sep 2006 06:57:07 -0000 1.541 +++ bsd.port.mk 18 Sep 2006 15:33:04 -0000 @@ -1981,7 +1981,7 @@ .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \ defined(USE_PGSQL) || defined(WANT_PGSQL_VER) || \ - defined(USE_BDB) || defined(USE_SQLITE) + defined(USE_BDB) || defined(USE_SQLITE) || defined(USE_FIREBIRD) .include "${PORTSDIR}/Mk/bsd.database.mk" .endif >Release-Note: >Audit-Trail: >Unformatted: