Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Sep 2020 15:53:43 +0000 (UTC)
From:      Palle Girgensohn <girgen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r550051 - in head/databases: postgresql10-contrib postgresql11-contrib postgresql12-contrib postgresql13-contrib postgresql95-contrib
Message-ID:  <202009251553.08PFrhW2010184@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: girgen
Date: Fri Sep 25 15:53:43 2020
New Revision: 550051
URL: https://svnweb.freebsd.org/changeset/ports/550051

Log:
  Fix depenedency for postgresql13-contrib
  
  And avoid hardcoding the version for all other versions as well, per suggestion
  in the PR.
  
  PR:		249888
  Submitted by:	Christian Ullrich

Modified:
  head/databases/postgresql10-contrib/Makefile
  head/databases/postgresql11-contrib/Makefile
  head/databases/postgresql12-contrib/Makefile
  head/databases/postgresql13-contrib/Makefile
  head/databases/postgresql95-contrib/Makefile

Modified: head/databases/postgresql10-contrib/Makefile
==============================================================================
--- head/databases/postgresql10-contrib/Makefile	Fri Sep 25 15:34:30 2020	(r550050)
+++ head/databases/postgresql10-contrib/Makefile	Fri Sep 25 15:53:43 2020	(r550051)
@@ -10,7 +10,7 @@ COMMENT=	The contrib utilities from the PostgreSQL dis
 
 MASTERDIR=	${.CURDIR}/../postgresql10-server
 
-USES=		bison pgsql:10
+USES=		bison pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
 
 BUILD_DIRS=	src/port src/include src/common contrib
 INSTALL_DIRS=	contrib

Modified: head/databases/postgresql11-contrib/Makefile
==============================================================================
--- head/databases/postgresql11-contrib/Makefile	Fri Sep 25 15:34:30 2020	(r550050)
+++ head/databases/postgresql11-contrib/Makefile	Fri Sep 25 15:53:43 2020	(r550051)
@@ -10,7 +10,7 @@ COMMENT=	The contrib utilities from the PostgreSQL dis
 
 MASTERDIR=	${.CURDIR}/../postgresql11-server
 
-USES=		bison pgsql:11
+USES=		bison pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
 
 BUILD_DIRS=	src/port src/include src/common contrib
 INSTALL_DIRS=	contrib

Modified: head/databases/postgresql12-contrib/Makefile
==============================================================================
--- head/databases/postgresql12-contrib/Makefile	Fri Sep 25 15:34:30 2020	(r550050)
+++ head/databases/postgresql12-contrib/Makefile	Fri Sep 25 15:53:43 2020	(r550051)
@@ -10,7 +10,7 @@ COMMENT=	The contrib utilities from the PostgreSQL dis
 
 MASTERDIR=	${.CURDIR}/../postgresql12-server
 
-USES=		bison pgsql:12
+USES=		bison pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
 
 BUILD_DIRS=	src/port src/include src/common contrib
 INSTALL_DIRS=	contrib

Modified: head/databases/postgresql13-contrib/Makefile
==============================================================================
--- head/databases/postgresql13-contrib/Makefile	Fri Sep 25 15:34:30 2020	(r550050)
+++ head/databases/postgresql13-contrib/Makefile	Fri Sep 25 15:53:43 2020	(r550051)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT=	The contrib utilities from the PostgreSQL dis
 
 MASTERDIR=	${.CURDIR}/../postgresql13-server
 
-USES=		bison pgsql:12
+USES=		bison pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
 
 BUILD_DIRS=	src/port src/include src/common contrib
 INSTALL_DIRS=	contrib

Modified: head/databases/postgresql95-contrib/Makefile
==============================================================================
--- head/databases/postgresql95-contrib/Makefile	Fri Sep 25 15:34:30 2020	(r550050)
+++ head/databases/postgresql95-contrib/Makefile	Fri Sep 25 15:53:43 2020	(r550051)
@@ -13,7 +13,7 @@ LIB_DEPENDS=	libxslt.so:textproc/libxslt \
 
 MASTERDIR=	${.CURDIR}/../postgresql95-server
 
-USES=		bison pgsql:9.5
+USES=		bison pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
 
 BUILD_DIRS=	src/port src/common contrib
 INSTALL_DIRS=	contrib



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