Changes 1.3.2:

- security fixes
- various bug fixes and small improvements
- new XHTML strict template tree
- add UTF-8 support
- add IPv6 support
- add Raven single sign-on authentication

15 files changed, 237 insertions, 247 deletions

diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 2eb45a4d6e6..045c2540963 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2010/01/17 12:02:25 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.39 2010/06/08 12:34:38 adam Exp $
 
-DISTNAME=	prayer-1.0.18
-PKGREVISION=	6
+DISTNAME=	prayer-1.3.2
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
 
@@ -10,23 +8,31 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/
 COMMENT=	Small, fast, web mail interface
 
-USE_TOOLS+=	gmake perl
-PRAYER_USER=	prayer
-PRAYER_GROUP=	prayer
-PKG_GROUPS=	${PRAYER_GROUP}
-PKG_USERS=	${PRAYER_USER}:${PRAYER_GROUP}
+BDB_ACCEPTED=		db4 db5
+USE_TOOLS+=		gmake perl
+REPLACE_PERL+=		templates/src/build_index.pl
+REPLACE_PERL+=		templates/src/build_map_index.pl
+
+PRAYER_USER=		prayer
+PRAYER_GROUP=		prayer
+PKG_GROUPS=		${PRAYER_GROUP}
+PKG_USERS=		${PRAYER_USER}:${PRAYER_GROUP}
 
 PKG_GROUPS_VARS+=	PRAYER_GROUP
 PKG_USERS_VARS+=	PRAYER_USER
 BUILD_DEFS+=		VARBASE
 
-MAKE_ENV+=	EGDIR=${EGDIR:Q}
-MAKE_ENV+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-MAKE_ENV+=	BUILDLINK_PREFIX.db4="${BUILDLINK_PREFIX.db4}"
+MAKE_ENV+=	BASECFLAGS=${CFLAGS:Q}
+MAKE_ENV+=	BDBBASE="${BDBBASE}"
+MAKE_ENV+=	BDB_TYPE="${BDB_TYPE}"
 MAKE_ENV+=	BUILDLINK_PREFIX.imap-uw="${BUILDLINK_PREFIX.imap-uw}"
-MAKE_ENV+=	SSLCERTS=${SSLCERTS:Q}
+MAKE_ENV+=	EGDIR=${EGDIR}
+MAKE_ENV+=	KRB5BASE="${KRB5BASE}"
+MAKE_ENV+=	KRB5_TYPE=${KRB5_TYPE:Q}
+MAKE_ENV+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 MAKE_ENV+=	PRAYER_USER=${PRAYER_USER} PRAYER_GROUP=${PRAYER_GROUP}
 MAKE_ENV+=	ROOT_USER=${ROOT_USER} ROOT_GROUP=${ROOT_GROUP}
+MAKE_ENV+=	SSLCERTS=${SSLCERTS:Q}
 
 PKG_SYSCONFSUBDIR=	prayer
 EGDIR=			${PREFIX}/share/examples/prayer
@@ -36,13 +42,12 @@ RCD_SCRIPTS=		prayer
 CONF_FILES=	${EGDIR}/prayer.cf ${PKG_SYSCONFDIR}/prayer.cf
 CONF_FILES+=	${EGDIR}/prayer-accountd.cf ${PKG_SYSCONFDIR}/prayer-accountd.cf
 CONF_FILES+=	${EGDIR}/motd.html ${PKG_SYSCONFDIR}/motd.html
-CONF_FILES+=	${EGDIR}/welcome.html ${PKG_SYSCONFDIR}/welcome.html
 
 VAR_PREFIX=	${VARBASE}/spool/prayer
 
 OWN_DIRS_PERMS+=${VAR_PREFIX} ${PRAYER_USER} ${PRAYER_GROUP} 0750
 
-FILES_SUBST+=	OPSYS=${OPSYS:Q}
+FILES_SUBST+=	OPSYS=${OPSYS}
 FILES_SUBST+=	VAR_PREFIX=${VAR_PREFIX:Q}
 
 post-patch:
@@ -53,11 +58,10 @@ post-patch:
 pre-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 
-.include "../../databases/db4/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mail/imap-uw/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/krb5.buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/prayer/PLIST b/mail/prayer/PLIST
index 7aee278df87..08310e99554 100644
--- a/mail/prayer/PLIST
+++ b/mail/prayer/PLIST
@@ -1,5 +1,10 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:04:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/06/08 12:34:38 adam Exp $
+man/man5/prayer.cf.5
+man/man8/prayer-session.8
+man/man8/prayer-ssl-prune.8
+man/man8/prayer.8
 sbin/prayer
+sbin/prayer-chroot
 sbin/prayer-cyclog
 sbin/prayer-db-prune
 sbin/prayer-sem-prune
@@ -8,66 +13,48 @@ sbin/prayer-ssl-prune
 share/examples/prayer/motd.html
 share/examples/prayer/prayer-accountd.cf
 share/examples/prayer/prayer.cf
-share/examples/prayer/welcome.html
 share/examples/rc.d/prayer
-share/prayer/help/abook_add.html
-share/prayer/help/abook_list.html
-share/prayer/help/abook_lookup.html
-share/prayer/help/abook_search.html
-share/prayer/help/abook_take.html
-share/prayer/help/abook_update.html
-share/prayer/help/abook_xfer.html
-share/prayer/help/attachments.html
-share/prayer/help/block.html
-share/prayer/help/compose/large.html
-share/prayer/help/compose/normal.html
-share/prayer/help/compose/postponed.html
-share/prayer/help/compose/role_list.html
-share/prayer/help/copy.html
-share/prayer/help/dictionary.html
-share/prayer/help/display.html
-share/prayer/help/favourites.html
-share/prayer/help/filter.html
-share/prayer/help/filter_select.html
-share/prayer/help/folders.html
-share/prayer/help/fullname.html
-share/prayer/help/include.html
-share/prayer/help/list.html
-share/prayer/help/manage.html
-share/prayer/help/passwd.html
-share/prayer/help/prefs/compose1.html
-share/prayer/help/prefs/compose2.html
-share/prayer/help/prefs/display1.html
-share/prayer/help/prefs/folder.html
-share/prayer/help/prefs/general.html
-share/prayer/help/quota.html
-share/prayer/help/redirect.html
-share/prayer/help/rename.html
-share/prayer/help/reply.html
-share/prayer/help/roles_entry.html
-share/prayer/help/roles_list.html
-share/prayer/help/search.html
-share/prayer/help/sieve.html
-share/prayer/help/spam.html
-share/prayer/help/toolbar.html
-share/prayer/help/transfer.html
-share/prayer/help/upload_select.html
-share/prayer/help/vacation.html
-share/prayer/help/vaclog.html
-share/prayer/help/welcome.html
 share/prayer/icons/addressbook-inactive.gif
 share/prayer/icons/addressbook.gif
 share/prayer/icons/back.gif
+share/prayer/icons/bg-home-menu-top.gif
+share/prayer/icons/bg-nav-primary.gif
+share/prayer/icons/bg-tab-left-active.gif
+share/prayer/icons/bg-tab-left-over.gif
+share/prayer/icons/bg-tab-left.gif
+share/prayer/icons/bg-tab-right-active.gif
+share/prayer/icons/bg-tab-right-over.gif
+share/prayer/icons/bg-tab-right.gif
+share/prayer/icons/blank.gif
+share/prayer/icons/button-search.gif
+share/prayer/icons/button2-bm.png
 share/prayer/icons/compose-inactive.gif
 share/prayer/icons/compose.gif
 share/prayer/icons/cross.gif
 share/prayer/icons/dir.gif
 share/prayer/icons/display-inactive.gif
 share/prayer/icons/display.gif
+share/prayer/icons/divider-site-tools-small.gif
+share/prayer/icons/down.gif
 share/prayer/icons/folders-inactive.gif
 share/prayer/icons/folders.gif
 share/prayer/icons/help-inactive.gif
 share/prayer/icons/help.gif
+share/prayer/icons/icon-alert-normal.gif
+share/prayer/icons/icon-alert-warning.gif
+share/prayer/icons/icon-arrow-home-menu-orange.gif
+share/prayer/icons/icon-arrow-home-menu.gif
+share/prayer/icons/icon-arrow-nav-breadcrumb.gif
+share/prayer/icons/icon-arrow-nav-primary-down.gif
+share/prayer/icons/icon-arrow-nav-primary-up.gif
+share/prayer/icons/icon-arrow-nav-primary.gif
+share/prayer/icons/icon-home.gif
+share/prayer/icons/icon-quick-links.gif
+share/prayer/icons/icon-section.gif
+share/prayer/icons/identifier.gif
+share/prayer/icons/identifier800.gif
+share/prayer/icons/ifmlogo-small.gif
+share/prayer/icons/ifmlogo.gif
 share/prayer/icons/left-inactive.gif
 share/prayer/icons/left.gif
 share/prayer/icons/leftleft-inactive.gif
@@ -80,13 +67,45 @@ share/prayer/icons/manage.gif
 share/prayer/icons/msg-answered.gif
 share/prayer/icons/msg-deleted.gif
 share/prayer/icons/msg-seen.gif
+share/prayer/icons/msg-seen.png
 share/prayer/icons/msg-unseen.gif
+share/prayer/icons/next-white.gif
+share/prayer/icons/next.gif
 share/prayer/icons/off.gif
 share/prayer/icons/on.gif
 share/prayer/icons/paperclip-small.gif
+share/prayer/icons/prev-white.gif
+share/prayer/icons/previous.gif
+share/prayer/icons/raven.gif
 share/prayer/icons/right-inactive.gif
 share/prayer/icons/right.gif
 share/prayer/icons/rightright-inactive.gif
 share/prayer/icons/rightright.gif
+share/prayer/icons/rssfeed.gif
+share/prayer/icons/sort-d.gif
+share/prayer/icons/sort-u.gif
+share/prayer/icons/srssfeed.gif
 share/prayer/icons/tick.gif
+share/prayer/icons/ucs-id-small.jpg
+share/prayer/icons/ucs-s.gif
+share/prayer/icons/ucs.gif
 share/prayer/icons/univheader.gif
+share/prayer/static/blue.css
+share/prayer/static/camstyle.css
+share/prayer/static/common.css
+share/prayer/static/content.css
+share/prayer/static/forms.css
+share/prayer/static/gray.css
+share/prayer/static/green.css
+share/prayer/static/help.css
+share/prayer/static/high.css
+share/prayer/static/ie6.css
+share/prayer/static/ie7.css
+share/prayer/static/layout.css
+share/prayer/static/links.css
+share/prayer/static/minmax.js
+share/prayer/static/print.css
+share/prayer/static/reset.css
+share/prayer/static/rssfeed.css
+share/prayer/static/typography.css
+share/prayer/static/yellow.css
diff --git a/mail/prayer/distinfo b/mail/prayer/distinfo
index b18319cf453..e094dba8374 100644
--- a/mail/prayer/distinfo
+++ b/mail/prayer/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.13 2007/06/15 23:28:16 wiz Exp $
+$NetBSD: distinfo,v 1.14 2010/06/08 12:34:38 adam Exp $
 
-SHA1 (prayer-1.0.18.tar.gz) = ab90f9bfac568ed93993beff745f1433d20f1dcc
-RMD160 (prayer-1.0.18.tar.gz) = bbe26134c69fd70026fd207f8ca0edcd24da7f74
-Size (prayer-1.0.18.tar.gz) = 566168 bytes
-SHA1 (patch-aa) = aa28cf4a598d9c8c3bf14dc9f0034ab16dccec06
-SHA1 (patch-ab) = 72f6b8768303222a8798ca07e83efccdefa8fe25
-SHA1 (patch-ac) = b7df87589bdc2fd2894f2028652e01aa0c181fa1
-SHA1 (patch-ad) = a4d60d312012be24308405b3668edb4931892c06
-SHA1 (patch-ae) = 378adaf7a2153a54824b60ee50b7a8a4591188ff
-SHA1 (patch-af) = bc3b5b7181da0646995955245b2d9d4cc8032eed
-SHA1 (patch-ag) = 2899392ad6a852dad0ccfdbea2c1a6a8f7c5feb7
-SHA1 (patch-ah) = 7197f80ad71700276c79666090b62628c128ca21
-SHA1 (patch-ai) = 0b3edeea78d16c3792d540ea0a92943ed0bb7583
+SHA1 (prayer-1.3.2.tar.gz) = 935923fe8f4c8734d4f61cbe0228bb040f0f8152
+RMD160 (prayer-1.3.2.tar.gz) = 588377d2442e2288f097542055fbc998509e57e0
+Size (prayer-1.3.2.tar.gz) = 748315 bytes
+SHA1 (patch-aa) = db0b7a760e7ffb622e84ace97d81535c4ce0af36
+SHA1 (patch-ab) = a8ea39b18ced1b4037d3de244e4fba70fc92dfc8
+SHA1 (patch-ac) = aa1382214b9f6288c41c545c2f3b8dee04a13672
+SHA1 (patch-ad) = df8f543ecd6dacbed2cb046312c75146a5a9f6bb
+SHA1 (patch-ae) = b049fb2c284280ae9635d3337413fbd8e8904f35
+SHA1 (patch-af) = 3dde54cc6e93085e659adef6ef32bc1a3cd5af3f
+SHA1 (patch-ag) = e24faf585cd1288ba0e866a64737cd7202498dfa
+SHA1 (patch-ah) = 0b4018c703ecb315b71f74f05b4b73b69bac3326
+SHA1 (patch-ai) = a8c881876689b32f09ffec0318934f108849852f
+SHA1 (patch-aj) = 773c813b81c725b00cd5ecae9a276c7dc8b2c9fb
+SHA1 (patch-ak) = dbde773d205837e0ce4d0838f99c51f931b41753
diff --git a/mail/prayer/files/prayer.sh b/mail/prayer/files/prayer.sh
index bb28d150fa1..f4fa6d54fa3 100644
--- a/mail/prayer/files/prayer.sh
+++ b/mail/prayer/files/prayer.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: prayer.sh,v 1.1 2005/01/09 00:07:47 schmonz Exp $
+# $NetBSD: prayer.sh,v 1.2 2010/06/08 12:34:38 adam Exp $
 #
 # This shell script takes care of starting and stopping prayer,
 # a program providing web access to a mail server using IMAP
@@ -25,7 +25,7 @@ name="prayer"
 rcvar=$name
 command="@PREFIX@/sbin/prayer"
 command_args=""
-pidfile="@VAR_PREFIX@/pid/prayer"
+pidfile="@VAR_PREFIX@/pid/prayer.pid"
 
 prayer_flags=${prayer_flags-""} 
 OPSYS=@OPSYS@
diff --git a/mail/prayer/patches/patch-aa b/mail/prayer/patches/patch-aa
index 9dcedb8a888..f73aee7fee3 100644
--- a/mail/prayer/patches/patch-aa
+++ b/mail/prayer/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2007/06/15 23:28:17 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2010/06/08 12:34:38 adam Exp $
 
---- defaults/Config.orig	2006-04-05 12:35:35.000000000 +0000
+--- defaults/Config.orig	2009-09-01 10:25:22.000000000 +0000
 +++ defaults/Config
-@@ -16,9 +16,9 @@ DIRECT_ENABLE        = false  # Experime
+@@ -15,9 +15,9 @@ FENCE_ENABLE         = false  # Use Elec
  MUTEX_SEMAPHORE      = false  # Use SYSV mutexes rather than file locking
  
  # Following depend on the way that you have configured c-client
@@ -14,60 +14,70 @@ $NetBSD: patch-aa,v 1.9 2007/06/15 23:28:17 wiz Exp $
 +CCLIENT_KERB_ENABLE  = true  # C-client was built with Kerberos support
  
  # Probably don't need the following
- ACCOUNTD_ENABLE      = false  # Only of use in Cambridge at the moment.
-@@ -32,13 +32,13 @@ CC           = gcc
+ RAVEN_ENABLE         = false  # Only of use in Cambridge at the moment.
+@@ -31,22 +31,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.
- #BASECFLAGS   = -Wall -g
- #BASELDFLAGS  = -g
--BASECFLAGS   = -Wall -g -O2
--BASELDFLAGS  = -g -O2
-+BASECFLAGS   = -Wall
-+BASELDFLAGS  = 
- BASE_LIBS    = -lcrypt
+ # 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
+ endif
+ ifdef INCLUDES
+   BASECFLAGS += $(INCLUDES)
+ endif
+-ifdef LDFLAGS
+- BASELDFLAGS  = $(LDFLAGS)
+-else
+- BASELDFLAGS  = -g
+-endif
++BASELDFLAGS  =
  
- # Base Compiler options for Sun SUNWspro compiler
-@@ -58,9 +58,9 @@ BASE_LIBS    = -lcrypt
+ # Minimal libraries needed by Linux
+ BASE_LIBS    = -lcrypt -lutil
+@@ -71,9 +67,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_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
- CCLIENT_SSL_ENABLE  = true
  
  #
-@@ -107,8 +107,8 @@ PAM_INCLUDE =
+ # Following works with imap-devel RPM package from Redhat 7.
+@@ -119,8 +115,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/usr/include
-+KERB_LIBS    = -L/usr/lib -lgssapi -lcom_err -lkrb5 -lasn1 -lroken
++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)
  #
-@@ -132,8 +132,8 @@ DB_INCLUDE=
- DB_LIBS=-ldb
+@@ -140,8 +136,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
--#DB_LIBS=-L/usr/local/lib -ldb4
-+DB_INCLUDE=-I${BUILDLINK_PREFIX.db4}/include/db4
-+DB_LIBS=-L${BUILDLINK_PREFIX.db4}/lib -ldb4
- 
- ############################################################################
- 
-@@ -147,16 +147,16 @@ BROOT=
+ #DB_INCLUDE=-I/usr/local/include/db4
+@@ -159,16 +155,16 @@ BROOT=
  
  # Directory, User and group for read-write files: log files, sockets etc
  VAR_PREFIX = /var/spool/prayer
@@ -89,7 +99,7 @@ $NetBSD: patch-aa,v 1.9 2007/06/15 23:28:17 wiz Exp $
  
  # Access permissions for general objects (wrt above users and groups)
  PUBLIC_EXEC  = 0755
-@@ -169,6 +169,6 @@ PRIVATE_DIR  = 0750
+@@ -181,6 +177,6 @@ PRIVATE_DIR  = 0750
  PRIVATE_FILE = 0640
  
  # Location of configuration files and binaries
diff --git a/mail/prayer/patches/patch-ab b/mail/prayer/patches/patch-ab
index 9d8b3c13e3e..92350d07741 100644
--- a/mail/prayer/patches/patch-ab
+++ b/mail/prayer/patches/patch-ab
@@ -1,36 +1,36 @@
-$NetBSD: patch-ab,v 1.4 2005/01/09 00:07:47 schmonz Exp $
+$NetBSD: patch-ab,v 1.5 2010/06/08 12:34:38 adam Exp $
 
---- files/install.sh.orig	2004-06-18 09:58:46.000000000 -0400
-+++ files/install.sh
-@@ -67,21 +67,25 @@ if [ ! -d ${PREFIX}/etc ]; then
+--- files/install.sh.orig	2008-09-16 11:59:56 +0200
++++ files/install.sh	2010-05-01 20:19:56 +0200
+@@ -67,21 +67,25 @@
      ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc
  fi
  
 -if [ ! -d ${PREFIX}/certs ]; then
 -    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs
 +if [ ! -d ${SSLCERTS} ]; then
-+    ${BSD_INSTALL_DATA_DIR} ${SSLCERTS}
++	${BSD_INSTALL_DATA_DIR} ${SSLCERTS}
  fi
  
  if [ ! -d ${BIN_DIR} ]; then
-     ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${BIN_DIR}
+     ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR}
  fi
  
 +if [ ! -d "${PREFIX}/share/prayer" ]; then
-+    mkdir "${PREFIX}/share/prayer"
++	mkdir "${PREFIX}/share/prayer"
 +fi
 +
- for i in help icons
+ for i in icons static
  do
 -    if [ -d "${PREFIX}/${i}" ]; then
-+    if [ -d "${PREFIX}/share/prayer/${i}" ]; then
++	if [ -d "${PREFIX}/share/prayer/${i}" ]; then
          echo Removing old ${i}
 -        rm -rf ${PREFIX}/${i}
-+        rm -rf ${PREFIX}/share/prayer/${i}
++		rm -rf ${PREFIX}/share/prayer/${i}
      fi
      echo Copying ${i}
 -    (tar cf - ${i}) | (cd ${PREFIX} ; tar xf -)
 -    (cd ${PREFIX}; chown -R ${RO_USER}:${RO_GROUP} ${i})
-+    (tar cf - ${i}) | (cd ${PREFIX}/share/prayer ; tar xf -)
-+    (cd ${PREFIX}/share/prayer; chown -R ${RO_USER}:${RO_GROUP} ${i})
++	(tar cf - ${i}) | (cd ${PREFIX}/share/prayer ; tar xf -)
++	(cd ${PREFIX}/share/prayer; chown -R ${RO_USER}:${RO_GROUP} ${i})
  done
diff --git a/mail/prayer/patches/patch-ac b/mail/prayer/patches/patch-ac
index bf21de0935a..682b4ce04be 100644
--- a/mail/prayer/patches/patch-ac
+++ b/mail/prayer/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2005/01/09 00:07:47 schmonz Exp $
+$NetBSD: patch-ac,v 1.6 2010/06/08 12:34:38 adam Exp $
 
---- files/Makefile.orig	2003-05-11 10:59:12.000000000 -0400
-+++ files/Makefile
-@@ -14,10 +14,10 @@ endif
+--- files/Makefile.orig	2008-10-30 12:28:59 +0100
++++ files/Makefile	2010-05-01 20:12:14 +0200
+@@ -14,10 +14,10 @@
  all:	./etc/prayer.cf ./init.d/prayer
  
  ./etc/prayer.cf: ./etc/prayer.cf.SRC
@@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.5 2005/01/09 00:07:47 schmonz Exp $
  
  
  ifeq ($(strip $(SSL_ENABLE)), true)
-@@ -53,24 +53,24 @@ distclean:
+@@ -53,20 +53,20 @@
  install-cert:
  	if [ -f certs/prayer.pem ]; then \
  	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \
@@ -40,14 +40,9 @@ $NetBSD: patch-ac,v 1.5 2005/01/09 00:07:47 schmonz Exp $
 -	etc/motd.html ${BROOT}${PREFIX}/etc
 +	etc/motd.html ${BROOT}${EGDIR}/motd.html
  
- install-welcome:
- 	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
--	etc/welcome.html ${BROOT}${PREFIX}/etc
-+	etc/welcome.html ${BROOT}${EGDIR}/welcome.html
- 
  install:
  	PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \
-@@ -79,13 +79,9 @@ install:
+@@ -75,12 +75,9 @@
  	PUBLIC_DIR=$(PUBLIC_DIR) PRIVATE_DIR=$(PRIVATE_DIR) \
  	PUBLIC_FILE=$(PUBLIC_FILE) PRIVATE_FILE=$(PRIVATE_FILE) \
  	PUBLIC_EXEC=$(PUBLIC_FILE) PRIVATE_EXEC=$(PRIVATE_EXEC) \
@@ -58,8 +53,7 @@ $NetBSD: patch-ac,v 1.5 2005/01/09 00:07:47 schmonz Exp $
 -	if [ ! -f $(BROOT)$(PRAYER_CONFIG_FILE) ]; then $(MAKE) install-config; fi
 -	if [ ! -f $(BROOT)$(ACCOUNTD_CONFIG_FILE) ]; then $(MAKE) install-aconfig; fi
 -	if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi
--	if [ ! -f $(BROOT)$(PREFIX)/etc/welcome.html ]; then $(MAKE) install-welcome; fi
-+	$(MAKE) install-cert install-config install-aconfig install-motd install-welcome
++	$(MAKE) install-cert install-config install-aconfig install-motd
  
  redhat-install-init.d:
  	install -D -o root -g root -m 755 \
diff --git a/mail/prayer/patches/patch-ad b/mail/prayer/patches/patch-ad
index 822528f17d2..2bded5f5e16 100644
--- a/mail/prayer/patches/patch-ad
+++ b/mail/prayer/patches/patch-ad
@@ -1,29 +1,9 @@
-$NetBSD: patch-ad,v 1.5 2007/06/15 23:28:17 wiz Exp $
+$NetBSD: patch-ad,v 1.6 2010/06/08 12:34:38 adam Exp $
 
---- prayer/Makefile.orig	2006-04-11 12:31:57.000000000 +0000
-+++ prayer/Makefile
-@@ -12,7 +12,7 @@ endif
- 
- # Default list of things to build
- BIN = prayer prayer-session prayer-ssl-prune prayer-cyclog prayer-sem-prune \
--  prayer-chroot
-+  # prayer-chroot
- 
- # Enable on the fly compression
- ifeq ($(strip $(GZIP_ENABLE)), true)
-@@ -102,8 +102,8 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t
-   SESSION_LIBS += $(KERB_LIBS)
- endif
- 
--CFLAGS  = $(BASECFLAGS) $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
--LDFLAGS = $(BASELDFLAGS)
-+CFLAGS  += $(BASECFLAGS) $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
-+LDFLAGS += $(BASELDFLAGS)
- 
- SHARED_OBJS = \
-  pool.o list.o assoc.o memblock.o buffer.o string.o config.o user_agent.o \
-@@ -174,21 +174,21 @@ clean:
- 	-rm -f $(BIN) test core *.o *.flc *~ \#*\#
+--- servers/Makefile.orig	2009-08-20 11:48:35 +0200
++++ servers/Makefile	2010-05-01 21:00:07 +0200
+@@ -101,13 +101,13 @@
+ 	-rm -f $(BIN) core *.o *.flc *~ \#*\#
  
  install: all
 -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
@@ -33,23 +13,10 @@ $NetBSD: patch-ad,v 1.5 2007/06/15 23:28:17 wiz Exp $
 +	$(BSD_INSTALL_PROGRAM) \
  	  prayer           $(BROOT)$(BIN_DIR)
 -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
--	  prayer-chroot           $(BROOT)$(BIN_DIR)
--	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-+#	$(BSD_INSTALL_PROGRAM) \
-+#	  prayer-chroot           $(BROOT)$(BIN_DIR)
 +	$(BSD_INSTALL_PROGRAM) \
- 	  prayer-session   $(BROOT)$(BIN_DIR)
+ 	  prayer-chroot           $(BROOT)$(BIN_DIR)
 -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
 +	$(BSD_INSTALL_PROGRAM) \
- 	  prayer-ssl-prune $(BROOT)$(BIN_DIR)
--	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-+	$(BSD_INSTALL_PROGRAM) \
- 	  prayer-sem-prune $(BROOT)$(BIN_DIR)
--	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-+	$(BSD_INSTALL_SCRIPT) \
- 	  prayer-db-prune $(BROOT)$(BIN_DIR)
--	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-+	$(BSD_INSTALL_SCRIPT) \
- 	  prayer-cyclog    $(BROOT)$(BIN_DIR)
+ 	  prayer-session   $(BROOT)$(BIN_DIR)
  
  prayer: $(PRAYER_OBJS) prayer_main.o
diff --git a/mail/prayer/patches/patch-ae b/mail/prayer/patches/patch-ae
index 01a167754ae..28205a5697b 100644
--- a/mail/prayer/patches/patch-ae
+++ b/mail/prayer/patches/patch-ae
@@ -1,42 +1,26 @@
-$NetBSD: patch-ae,v 1.4 2007/06/15 23:28:17 wiz Exp $
+$NetBSD: patch-ae,v 1.5 2010/06/08 12:34:38 adam Exp $
 
---- files/etc/prayer.cf.SRC.orig	2006-04-11 11:13:21.000000000 +0000
-+++ files/etc/prayer.cf.SRC
-@@ -382,13 +382,13 @@ ispell_path         = /usr/bin/ispell
- #  <login_suffix_path>
- 
- # Login page prefix
--#login_prefix_path   = "$prefix/etc/login_prefix.html"
-+#login_prefix_path   = "__PKG_SYSCONFDIR__/login_prefix.html"
+--- files/etc/prayer.cf.SRC.orig	2008-10-30 12:28:59 +0100
++++ files/etc/prayer.cf.SRC	2010-05-01 22:20:02 +0200
+@@ -376,7 +376,7 @@
+ ispell_path         = /usr/bin/ispell
  
  # Message of the day file
--#motd_path           = "$prefix/etc/motd.html"
-+#motd_path           = "__PKG_SYSCONFDIR__/motd.html"
- 
- # Login page suffix
--#login_suffix_path   = "$prefix/etc/login_suffix.html"
-+#login_suffix_path   = "__PKG_SYSCONFDIR__/login_suffix.html"
+-motd_path           = "$prefix/etc/motd.html"
++motd_path           = "__PKG_SYSCONFDIR__/motd.html"
  
- # Login security: Prayer's front page defaults to a login form.
- # If the user does not connect via SSL then this can be changed
-@@ -407,16 +407,16 @@ ssl_redirect        = FALSE
+ # HTML to insert into login page
+ #login_insert1_path   = "$prefix/etc/ucsnews.html"
+@@ -401,10 +401,10 @@
  ssl_required        = FALSE
  
- # Session banner (local HTML inserted into each page of login session)
--#session_banner_path = "$prefix/etc/session_banner.html"
-+#session_banner_path = "__PKG_SYSCONFDIR__/session_banner.html"
- 
- # Welcome text displayed when user first logs in
--welcome_path        = "$prefix/etc/welcome.html"
-+welcome_path        = "__PKG_SYSCONFDIR__/welcome.html"
- 
- # Location of help files
--help_dir            = "$prefix/help"
-+help_dir            = "__PREFIX__/share/prayer/help"
- 
  # Location of icon files
 -icon_dir            = "$prefix/icons"
 +icon_dir            = "__PREFIX__/share/prayer/icons"
  
+ # Location of icon files
+-static_dir          = "$prefix/static"
++static_dir          = "__PREFIX__/share/prayer/static"
+ 
  # Location of binary files
  bin_dir             = "__BIN_DIR__"
diff --git a/mail/prayer/patches/patch-af b/mail/prayer/patches/patch-af
index 682e1f8e095..454c6315993 100644
--- a/mail/prayer/patches/patch-af
+++ b/mail/prayer/patches/patch-af
@@ -1,28 +1,12 @@
-$NetBSD: patch-af,v 1.6 2007/06/15 23:28:17 wiz Exp $
+$NetBSD: patch-af,v 1.7 2010/06/08 12:34:38 adam Exp $
 
---- prayer/mydb_db3.c.orig	2006-04-20 10:10:00.000000000 +0000
-+++ prayer/mydb_db3.c
-@@ -139,13 +139,23 @@ static int myinit(const char *dbdir, int
-     dbenv->set_verbose(dbenv, DB_VERB_WAITSFOR, 1);
-   }
- #ifdef DB_VERB_CHKPOINT
-+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3
-   if (CONFIG_DB_VERBOSE > 1) {
-     dbenv->set_verbose(dbenv, DB_VERB_CHKPOINT, 1);
-   }
- #endif
-+#endif
-   dbenv->set_lk_detect(dbenv, CONFIG_DEADLOCK_DETECTION);
+--- lib/os_bsd.c.orig	2010-06-06 14:45:50.000000000 +0000
++++ lib/os_bsd.c
+@@ -17,7 +17,6 @@
+ #include <signal.h>
+ #include <netdb.h>
+ 
+-#include <libutil.h>
+ 
+ /* ====================================================================== */
  
-+#if DB_VERSION_MAJOR >= 4
-+  r = dbenv->set_lk_max_locks(dbenv, 50000);
-+  if (!r)
-+    r = dbenv->set_lk_max_lockers(dbenv, 50000);
-+  if (!r)
-+    r = dbenv->set_lk_max_objects(dbenv, 50000);
-+#else
-   r = dbenv->set_lk_max(dbenv, 50000);
-+#endif
-   if (r) {
-     log_panic("DBERROR: set_lk_max(): %s", db_strerror(r));
-     abort();
diff --git a/mail/prayer/patches/patch-ag b/mail/prayer/patches/patch-ag
index e3f680ca91c..81f23310dfa 100644
--- a/mail/prayer/patches/patch-ag
+++ b/mail/prayer/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2007/06/15 23:28:17 wiz Exp $
+$NetBSD: patch-ag,v 1.3 2010/06/08 12:34:38 adam Exp $
 
---- prayer/response.c.orig	2003-04-15 13:00:03.000000000 +0000
-+++ prayer/response.c
-@@ -694,7 +694,12 @@ response_file(struct request *request,
+--- shared/response.c.orig	2008-09-16 11:59:58 +0200
++++ shared/response.c	2010-05-01 21:21:55 +0200
+@@ -694,7 +694,12 @@
      } else
          bputs(b, "Content-Type: text/plain" CRLF);
  
diff --git a/mail/prayer/patches/patch-ah b/mail/prayer/patches/patch-ah
index a539ba849f4..4c32d18d2e1 100644
--- a/mail/prayer/patches/patch-ah
+++ b/mail/prayer/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.1 2006/01/24 19:55:53 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2010/06/08 12:34:38 adam Exp $
 
---- prayer/prayer_shared.h.orig	2006-01-24 19:11:36.000000000 +0000
-+++ prayer/prayer_shared.h
-@@ -28,8 +28,6 @@
- #include <grp.h>
+--- shared/shared.h.orig	2008-09-16 11:59:58 +0200
++++ shared/shared.h	2010-05-01 21:28:47 +0200
+@@ -27,8 +27,6 @@
  #include <assert.h>
  #include <netdb.h>
--
--extern int errno;               /* just in case */
- #endif
  
+-extern int errno;               /* just in case */
+-
+ #include "lib.h"
  #include "common.h"
+ #include "config.h"
diff --git a/mail/prayer/patches/patch-ai b/mail/prayer/patches/patch-ai
index 75e89fa9ba0..d305d58d097 100644
--- a/mail/prayer/patches/patch-ai
+++ b/mail/prayer/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1 2006/01/24 19:55:53 joerg Exp $
+$NetBSD: patch-ai,v 1.2 2010/06/08 12:34:38 adam Exp $
 
---- prayer/prayer_session.h.orig	2006-01-24 19:48:31.000000000 +0000
-+++ prayer/prayer_session.h
+--- session/prayer_session.h.orig	2008-09-16 11:59:58 +0200
++++ session/prayer_session.h	2010-05-01 21:30:33 +0200
 @@ -25,8 +25,6 @@
  #include <grp.h>
  #include <netdb.h>
@@ -10,4 +10,4 @@ $NetBSD: patch-ai,v 1.1 2006/01/24 19:55:53 joerg Exp $
 -
  #include "c-client.h"
  
- #define  PRAYER_FULL_HDRS
+ #include "shared.h"
diff --git a/mail/prayer/patches/patch-aj b/mail/prayer/patches/patch-aj
new file mode 100644
index 00000000000..f513292348b
--- /dev/null
+++ b/mail/prayer/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2010/06/08 12:34:38 adam Exp $
+
+--- man/Makefile.orig	2008-09-16 11:59:57 +0200
++++ man/Makefile	2010-05-01 21:37:04 +0200
+@@ -18,7 +18,7 @@
+ 	PUBLIC_DIR=$(PUBLIC_DIR) PRIVATE_DIR=$(PRIVATE_DIR) \
+ 	PUBLIC_FILE=$(PUBLIC_FILE) PRIVATE_FILE=$(PRIVATE_FILE) \
+ 	PUBLIC_EXEC=$(PUBLIC_FILE) PRIVATE_EXEC=$(PRIVATE_EXEC) \
+-	BIN_DIR=$(BIN_DIR) INSTALL=$(INSTALL) \
++	BIN_DIR=$(BIN_DIR) INSTALL="$(INSTALL)" \
+ 
+ 	mkdir -p $(BROOT)$(PREFIX)/man
+ 	mkdir -p $(BROOT)$(PREFIX)/man/man5
diff --git a/mail/prayer/patches/patch-ak b/mail/prayer/patches/patch-ak
new file mode 100644
index 00000000000..0e33c698bae
--- /dev/null
+++ b/mail/prayer/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2010/06/08 12:34:38 adam Exp $
+
+--- templates/Makefile.orig	2010-06-08 12:18:13.000000000 +0000
++++ templates/Makefile
+@@ -14,7 +14,7 @@ TEMPLATES = old cam
+ 
+ SUBDIRS = src $(TEMPLATES)
+ 
+-BASECFLAGS = -I../lib
++BASECFLAGS += -I../lib
+ MYCFLAGS  = $(BASECFLAGS)
+ 
+ all: index.o