svn commit: r406034 - in head/databases: postgresql90-client postgresql91-client postgresql91-server postgresql92-client postgresql92-server postgresql93-client postgresql94-client postgresql95-cli...

Palle Girgensohn girgen at FreeBSD.org
Wed Jan 13 10:36:25 UTC 2016 

Author: girgen
Date: Wed Jan 13 10:36:22 2016
New Revision: 406034
URL: https://svnweb.freebsd.org/changeset/ports/406034

Log:
  Some binaries where moved from contrib to base in 9.5, like pgbench and
  pg_upgrade. Other where added in 9.5, but the port failed to install them.
  Make sure they are properly installed by the correct port (-client or -server) [1]
  
  Remove unused and hence confusing OSSP_UUID parameters from Makefile [2]
  
  Add options to allow user to be set for the backup script in periodic.
  Add this option only to 9.5 for now. It will be updated to other servers at
  next regular patch release. [3]
  
  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.
  
  Noticed by:	Paul Guyot [1]
  PR:		192387 [2]
  PR:		172110 [3]
  PR:		206046 [4]

Modified:
  head/databases/postgresql90-client/Makefile
  head/databases/postgresql91-client/Makefile
  head/databases/postgresql91-server/Makefile
  head/databases/postgresql92-client/Makefile
  head/databases/postgresql92-server/Makefile
  head/databases/postgresql93-client/Makefile
  head/databases/postgresql94-client/Makefile
  head/databases/postgresql95-client/Makefile
  head/databases/postgresql95-contrib/Makefile
  head/databases/postgresql95-server/Makefile
  head/databases/postgresql95-server/files/502.pgsql.in
  head/databases/postgresql95-server/pkg-plist-client
  head/databases/postgresql95-server/pkg-plist-server

Modified: head/databases/postgresql90-client/Makefile
==============================================================================
--- head/databases/postgresql90-client/Makefile	Wed Jan 13 10:25:27 2016	(r406033)
+++ head/databases/postgresql90-client/Makefile	Wed Jan 13 10:36:22 2016	(r406034)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
+
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql90-server

Modified: head/databases/postgresql91-client/Makefile
==============================================================================
--- head/databases/postgresql91-client/Makefile	Wed Jan 13 10:25:27 2016	(r406033)
+++ head/databases/postgresql91-client/Makefile	Wed Jan 13 10:36:22 2016	(r406034)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
+
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql91-server

Modified: head/databases/postgresql91-server/Makefile
==============================================================================
--- head/databases/postgresql91-server/Makefile	Wed Jan 13 10:25:27 2016	(r406033)
+++ head/databases/postgresql91-server/Makefile	Wed Jan 13 10:36:22 2016	(r406034)
@@ -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: head/databases/postgresql92-client/Makefile
==============================================================================
--- head/databases/postgresql92-client/Makefile	Wed Jan 13 10:25:27 2016	(r406033)
+++ head/databases/postgresql92-client/Makefile	Wed Jan 13 10:36:22 2016	(r406034)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
+
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql92-server

Modified: head/databases/postgresql92-server/Makefile
==============================================================================
--- head/databases/postgresql92-server/Makefile	Wed Jan 13 10:25:27 2016	(r406033)
+++ head/databases/postgresql92-server/Makefile	Wed Jan 13 10:36:22 2016	(r406034)
@@ -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: head/databases/postgresql93-client/Makefile
==============================================================================
--- head/databases/postgresql93-client/Makefile	Wed Jan 13 10:25:27 2016	(r406033)
+++ head/databases/postgresql93-client/Makefile	Wed Jan 13 10:36:22 2016	(r406034)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
+
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql93-server

Modified: head/databases/postgresql94-client/Makefile
==============================================================================
--- head/databases/postgresql94-client/Makefile	Wed Jan 13 10:25:27 2016	(r406033)
+++ head/databases/postgresql94-client/Makefile	Wed Jan 13 10:36:22 2016	(r406034)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
+
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql94-server

Modified: head/databases/postgresql95-client/Makefile
==============================================================================
--- head/databases/postgresql95-client/Makefile	Wed Jan 13 10:25:27 2016	(r406033)
+++ head/databases/postgresql95-client/Makefile	Wed Jan 13 10:36:22 2016	(r406034)
@@ -2,13 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
+
 COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql95-server
 
 BUILD_DIRS=	config src/include src/interfaces src/port \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
-		doc src/makefiles
+		src/bin/pgbench doc src/makefiles
 INSTALL_DIRS=	${BUILD_DIRS}
 
 CLIENT_ONLY=	yes

Modified: head/databases/postgresql95-contrib/Makefile
==============================================================================
--- head/databases/postgresql95-contrib/Makefile	Wed Jan 13 10:25:27 2016	(r406033)
+++ head/databases/postgresql95-contrib/Makefile	Wed Jan 13 10:36:22 2016	(r406034)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
+PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql at FreeBSD.org

Modified: head/databases/postgresql95-server/Makefile
==============================================================================
--- head/databases/postgresql95-server/Makefile	Wed Jan 13 10:25:27 2016	(r406033)
+++ head/databases/postgresql95-server/Makefile	Wed Jan 13 10:36:22 2016	(r406034)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 DISTVERSION?=	9.5.0
+PORTREVISION?=	1
 
 MAINTAINER?=	pgsql at FreeBSD.org
 
@@ -10,7 +11,9 @@ INSTALL_DIRS?=	src/common src/timezone s
 		src/backend/snowball src/backend/replication/libpqwalreceiver \
 		src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_controldata src/bin/pg_resetxlog src/pl \
-		src/bin/pg_basebackup
+		src/bin/pg_basebackup src/bin/pg_archivecleanup \
+		src/bin/pg_test_fsync src/bin/pg_test_timing \
+		src/bin/pg_xlogdump src/bin/pg_upgrade
 
 ICU_PATCHFILE=	sorry-icu-patch-is-not-quite-ready-for-95-yet
 

Modified: head/databases/postgresql95-server/files/502.pgsql.in
==============================================================================
--- head/databases/postgresql95-server/files/502.pgsql.in	Wed Jan 13 10:25:27 2016	(r406033)
+++ head/databases/postgresql95-server/files/502.pgsql.in	Wed Jan 13 10:36:22 2016	(r406034)
@@ -19,14 +19,6 @@
 # daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
 # daily_pgsql_vacuum_enable="YES" # do vacuum
 
-daily_pgsql_user=%%PG_USER%%
-daily_pgsql_vacuum_args="-U ${daily_pgsql_user} -qaz"
-daily_pgsql_pgdump_args="-U ${daily_pgsql_user} -bF c"
-daily_pgsql_pgdumpall_globals_args="-U ${daily_pgsql_user}"
-# backupdir is relative to ~pgsql home directory unless it begins with a slash:
-daily_pgsql_backupdir="~${daily_pgsql_user}/backups"
-daily_pgsql_savedays="7"
-
 # If there is a global system configuration file, suck it in.
 #
 if [ -r /etc/defaults/periodic.conf ]
@@ -35,6 +27,15 @@ then
     source_periodic_confs
 fi
 
+: ${daily_pgsql_user:="%%PG_USER%%"}
+: ${daily_pgsql_port:=5432}
+: ${daily_pgsql_vacuum_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -qaz"}
+: ${daily_pgsql_pgdump_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -bF c"}
+: ${daily_pgsql_pgdumpall_globals_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port}"}
+# backupdir is relative to ~pgsql home directory unless it begins with a slash:
+: ${daily_pgsql_backupdir:="~${daily_pgsql_user}/backups"}
+: ${daily_pgsql_savedays:="7"}
+
 # allow '~´ in dir name
 eval backupdir=${daily_pgsql_backupdir}
 
@@ -82,7 +83,7 @@ pgsql_backup() {
 
 case "$daily_pgsql_backup_enable" in
     [Yy][Ee][Ss])
-	dbnames=`su -l %%PG_USER%% -c "umask 077; psql -q -t -A -d template1 -U %%PG_USER%% -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
+	dbnames=`su -l ${daily_pgsql_user} -c "umask 077; psql -U ${daily_pgsql_user} -p ${daily_pgsql_port} -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
 	pgsql_backup $dbnames
 	;;
 

Modified: head/databases/postgresql95-server/pkg-plist-client
==============================================================================
--- head/databases/postgresql95-server/pkg-plist-client	Wed Jan 13 10:25:27 2016	(r406033)
+++ head/databases/postgresql95-server/pkg-plist-client	Wed Jan 13 10:36:22 2016	(r406034)
@@ -11,6 +11,7 @@ bin/pg_dump
 bin/pg_dumpall
 bin/pg_isready
 bin/pg_restore
+bin/pgbench
 bin/psql
 bin/reindexdb
 bin/vacuumdb

Modified: head/databases/postgresql95-server/pkg-plist-server
==============================================================================
--- head/databases/postgresql95-server/pkg-plist-server	Wed Jan 13 10:25:27 2016	(r406033)
+++ head/databases/postgresql95-server/pkg-plist-server	Wed Jan 13 10:36:22 2016	(r406034)
@@ -5,6 +5,11 @@ bin/pg_ctl
 bin/pg_receivexlog
 bin/pg_resetxlog
 bin/pg_recvlogical
+bin/pg_archivecleanup
+bin/pg_test_fsync
+bin/pg_test_timing
+bin/pg_xlogdump
+bin/pg_upgrade
 bin/postgres
 bin/postmaster
 etc/periodic/daily/502.pgsql

More information about the svn-ports-head mailing list