From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 3 19:50:22 2005 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 159DE16A420 for ; Thu, 3 Nov 2005 19:50:22 +0000 (GMT) (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 68F6343D5F for ; Thu, 3 Nov 2005 19:50:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jA3JoIjc081732 for ; Thu, 3 Nov 2005 19:50:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jA3JoIMj081731; Thu, 3 Nov 2005 19:50:18 GMT (envelope-from gnats) Resent-Date: Thu, 3 Nov 2005 19:50:18 GMT Resent-Message-Id: <200511031950.jA3JoIMj081731@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 93F0116A41F for ; Thu, 3 Nov 2005 19:46:58 +0000 (GMT) (envelope-from girgen@rambutan.pingpong.net) Received: from rambutan.pingpong.net (81.milagro.bahnhof.net [195.178.168.81]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5EB2D43D6A for ; Thu, 3 Nov 2005 19:46:51 +0000 (GMT) (envelope-from girgen@rambutan.pingpong.net) Received: from rambutan.pingpong.net (localhost [127.0.0.1]) by rambutan.pingpong.net (8.13.4/8.13.4) with ESMTP id jA3JkoT7049958 for ; Thu, 3 Nov 2005 20:46:50 +0100 (CET) (envelope-from girgen@rambutan.pingpong.net) Received: (from girgen@localhost) by rambutan.pingpong.net (8.13.4/8.13.3/Submit) id jA3Jkoox049940; Thu, 3 Nov 2005 20:46:50 +0100 (CET) (envelope-from girgen) Message-Id: <200511031946.jA3Jkoox049940@rambutan.pingpong.net> Date: Thu, 3 Nov 2005 20:46:50 +0100 (CET) From: Palle Girgensohn To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/88466: small update to bsd.port.mk for postgresql X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 03 Nov 2005 19:50:22 -0000 >Number: 88466 >Category: ports >Synopsis: small update to bsd.port.mk for postgresql >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: Thu Nov 03 19:50:17 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Palle Girgensohn >Release: FreeBSD 5.4-STABLE i386 >Organization: Ping Pong AB >Environment: System: FreeBSD rambutan.pingpong.net 5.4-STABLE FreeBSD 5.4-STABLE #0: Thu Oct 27 23:39:10 CEST 2005 girgen@rambutan.pingpong.net:/usr/obj/.a/banan/usr/src/sys/WORKSTATION i386 >Description: Hi! I need a small fix in bsd.port.mk so I we can use postgresql-8.1RC1. The change in the regex is due to the fact that pg_config --version reports "PostgreSQL 8.1RC1" for rc1, i.e. no dot after 8.1. Regards, Palle >How-To-Repeat: >Fix: Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.517 diff -u -r1.517 bsd.port.mk --- bsd.port.mk 15 Sep 2005 12:24:33 -0000 1.517 +++ bsd.port.mk 16 Oct 2005 08:59:37 -0000 @@ -1779,10 +1779,11 @@ PGSQL73_LIBVER= 3 PGSQL74_LIBVER= 3 PGSQL80_LIBVER= 4 +PGSQL81_LIBVER= 4 # Setting/finding PostgreSQL version we want. .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' +_PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([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} >Release-Note: >Audit-Trail: >Unformatted: