aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPalle Girgensohn <girgen@FreeBSD.org>2016-01-13 10:36:22 +0000
committerPalle Girgensohn <girgen@FreeBSD.org>2016-01-13 10:36:22 +0000
commita9c901ec2bd7061cb5a9f38c4aa1b4608c00cf1f (patch)
tree2f136fd2ec2358b046f3f49ea848fa2ba7711c62
parent1a2923e25f010530a7576108fcf5f48601944a80 (diff)
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]
Notes
Notes: svn path=/head/; revision=406034
Diffstat
-rw-r--r--databases/postgresql90-client/Makefile1
-rw-r--r--databases/postgresql91-client/Makefile1
-rw-r--r--databases/postgresql91-server/Makefile6
-rw-r--r--databases/postgresql92-client/Makefile1
-rw-r--r--databases/postgresql92-server/Makefile5
-rw-r--r--databases/postgresql93-client/Makefile1
-rw-r--r--databases/postgresql94-client/Makefile1
-rw-r--r--databases/postgresql95-client/Makefile3
-rw-r--r--databases/postgresql95-contrib/Makefile1
-rw-r--r--databases/postgresql95-server/Makefile5
-rw-r--r--databases/postgresql95-server/files/502.pgsql.in19
-rw-r--r--databases/postgresql95-server/pkg-plist-client1
-rw-r--r--databases/postgresql95-server/pkg-plist-server5
13 files changed, 32 insertions, 18 deletions
diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile
index 658b34a989f3..7f542f97c4a4 100644
--- a/databases/postgresql90-client/Makefile
+++ b/databases/postgresql90-client/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= postgresql
+
COMMENT= PostgreSQL database (client)
MASTERDIR= ${.CURDIR}/../postgresql90-server
diff --git a/databases/postgresql91-client/Makefile b/databases/postgresql91-client/Makefile
index fd81ef333760..09494e7cda96 100644
--- a/databases/postgresql91-client/Makefile
+++ b/databases/postgresql91-client/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= postgresql
+
COMMENT= PostgreSQL database (client)
MASTERDIR= ${.CURDIR}/../postgresql91-server
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index aa0ffacde4f6..035d533f8ca3 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -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 kerberos
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
diff --git a/databases/postgresql92-client/Makefile b/databases/postgresql92-client/Makefile
index f1d5352b8e37..abda6a431c5e 100644
--- a/databases/postgresql92-client/Makefile
+++ b/databases/postgresql92-client/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= postgresql
+
COMMENT= PostgreSQL database (client)
MASTERDIR= ${.CURDIR}/../postgresql92-server
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index ebfee4af1707..cfa562837f67 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -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
diff --git a/databases/postgresql93-client/Makefile b/databases/postgresql93-client/Makefile
index 260c440a0b9e..0c89e1a1f764 100644
--- a/databases/postgresql93-client/Makefile
+++ b/databases/postgresql93-client/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= postgresql
+
COMMENT= PostgreSQL database (client)
MASTERDIR= ${.CURDIR}/../postgresql93-server
diff --git a/databases/postgresql94-client/Makefile b/databases/postgresql94-client/Makefile
index c620acbd88e6..b4d51a31cc5d 100644
--- a/databases/postgresql94-client/Makefile
+++ b/databases/postgresql94-client/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= postgresql
+
COMMENT= PostgreSQL database (client)
MASTERDIR= ${.CURDIR}/../postgresql94-server
diff --git a/databases/postgresql95-client/Makefile b/databases/postgresql95-client/Makefile
index 3a696e607ce4..4a13c362c639 100644
--- a/databases/postgresql95-client/Makefile
+++ b/databases/postgresql95-client/Makefile
@@ -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
diff --git a/databases/postgresql95-contrib/Makefile b/databases/postgresql95-contrib/Makefile
index 516581112f68..2dda8ff4df8c 100644
--- a/databases/postgresql95-contrib/Makefile
+++ b/databases/postgresql95-contrib/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= postgresql
+PORTREVISION= 0
CATEGORIES= databases
MAINTAINER= pgsql@FreeBSD.org
diff --git a/databases/postgresql95-server/Makefile b/databases/postgresql95-server/Makefile
index 91c62d479055..482f2f6c8094 100644
--- a/databases/postgresql95-server/Makefile
+++ b/databases/postgresql95-server/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
DISTVERSION?= 9.5.0
+PORTREVISION?= 1
MAINTAINER?= pgsql@FreeBSD.org
@@ -10,7 +11,9 @@ INSTALL_DIRS?= src/common src/timezone src/backend \
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
diff --git a/databases/postgresql95-server/files/502.pgsql.in b/databases/postgresql95-server/files/502.pgsql.in
index e92f01f992cd..2945928da400 100644
--- a/databases/postgresql95-server/files/502.pgsql.in
+++ b/databases/postgresql95-server/files/502.pgsql.in
@@ -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
;;
diff --git a/databases/postgresql95-server/pkg-plist-client b/databases/postgresql95-server/pkg-plist-client
index 7f4284131e93..4722e9563c90 100644
--- a/databases/postgresql95-server/pkg-plist-client
+++ b/databases/postgresql95-server/pkg-plist-client
@@ -11,6 +11,7 @@ bin/pg_dump
bin/pg_dumpall
bin/pg_isready
bin/pg_restore
+bin/pgbench
bin/psql
bin/reindexdb
bin/vacuumdb
diff --git a/databases/postgresql95-server/pkg-plist-server b/databases/postgresql95-server/pkg-plist-server
index 46134274bcd2..d2b94fe8b3d1 100644
--- a/databases/postgresql95-server/pkg-plist-server
+++ b/databases/postgresql95-server/pkg-plist-server
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 09:39:04 +0000