summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--databases/postgresql84-client/Makefile1
-rw-r--r--databases/postgresql84-contrib/Makefile1
-rw-r--r--databases/postgresql84-server/Makefile12
-rw-r--r--databases/postgresql84-server/files/pkg-install-server.in (renamed from databases/postgresql84-server/files/pkg-install-server)12
-rw-r--r--databases/postgresql90-client/Makefile1
-rw-r--r--databases/postgresql90-contrib/Makefile1
-rw-r--r--databases/postgresql90-server/Makefile13
-rw-r--r--databases/postgresql90-server/files/pkg-install-server.in (renamed from databases/postgresql90-server/files/pkg-install-server)12
8 files changed, 30 insertions, 23 deletions
diff --git a/databases/postgresql84-client/Makefile b/databases/postgresql84-client/Makefile
index 35ccbf965a59..d9819d44caf4 100644
--- a/databases/postgresql84-client/Makefile
+++ b/databases/postgresql84-client/Makefile
@@ -9,6 +9,7 @@
PORTNAME= postgresql
PKGNAMESUFFIX= -client
+PORTREVISION= 0
COMMENT= PostgreSQL database (client)
diff --git a/databases/postgresql84-contrib/Makefile b/databases/postgresql84-contrib/Makefile
index 07ae448bb66e..5edae366570f 100644
--- a/databases/postgresql84-contrib/Makefile
+++ b/databases/postgresql84-contrib/Makefile
@@ -8,6 +8,7 @@
PORTNAME= postgresql
PKGNAMESUFFIX= -contrib
CATEGORIES= databases
+PORTREVISION= 0
MAINTAINER= girgen@FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 6bdc5fff0074..f0ae3ded65a2 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
DISTVERSION?= 8.4.8
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${DISTVERSION}
@@ -255,7 +256,7 @@ MAN7= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
.if defined(SERVER_ONLY)
pre-everything::
- @${SH} ${FILESDIR}/pkg-install${PKGNAMESUFFIX} ${PORTNAME} BACKUPWARNING
+ @${SH} ${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in ${PORTNAME} BACKUPWARNING
.endif
.if !defined(NO_BUILD)
@@ -278,21 +279,20 @@ SUB_FILES+= pkg-message${PKGNAMESUFFIX}
PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX}
. endif
-. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX})
+. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
+SUB_FILES+= pkg-install${PKGNAMESUFFIX}
SUB_LIST= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)
PLIST_SUB+= PG_USER=$(PG_USER)
-PKGINSTALL= ${FILESDIR}/pkg-install${PKGNAMESUFFIX}
+PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX}
. endif
.endif
.if defined(SERVER_ONLY)
pre-su-install:
- @ ${SETENV} PKG_PREFIX=${PREFIX} PG_USER=$(PG_USER) PG_GROUP=$(PG_GROUP) \
- PG_UID=$(PG_UID) \
- ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
+ @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
.endif
.if !defined(NO_BUILD)
diff --git a/databases/postgresql84-server/files/pkg-install-server b/databases/postgresql84-server/files/pkg-install-server.in
index c1e108162378..da85c73b7e4c 100644
--- a/databases/postgresql84-server/files/pkg-install-server
+++ b/databases/postgresql84-server/files/pkg-install-server.in
@@ -1,9 +1,13 @@
#! /bin/sh
-# $FreeBSD: /tmp/pcvs/ports/databases/postgresql84-server/files/Attic/pkg-install-server,v 1.1 2011-04-27 13:28:51 girgen Exp $
+# $FreeBSD$
PATH=/bin:/usr/bin:/usr/sbin
+PG_USER=%%PG_USER%%
+PG_GROUP=%%PG_GROUP%%
+PG_UID=%%PG_UID%%
+
backupwarning() { echo "
=========== BACKUP YOUR DATA! =============
@@ -23,13 +27,11 @@ case $2 in
PRE-INSTALL)
backupwarning
DB_DIR=${PKG_PREFIX}/${PG_USER}
- UID=${PG_UID}
- GID=${PG_UID}
if pw group show "${PG_GROUP}" 2>/dev/null; then
echo "You already have a group \"${PG_GROUP}\", so I will use it."
else
- if pw groupadd ${PG_GROUP} -g ${GID}; then
+ if pw groupadd ${PG_GROUP} -g ${PG_UID}; then
echo "Added group \"${PG_GROUP}\"."
else
echo "Adding group \"${PG_GROUP}\" failed..."
@@ -40,7 +42,7 @@ PRE-INSTALL)
if pw user show "${PG_USER}" 2>/dev/null; then
echo "You already have a user \"${PG_USER}\", so I will use it."
else
- if pw useradd ${PG_USER} -u ${UID} -g ${PG_GROUP} -h - \
+ if pw useradd ${PG_USER} -u ${PG_UID} -g ${PG_GROUP} -h - \
-d ${DB_DIR} -c "PostgreSQL Daemon"
then
echo "Added user \"${PG_USER}\"."
diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile
index dd4ef68b82d3..0946959a5eba 100644
--- a/databases/postgresql90-client/Makefile
+++ b/databases/postgresql90-client/Makefile
@@ -9,6 +9,7 @@
PORTNAME= postgresql
PKGNAMESUFFIX= -client
+PORTREVISION= 1
COMMENT= PostgreSQL database (client)
diff --git a/databases/postgresql90-contrib/Makefile b/databases/postgresql90-contrib/Makefile
index e742bcbbcf6b..c06cd6427af7 100644
--- a/databases/postgresql90-contrib/Makefile
+++ b/databases/postgresql90-contrib/Makefile
@@ -8,6 +8,7 @@
PORTNAME= postgresql
PKGNAMESUFFIX= -contrib
CATEGORIES= databases
+PORTREVISION= 1
MAINTAINER= girgen@FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index b57b1f10d7e2..f38e097c3fe0 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
DISTVERSION?= 9.0.4
-PORTREVISION= 1
+PORTREVISION?= 2
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${DISTVERSION}
@@ -287,7 +287,7 @@ MAN7= ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 ALTER_DATABASE.7 \
.if defined(SERVER_ONLY)
pre-everything::
- @${SH} ${FILESDIR}/pkg-install${PKGNAMESUFFIX} ${PORTNAME} BACKUPWARNING
+ @${SH} ${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in ${PORTNAME} BACKUPWARNING
.endif
.if !defined(NO_BUILD)
@@ -309,20 +309,19 @@ do-build:
SUB_FILES+= pkg-message${PKGNAMESUFFIX}
PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX}
. endif
-. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX})
+. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
+SUB_FILES+= pkg-install${PKGNAMESUFFIX}
SUB_LIST= PG_GROUP=$(PG_GROUP) \
PG_USER=$(PG_USER) \
PG_UID=$(PG_UID)
PLIST_SUB+= PG_USER=$(PG_USER)
-PKGINSTALL= ${FILESDIR}/pkg-install${PKGNAMESUFFIX}
+PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX}
. endif
.endif
.if defined(SERVER_ONLY)
pre-su-install:
- @ ${SETENV} PKG_PREFIX=${PREFIX} PG_USER=$(PG_USER) PG_GROUP=$(PG_GROUP) \
- PG_UID=$(PG_UID) \
- ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
+ @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
.endif
.if !defined(NO_BUILD)
diff --git a/databases/postgresql90-server/files/pkg-install-server b/databases/postgresql90-server/files/pkg-install-server.in
index 17788b085041..da85c73b7e4c 100644
--- a/databases/postgresql90-server/files/pkg-install-server
+++ b/databases/postgresql90-server/files/pkg-install-server.in
@@ -1,9 +1,13 @@
#! /bin/sh
-# $FreeBSD: /tmp/pcvs/ports/databases/postgresql90-server/files/Attic/pkg-install-server,v 1.1 2011-04-27 13:28:50 girgen Exp $
+# $FreeBSD$
PATH=/bin:/usr/bin:/usr/sbin
+PG_USER=%%PG_USER%%
+PG_GROUP=%%PG_GROUP%%
+PG_UID=%%PG_UID%%
+
backupwarning() { echo "
=========== BACKUP YOUR DATA! =============
@@ -23,13 +27,11 @@ case $2 in
PRE-INSTALL)
backupwarning
DB_DIR=${PKG_PREFIX}/${PG_USER}
- UID=${PG_UID}
- GID=${PG_UID}
if pw group show "${PG_GROUP}" 2>/dev/null; then
echo "You already have a group \"${PG_GROUP}\", so I will use it."
else
- if pw groupadd ${PG_GROUP} -g ${GID}; then
+ if pw groupadd ${PG_GROUP} -g ${PG_UID}; then
echo "Added group \"${PG_GROUP}\"."
else
echo "Adding group \"${PG_GROUP}\" failed..."
@@ -40,7 +42,7 @@ PRE-INSTALL)
if pw user show "${PG_USER}" 2>/dev/null; then
echo "You already have a user \"${PG_USER}\", so I will use it."
else
- if pw useradd ${PG_USER} -u ${UID} -g ${PG_GROUP} -h - \
+ if pw useradd ${PG_USER} -u ${PG_UID} -g ${PG_GROUP} -h - \
-d ${DB_DIR} -c "PostgreSQL Daemon"
then
echo "Added user \"${PG_USER}\"."
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-04 09:25:37 +0000