From 3581faeeac6b2c18fab57c228a4d436460a48e1d Mon Sep 17 00:00:00 2001 From: Sean Chittenden Date: Fri, 5 Dec 2003 21:22:42 +0000 Subject: Remove the PORTNAME from postgreql-client. PORTNAME is set by MASTERDIR/Makefile[1]. Improve the CONFLICTS messages[2]. Fix the DEPENDS so that MIT krb5 depends on security/krb5, not heimdal[3]. Add a file that was missing in the upgrade that has PostgreSQL log to syslog by default[4]. PR: [4] Originally submitted in ports/59402 Submitted by: [1,2,4] maintainer [3] keoki seu --- databases/postgresql80-server/Makefile | 8 ++++---- ...h-src:backend:utils:misc:postgresql.conf.sample | 24 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 databases/postgresql80-server/files/patch-src:backend:utils:misc:postgresql.conf.sample (limited to 'databases/postgresql80-server') diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index 9192a2f1d160..4f17a17f902b 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -74,11 +74,11 @@ CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}" PLIST_SUB+= SERVER="@comment " PKGNAMESUFFIX= -client PKGMSG= "" -CONFLICTS= postgresql-7* +CONFLICTS= postgresql-7* postgresql-devel-* .else PKGMESSAGE= ${FILESDIR}/pkg-message.server PKGMSG= ${PKGMESSAGE} -CONFLICTS= postgresql-7*client +CONFLICTS= postgresql-7*client postgreql-devel-* PLIST_SUB+= SERVER="" INSTALL_TARGET+= install-all-headers MAKEFILE= GNUmakefile @@ -86,12 +86,12 @@ MAKEFILE= GNUmakefile .if defined(WITH_MIT_KRB5) KRB5CONF= ${LOCALBASE}/bin/krb5-config +LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5 WITH_KRB5= yes .endif .if defined(WITH_HEIMDAL_KRB5) KRB5CONF= /usr/bin/krb5-config -LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5 WITH_KRB5= yes .endif @@ -178,7 +178,7 @@ pre-everything:: .if defined(WITH_HEIMDAL_KRB5) && !exists(${KRB5CONF}) @${ECHO} "Unable to find krb5-config in the base system. Undefine" @${ECHO} "WITH_HEIMDAL_KRB5 or add MAKE_KERBEROS5=yes to /etc/make.conf" - @${ECHO} "and remake world (or undefine the WITH_HEIMDAL_KRB5 tunable)." + @${ECHO} "and remake world." @exit 1 .endif diff --git a/databases/postgresql80-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql80-server/files/patch-src:backend:utils:misc:postgresql.conf.sample new file mode 100644 index 000000000000..b9842b0c94f6 --- /dev/null +++ b/databases/postgresql80-server/files/patch-src:backend:utils:misc:postgresql.conf.sample @@ -0,0 +1,24 @@ +--- src/backend/utils/misc/postgresql.conf.sample~ Wed Oct 8 05:49:38 2003 ++++ src/backend/utils/misc/postgresql.conf.sample Tue Nov 18 05:08:08 2003 +@@ -136,9 +136,9 @@ + + # - Syslog - + +-#syslog = 0 # range 0-2; 0=stdout; 1=both; 2=syslog +-#syslog_facility = 'LOCAL0' +-#syslog_ident = 'postgres' ++syslog = 2 # range 0-2; 0=stdout; 1=both; 2=syslog ++syslog_facility = 'LOCAL0' ++syslog_ident = 'postgres' + + # - When to Log - + +@@ -162,7 +162,7 @@ + # milliseconds. Zero prints all queries. + # Minus-one disables. + +-#silent_mode = false # DO NOT USE without Syslog! ++silent_mode = true # DO NOT USE without Syslog! + + # - What to Log - + -- cgit v1.2.3