svn commit: r407633 - in branches/2016Q1/databases: postgresql90-client postgresql91-client postgresql91-server postgresql92-client postgresql92-server postgresql93-client postgresql94-client

[Palle Girgensohn]

Author: girgen
Date: Sun Jan 31 13:36:47 2016
New Revision: 407633
URL: https://svnweb.freebsd.org/changeset/ports/407633

Log:
  MFH: r406034 (partly)
  
  Remove unused and hence confusing OSSP_UUID parameters from Makefile [2]
  
  The path to perl in hard coded into pgxs/src/Makefile.global which is
  then installed. Hence, we must depend on perl when that file is installed.
  
  PR:		192387 [2]
  PR:		206046 [4]
  Approved by:	portmgr

Modified:
  branches/2016Q1/databases/postgresql90-client/Makefile
  branches/2016Q1/databases/postgresql91-client/Makefile
  branches/2016Q1/databases/postgresql91-server/Makefile
  branches/2016Q1/databases/postgresql92-client/Makefile
  branches/2016Q1/databases/postgresql92-server/Makefile
  branches/2016Q1/databases/postgresql93-client/Makefile
  branches/2016Q1/databases/postgresql94-client/Makefile
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/databases/postgresql90-client/Makefile
==============================================================================
--- branches/2016Q1/databases/postgresql90-client/Makefile	Sun Jan 31 13:34:42 2016	(r407632)
+++ branches/2016Q1/databases/postgresql90-client/Makefile	Sun Jan 31 13:36:47 2016	(r407633)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
+
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql90-server

Modified: branches/2016Q1/databases/postgresql91-client/Makefile
==============================================================================
--- branches/2016Q1/databases/postgresql91-client/Makefile	Sun Jan 31 13:34:42 2016	(r407632)
+++ branches/2016Q1/databases/postgresql91-client/Makefile	Sun Jan 31 13:36:47 2016	(r407633)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
+
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql91-server

Modified: branches/2016Q1/databases/postgresql91-server/Makefile
==============================================================================
--- branches/2016Q1/databases/postgresql91-server/Makefile	Sun Jan 31 13:34:42 2016	(r407632)
+++ branches/2016Q1/databases/postgresql91-server/Makefile	Sun Jan 31 13:36:47 2016	(r407633)
@@ -67,6 +67,8 @@ SUB_FILES+=	502.pgsql
 .if defined(CLIENT_ONLY)
 OPTIONS_DEFINE+=LIBEDIT
 LIBEDIT_DESC=   Use non-GPL libedit instead of readline
+USES+=		perl5
+PORTREVISION?=	1
 .else
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
@@ -103,7 +105,6 @@ HEIMDAL_KRB5_DESC=	Builds with Heimdal k
 GSSAPI_DESC=	Build with GSSAPI support
 OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
 DEBUG_DESC=	Builds with debugging symbols
-OSSP_UUID_DESC=	Enable / disable ossp-uuid support
 
 OPTIONS_DEFINE+=	SSL
 SSL_DESC=	Build with OpenSSL support
@@ -120,9 +121,6 @@ LIBEDIT_USES_OFF=		readline
 SSL_USE=	OPENSSL=yes
 SSL_CONFIGURE_WITH=openssl
 
-OSSP_UUID_BUILD_DEPENDS=	${LOCALBASE}/lib/libuuid.a:${PORTSDIR}/misc/ossp-uuid
-OSSP_UUID_CONFIGURE_WITH=	ossp-uuid
-
 PAM_CONFIGURE_WITH=	pam
 
 XML_CONFIGURE_WITH=	libxml

Modified: branches/2016Q1/databases/postgresql92-client/Makefile
==============================================================================
--- branches/2016Q1/databases/postgresql92-client/Makefile	Sun Jan 31 13:34:42 2016	(r407632)
+++ branches/2016Q1/databases/postgresql92-client/Makefile	Sun Jan 31 13:36:47 2016	(r407633)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
+
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql92-server

Modified: branches/2016Q1/databases/postgresql92-server/Makefile
==============================================================================
--- branches/2016Q1/databases/postgresql92-server/Makefile	Sun Jan 31 13:34:42 2016	(r407632)
+++ branches/2016Q1/databases/postgresql92-server/Makefile	Sun Jan 31 13:36:47 2016	(r407633)
@@ -67,6 +67,8 @@ SUB_FILES+=	502.pgsql
 .if defined(CLIENT_ONLY)
 OPTIONS_DEFINE+=LIBEDIT
 LIBEDIT_DESC=	Use non-GPL libedit instead of readline
+USES+=		perl5
+PORTREVISION?=	1
 .else
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
@@ -120,9 +122,6 @@ LIBEDIT_USES_OFF=		readline
 SSL_USE=	OPENSSL=yes
 SSL_CONFIGURE_WITH=openssl
 
-OSSP_UUID_BUILD_DEPENDS=	${LOCALBASE}/lib/libuuid.a:${PORTSDIR}/misc/ossp-uuid
-OSSP_UUID_CONFIGURE_WITH=	ossp-uuid
-
 PAM_CONFIGURE_WITH=	pam
 
 XML_CONFIGURE_WITH=	libxml

Modified: branches/2016Q1/databases/postgresql93-client/Makefile
==============================================================================
--- branches/2016Q1/databases/postgresql93-client/Makefile	Sun Jan 31 13:34:42 2016	(r407632)
+++ branches/2016Q1/databases/postgresql93-client/Makefile	Sun Jan 31 13:36:47 2016	(r407633)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
+
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql93-server

Modified: branches/2016Q1/databases/postgresql94-client/Makefile
==============================================================================
--- branches/2016Q1/databases/postgresql94-client/Makefile	Sun Jan 31 13:34:42 2016	(r407632)
+++ branches/2016Q1/databases/postgresql94-client/Makefile	Sun Jan 31 13:36:47 2016	(r407633)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
+
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql94-server