summaryrefslogtreecommitdiff
path: root/databases/postgresql73-server/Makefile
diff options
context:
space:
mode:
authorJimmy Olgeni <olgeni@FreeBSD.org>2001-04-25 17:17:56 +0000
committerJimmy Olgeni <olgeni@FreeBSD.org>2001-04-25 17:17:56 +0000
commita3b8729fbc5edd592ed0dc68c0115df2d80aa134 (patch)
tree67b4a7f01637dcb9abb30397c95204c6fb313307 /databases/postgresql73-server/Makefile
parentUpdate MASTER_SITES (diff)
Misc. changes and cleanups.
* Move the call to configure.postgresql7 from pre-fetch to pre-extract, so it won't hang while performing batch fetch operations (like portupgrade -F) * Add some TCL related files to pkg-plist.tcl, and add a PLIST_SUB in the Makefile to register the correct tcl version in the plist. * Do not start postgresql if the database directory does not exist: the startup sequence could hang because of this. * Use the "-s" option when starting postgresql with pg_ctl, so it won't display informational messages. Display only the port name, as do other packages startup scripts. Approved by: Palle Girgensohn <girgen@partitur.se>
Notes
Notes: svn path=/head/; revision=41897
Diffstat (limited to 'databases/postgresql73-server/Makefile')
-rw-r--r--databases/postgresql73-server/Makefile12
1 files changed, 5 insertions, 7 deletions
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 08d7b0775770..28d87052487d 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= postgresql
PORTVERSION= 7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
@@ -55,7 +55,7 @@ PG_PREFIX=""
PG_INCLUDE= include/pgsql
.endif
-PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}"
+PLIST_SUB= PG_PREFIX="${PG_PREFIX}" PG_INCLUDE="${PG_INCLUDE}" WITH_TCL="${WITH_TCL}"
MAN1= createdb.1 createlang.1 createuser.1 dropdb.1 droplang.1 \
dropuser.1 ecpg.1 initdb.1 initlocation.1 ipcclean.1 pg_config.1 \
@@ -92,7 +92,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
-pre-fetch:
+pre-extract:
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
pre-install:
@@ -143,11 +143,9 @@ post-install:
@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/010.pgsql.sh
.if defined(WITH_TCL)
# Preparing a loadable TCL-package (pkgIndex.tcl)
-# XXX This directory and the single file are not registered in
-# XXX the PLIST, because of different PREFIX.
- @${MKDIR} ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3
+ @${MKDIR} ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3
@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \
- > ${LOCALBASE}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl
+ > ${PREFIX}/lib/tcl${WITH_TCL}/Pgtcl1.3/pkgIndex.tcl
.endif
.if defined(WITH_JDBC)
@ ${MKDIR} -m 0555 ${PREFIX}/share/java/classes