$NetBSD: patch-defaults_Config,v 1.1 2011/06/30 01:17:38 schnoebe Exp $

--- defaults/Config.orig	2011-06-17 15:22:57.000000000 +0000
+++ defaults/Config
@@ -16,9 +16,9 @@ MUTEX_SEMAPHORE      = false  # Use SYSV
 TIDY_ENABLE          = true   # Use libtidy for HTML sanitisation.
 
 # Following depend on the way that you have configured c-client
-CCLIENT_SSL_ENABLE   = false  # C-client was built with SSL support
-CCLIENT_PAM_ENABLE   = false  # C-client was built with PAM support
-CCLIENT_KERB_ENABLE  = false  # C-client was built with Kerberos support
+CCLIENT_SSL_ENABLE   = true   # C-client was built with SSL support
+CCLIENT_PAM_ENABLE   = true   # C-client was built with PAM support
+CCLIENT_KERB_ENABLE  = true   # C-client was built with Kerberos support
 
 # Probably don't need the following
 RAVEN_ENABLE         = false  # Only of use in Cambridge at the moment.
@@ -32,22 +32,18 @@ CC           = gcc
 # Location of make program (GNU make required)
 MAKE         = gmake
 # Location of install program (GNU install or compatible required)
-INSTALL      = install
+INSTALL      = install -c
 
 # Base Compiler options for GCC (use CPPFLAGS and LDFLAGS if passed in)
 ifdef CPPFLAGS
-  BASECFLAGS   = $(CPPFLAGS)
+  BASECFLAGS   += $(CPPFLAGS)
 else
-  BASECFLAGS   = -Wall -g -O2
+  BASECFLAGS   += -Wall -g -O2
 endif
 ifdef INCLUDES
   BASECFLAGS += $(INCLUDES)
 endif
-ifdef LDFLAGS
- BASELDFLAGS  = $(LDFLAGS)
-else
- BASELDFLAGS  = -g
-endif
+BASELDFLAGS  =
 
 # Minimal libraries needed by Linux
 BASE_LIBS    = -lcrypt -lutil
@@ -72,9 +68,9 @@ BASE_LIBS    = -lcrypt -lutil
 # which points to ../../imap/c-client. This just reduces the amount of
 # noise output on each line when building the package.
 #
-CCLIENT_DIR=../c-client
-CCLIENT_INCLUDE=-I $(CCLIENT_DIR)
-CCLIENT_LIBS=./$(CCLIENT_DIR)/c-client.a
+CCLIENT_DIR=${BUILDLINK_PREFIX.imap-uw}
+CCLIENT_INCLUDE=-I $(CCLIENT_DIR)/include/c-client
+CCLIENT_LIBS=$(CCLIENT_DIR)/lib/libc-client.a
 
 #
 # Following works with imap-devel RPM package from Redhat 7.
@@ -108,8 +104,8 @@ FENCE_INCLUDE=
 FENCE_LIBS=-lmcheck
 
 # Tidy library (required if TIDY_ENABLE set)
-TIDY_INCLUDE=-I/usr/include/tidy
-TIDY_LIBS=-ltidy
+TIDY_INCLUDE=-I ${BUILDLINK_PREFIX.tidy}/include/tidy
+TIDY_LIBS=-L${BUILDLINK_PREFIX.tidy}/lib -Wl,-R${BUILDLINK_PREFIX.tidy}/lib -ltidy
 # Add following if using tidyp fork.
 # TIDY_IS_TIDYP=true
 
@@ -126,8 +122,8 @@ PAM_INCLUDE =
 PAM_LIBS    = -lpam
 
 # Kerberos (required if CCLIENT_KERB_ENABLE set)
-KERB_INCLUDE = -I/usr/kerberos/include
-KERB_LIBS    = -L/usr/kerberos/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
+KERB_INCLUDE = -I${KRB5BASE}/include
+KERB_LIBS    = -L${KRB5BASE}/lib -Wl,-R${KRB5BASE}/lib -lkrb5 -lcom_err
 
 # SSL definitions (required if SSL_ENABLE or CCLIENT_SSL_ENABLE set)
 #
@@ -147,8 +143,8 @@ OPENSSL=openssl
 # DB definitions (required if SESSION_CACHE_ENABLE set)
 #
 # Following suitable for Redhat Linux which has DB 3 preinstalled
-DB_INCLUDE=
-DB_LIBS=-ldb
+DB_INCLUDE=-I${BDBBASE}/include/${BDB_TYPE}
+DB_LIBS=-L${BDBBASE}/lib -Wl,-R${BDBBASE}/lib -l${BDB_TYPE}
 
 # Following suitable for FreeBSD with DB 4 package installed
 #DB_INCLUDE=-I/usr/local/include/db4
@@ -162,20 +158,20 @@ DB_LIBS=-ldb
 # RW_GROUP. It is important that nothing else can read the certificate file.
 
 # Build root (used by Redhat RPM system)
-BROOT=
+BROOT=${DESTDIR}
 
 # Directory, User and group for read-write files: log files, sockets etc
 VAR_PREFIX = /var/spool/prayer
-RW_USER    = prayer
-RW_GROUP   = prayer
+RW_USER    = ${PRAYER_USER}
+RW_GROUP   = ${PRAYER_GROUP}
 
 # Root Directory, User and group for read-only configuration files.
 # Default configuration and permissions does not allow prayer user to
 # update prayer configuration file.
 
-PREFIX    = /usr/local/prayer
-RO_USER   = root
-RO_GROUP  = prayer
+#PREFIX    = /usr/local/prayer
+RO_USER   = ${ROOT_USER}
+RO_GROUP  = ${PRAYER_GROUP}
 
 # Access permissions for general objects (wrt above users and groups)
 PUBLIC_EXEC  = 0755
@@ -188,6 +184,6 @@ PRIVATE_DIR  = 0750
 PRIVATE_FILE = 0640
 
 # Location of configuration files and binaries
-PRAYER_CONFIG_FILE   = ${PREFIX}/etc/prayer.cf
+PRAYER_CONFIG_FILE   = ${PKG_SYSCONFDIR}/prayer.cf
 BIN_DIR              = ${PREFIX}/sbin
-ACCOUNTD_CONFIG_FILE = ${PREFIX}/etc/prayer-accountd.cf
+ACCOUNTD_CONFIG_FILE = ${PKG_SYSCONFDIR}/prayer-accountd.cf