Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Nov 2005 20:46:50 +0100 (CET)
From:      Palle Girgensohn <girgen@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/88466: small update to bsd.port.mk for postgresql
Message-ID:  <200511031946.jA3Jkoox049940@rambutan.pingpong.net>
Resent-Message-ID: <200511031950.jA3JoIMj081731@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511031946.jA3Jkoox049940>