From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 2 02:50:06 2005 Return-Path: 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 4B73E16A4CE for ; Wed, 2 Feb 2005 02:50:06 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0BF7443D53 for ; Wed, 2 Feb 2005 02:50:06 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j122o5w2060161 for ; Wed, 2 Feb 2005 02:50:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j122o5NP060160; Wed, 2 Feb 2005 02:50:05 GMT (envelope-from gnats) Resent-Date: Wed, 2 Feb 2005 02:50:05 GMT Resent-Message-Id: <200502020250.j122o5NP060160@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, Palle Girgensohn Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7A7716A4D0 for ; Wed, 2 Feb 2005 02:40:16 +0000 (GMT) Received: from palle.girgensohn.se (1-2-8-5a.asp.sth.bostream.se [82.182.157.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB62243D53 for ; Wed, 2 Feb 2005 02:40:15 +0000 (GMT) (envelope-from girgen@palle.girgensohn.se) Received: from localhost (localhost.girgensohn.se [127.0.0.1]) by palle.girgensohn.se (Postfix) with ESMTP id 91C201CC27 for ; Wed, 2 Feb 2005 03:40:14 +0100 (CET) Received: from palle.girgensohn.se ([127.0.0.1]) by localhost (palle.girgensohn.se [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 58616-03 for ; Wed, 2 Feb 2005 03:40:14 +0100 (CET) Received: by palle.girgensohn.se (Postfix, from userid 1000) id 54B5E1CC22; Wed, 2 Feb 2005 03:40:14 +0100 (CET) Message-Id: <20050202024014.54B5E1CC22@palle.girgensohn.se> Date: Wed, 2 Feb 2005 03:40:14 +0100 (CET) From: Palle Girgensohn To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/76988: WANT_PGSQL_VER ignored when postgresql version already installed X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Palle Girgensohn List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Feb 2005 02:50:06 -0000 >Number: 76988 >Category: ports >Synopsis: WANT_PGSQL_VER ignored when postgresql version already installed >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Feb 02 02:50:05 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Palle Girgensohn >Release: FreeBSD 5.3-RELEASE-p1 i386 >Organization: Ping Pong AB >Environment: System: FreeBSD palle.girgensohn.se 5.3-RELEASE-p1 FreeBSD 5.3-RELEASE-p1 #16: Sat Nov 20 04:26:58 CET 2004 girgen@palle.girgensohn.se:/usr/obj/4/usr/5src/sys/PALLE i386 >Description: WANT_PGSQL_VER is a newly comitted knob in Mk/bsd.ports.mk, intended for ports that need a certain version of postgresql. Problem: When a postgresql version is already installed, this knob has no effect. Hence, wrong version of postgresql may be used, instead of the port in question failing to build and warn the user about the problem. >How-To-Repeat: >Fix: Index: Mk/bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.506 diff -u -r1.506 bsd.port.mk --- Mk/bsd.port.mk 31 Jan 2005 00:35:38 -0000 1.506 +++ Mk/bsd.port.mk 2 Feb 2005 01:24:57 -0000 @@ -1708,20 +1708,28 @@ DEFAULT_PGSQL_VER?= 74 # Setting/finding PostgreSQL version we want. -.if defined(WANT_PGSQL_VER) +.if exists(${LOCALBASE}/bin/pg_config) +_PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.endif + +.if defined(WANT_PGSQL_VER) && defined(_PGSQL_VER) && ${WANT_PGSQL_VER} != ${_PGSQL_VER} +BROKEN= The port wants postgresql${WANT_PGSQL_VER}-client but you have postgresql${_PGSQL_VER}-client installed +.endif + +.if defined(_PGSQL_VER) +PGSQL_VER= ${_PGSQL_VER} +.elif defined(WANT_PGSQL_VER) PGSQL_VER= ${WANT_PGSQL_VER} -.elif exists(${LOCALBASE}/bin/pg_config) -PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' .else PGSQL_VER= ${DEFAULT_PGSQL_VER} -.endif # WANT_PGSQL_VER +.endif # And now we are checking if we can use it .if exists(${PORTSDIR}/databases/postgresql${PGSQL_VER}-client) .if defined(BROKEN_WITH_PGSQL) . for VER in ${BROKEN_WITH_PGSQL} . if (${PGSQL_VER} == "${VER}") -BROKEN= "Doesn't work with PostgreSQL version : ${PGSQL_VER} (Doesn't support PostgresSQL ${BROKEN_WITH_PGSQL})" +IGNORE= "Does not work with postgresql${PGSQL_VER}-client PostgresSQL \(${BROKEN_WITH_PGSQL} not supported\)" . endif . endfor .endif # BROKEN_WITH_PGSQL >Release-Note: >Audit-Trail: >Unformatted: