Compiles and works with db4.

Creates user and group now.
"make reinstall" works again.
No change of ownership of /usr/pkg/sbin anymore.
New RCD script (needs work on non-NetBSD platforms regarding "ps" command
options).
Bump revision.

8 files changed, 109 insertions, 41 deletions

diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index b15a75db553..a7eec13048d 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/01/29 00:02:03 heinz Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/28 23:50:59 heinz Exp $
 #
 
 DISTNAME=	prayer-1.0.8
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
 
@@ -10,31 +10,42 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/
 COMMENT=	Small, fast, web mail interface
 
-PKG_GROUPS=	prayer
-
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
 USE_GNU_TOOLS+=	make
 USE_PERL5=	build
+PRAYER_USER=	prayer
+PRAYER_GROUP=	prayer
+PKG_GROUPS=	${PRAYER_GROUP}
+PKG_USERS=	${PRAYER_USER}:${PRAYER_GROUP}
 
 MAKE_ENV+=	EGDIR="${EGDIR}"
 MAKE_ENV+=	PKG_SYSCONFDIR="${PKG_SYSCONFDIR}"
 MAKE_ENV+=	BUILDLINK_PREFIX.db4="${BUILDLINK_PREFIX.db4}"
 MAKE_ENV+=	BUILDLINK_PREFIX.imap-uw="${BUILDLINK_PREFIX.imap-uw}"
+MAKE_ENV+=	SSLCERTS="${SSLCERTS}"
 
 PKG_SYSCONFSUBDIR=	prayer
-EGDIR=		${PREFIX}/share/examples/prayer
+EGDIR=			${PREFIX}/share/examples/prayer
+
+RCD_SCRIPTS=		prayer
+RCD_SCRIPT_SRC.prayer=	${FILESDIR}/prayer.rc
 
 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
 
-pre-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
+VAR_PREFIX=	/var/spool/prayer
+
+OWN_DIRS+=	${EGDIR}
+OWN_DIRS_PERMS+=${VAR_PREFIX} ${PRAYER_USER} ${PRAYER_GROUP} 0750
+
+FILES_SUBST+=	OPSYS="${OPSYS}"
+FILES_SUBST+=	VAR_PREFIX="${VAR_PREFIX}"
 
-post-install:
-	${FIND} ${PREFIX}/share/prayer -name CVS -type d -print | ${SORT} -r | \
+post-patch:
+	${FIND} ${WRKSRC} -name CVS -type d -print | ${SORT} -r | \
 		${XARGS} ${RM} -r
 
 .include "../../databases/db4/buildlink2.mk"
diff --git a/mail/prayer/PLIST b/mail/prayer/PLIST
index 7a1cda9c0bd..0dd88a3f96a 100644
--- a/mail/prayer/PLIST
+++ b/mail/prayer/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2003/07/28 15:51:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/02/28 23:50:59 heinz Exp $
+etc/rc.d/prayer
 sbin/prayer
 sbin/prayer-cyclog
 sbin/prayer-session
@@ -88,4 +89,3 @@ share/prayer/icons/univheader.gif
 @dirrm share/prayer/help/compose
 @dirrm share/prayer/help
 @dirrm share/prayer
-@dirrm share/examples/prayer
diff --git a/mail/prayer/distinfo b/mail/prayer/distinfo
index b400d1beed5..61beb66753b 100644
--- a/mail/prayer/distinfo
+++ b/mail/prayer/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.6 2003/07/28 15:51:23 adam Exp $
+$NetBSD: distinfo,v 1.7 2004/02/28 23:50:59 heinz Exp $
 
 SHA1 (prayer-1.0.8.tar.gz) = bda62959dae75515530fbc87304a721e17c903e4
 Size (prayer-1.0.8.tar.gz) = 519741 bytes
-SHA1 (patch-aa) = 315f0ec4b9a19526afb3dd0ac5d0f474e8a650e6
-SHA1 (patch-ab) = 92bd77eb5bb36fbd330091b23ecdaf65a59fa8d4
-SHA1 (patch-ac) = 66f7e9987bf62017df24552002ba43a0a110084b
-SHA1 (patch-ad) = 725a432b15363c47963623165d0a6649d9ae3e05
+SHA1 (patch-aa) = 309dfb2c7d4c38673117cdd6419c8100cf6d98e4
+SHA1 (patch-ab) = d188b7f475af8a81724e221196d1f321cebd9d54
+SHA1 (patch-ac) = f9550de3d8704ea293bc89c572f219e0c41aa8e8
+SHA1 (patch-ad) = e8d1cd82e62d86886acca94c840b55a8b55f7f17
 SHA1 (patch-ae) = b33cdbe6634f370a451a319dd140680949400943
+SHA1 (patch-af) = 969ecdce0496d889dfc3b8d1b7464148b4430ec9
diff --git a/mail/prayer/patches/patch-aa b/mail/prayer/patches/patch-aa
index 648fb9e9dec..2600370ab9a 100644
--- a/mail/prayer/patches/patch-aa
+++ b/mail/prayer/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2003/07/28 15:51:24 adam Exp $
+$NetBSD: patch-aa,v 1.5 2004/02/28 23:50:59 heinz Exp $
 
---- Config.orig	2003-05-29 11:49:38.000000000 +0200
-+++ Config	2003-07-28 16:50:50.000000000 +0200
-@@ -14,9 +14,9 @@
+--- Config.orig	Thu May 29 11:49:38 2003
++++ Config
+@@ -14,9 +14,9 @@ FENCE_ENABLE         = false  # Use Elec
  DIRECT_ENABLE        = false  # Experimental. Leave this switched off... 
  
  # Following depend on the way that you have configured c-client
@@ -14,7 +14,13 @@ $NetBSD: patch-aa,v 1.4 2003/07/28 15:51:24 adam Exp $
  
  # Probably don't need the following
  ACCOUNTD_ENABLE      = false  # Only of use in Cambridge at the moment.
-@@ -35,8 +35,8 @@
+@@ -30,13 +30,13 @@ 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
@@ -25,7 +31,7 @@ $NetBSD: patch-aa,v 1.4 2003/07/28 15:51:24 adam Exp $
  BASE_LIBS    = -lcrypt
  
  # Base Compiler options for Sun SUNWspro compiler
-@@ -56,9 +56,9 @@
+@@ -56,9 +56,9 @@ BASE_LIBS    = -lcrypt
  # which points to ../../imap/c-client. This just reduces the amount of
  # noise output on each line when building the package.
  #
@@ -38,7 +44,7 @@ $NetBSD: patch-aa,v 1.4 2003/07/28 15:51:24 adam Exp $
  CCLIENT_SSL_ENABLE  = true
  
  #
-@@ -101,8 +101,8 @@
+@@ -101,8 +101,8 @@ PAM_INCLUDE =
  PAM_LIBS    = -lpam
  
  # Kerberos (required if CCLIENT_KERB_ENABLE set)
@@ -49,7 +55,7 @@ $NetBSD: patch-aa,v 1.4 2003/07/28 15:51:24 adam Exp $
  
  # SSL definitions (required if SSL_ENABLE or CCLIENT_SSL_ENABLE set)
  #
-@@ -126,8 +126,8 @@
+@@ -126,8 +126,8 @@ DB_INCLUDE=
  DB_LIBS=-ldb
  
  # Following suitable for FreeBSD with DB 4 package installed
@@ -60,7 +66,7 @@ $NetBSD: patch-aa,v 1.4 2003/07/28 15:51:24 adam Exp $
  
  ############################################################################
  
-@@ -148,7 +148,7 @@
+@@ -148,7 +148,7 @@ RW_GROUP   = prayer
  # Default configuration and permissions does not allow prayer user to
  # update prayer configuration file.
  
@@ -69,7 +75,7 @@ $NetBSD: patch-aa,v 1.4 2003/07/28 15:51:24 adam Exp $
  RO_USER   = root
  RO_GROUP  = prayer
  
-@@ -163,6 +163,6 @@
+@@ -163,6 +163,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 b5297dc2456..d33521024e5 100644
--- a/mail/prayer/patches/patch-ab
+++ b/mail/prayer/patches/patch-ab
@@ -1,8 +1,18 @@
-$NetBSD: patch-ab,v 1.2 2003/07/28 15:51:25 adam Exp $
+$NetBSD: patch-ab,v 1.3 2004/02/28 23:50:59 heinz Exp $
 
---- files/install.sh.orig	2003-05-19 14:34:10.000000000 +0200
-+++ files/install.sh	2003-07-28 17:18:33.000000000 +0200
-@@ -75,13 +75,16 @@
+--- files/install.sh.orig	Mon May 19 14:34:10 2003
++++ files/install.sh
+@@ -67,21 +67,24 @@ if [ ! -d ${PREFIX}/etc ]; then
+     ${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}
+ fi
+ 
+ if [ ! -d ${BIN_DIR} ]; then
      ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${BIN_DIR}
  fi
  
diff --git a/mail/prayer/patches/patch-ac b/mail/prayer/patches/patch-ac
index f4c2b195e89..c8c7cdfb0c9 100644
--- a/mail/prayer/patches/patch-ac
+++ b/mail/prayer/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2003/07/28 15:51:25 adam Exp $
+$NetBSD: patch-ac,v 1.4 2004/02/28 23:50:59 heinz Exp $
 
---- files/Makefile.orig	2003-05-11 16:59:12.000000000 +0200
-+++ files/Makefile	2003-07-28 16:42:53.000000000 +0200
-@@ -14,10 +14,10 @@
+--- files/Makefile.orig	Sun May 11 16:59:12 2003
++++ files/Makefile
+@@ -14,10 +14,10 @@ endif
  all:	./etc/prayer.cf ./init.d/prayer
  
  ./etc/prayer.cf: ./etc/prayer.cf.SRC
@@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.3 2003/07/28 15:51:25 adam Exp $
  
  
  ifeq ($(strip $(SSL_ENABLE)), true)
-@@ -53,24 +53,24 @@
+@@ -53,24 +53,24 @@ distclean:
  install-cert:
  	if [ -f certs/prayer.pem ]; then \
  	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \
@@ -47,9 +47,12 @@ $NetBSD: patch-ac,v 1.3 2003/07/28 15:51:25 adam Exp $
  
  install:
  	PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \
-@@ -81,11 +81,7 @@
+@@ -79,13 +79,9 @@ install:
+ 	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) \
++	BIN_DIR=$(BIN_DIR) INSTALL="$(INSTALL)" \
  	./install.sh
 -	if [ ! -f $(BROOT)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi
 -	if [ ! -f $(BROOT)$(PRAYER_CONFIG_FILE) ]; then $(MAKE) install-config; fi
diff --git a/mail/prayer/patches/patch-ad b/mail/prayer/patches/patch-ad
index 05b5baa587b..ddb58915d63 100644
--- a/mail/prayer/patches/patch-ad
+++ b/mail/prayer/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2003/07/28 15:51:25 adam Exp $
+$NetBSD: patch-ad,v 1.3 2004/02/28 23:50:59 heinz Exp $
 
---- prayer/Makefile.orig	2003-05-21 16:41:16.000000000 +0200
-+++ prayer/Makefile	2003-07-28 16:43:11.000000000 +0200
-@@ -89,8 +89,8 @@
+--- prayer/Makefile.orig	Wed May 21 16:41:16 2003
++++ prayer/Makefile
+@@ -89,8 +89,8 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t
    SESSION_LIBS += $(KERB_LIBS)
  endif
  
@@ -13,3 +13,24 @@ $NetBSD: patch-ad,v 1.2 2003/07/28 15:51:25 adam Exp $
  
  SHARED_OBJS = \
   pool.o list.o assoc.o memblock.o buffer.o string.o config.o user_agent.o \
+@@ -158,15 +158,15 @@ clean:
+ 	-rm -f $(BIN) test core *.o *.flc *~ \#*\#
+ 
+ install: all
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
++	$(BSD_INSTALL_DATA_DIR) \
+ 	  $(BROOT)$(BIN_DIR)
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
++	$(BSD_INSTALL_PROGRAM)  \
+ 	  prayer           $(BROOT)$(BIN_DIR)
+-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
++	$(BSD_INSTALL_PROGRAM)  \
+ 	  prayer-session   $(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_SCRIPT)  \
+ 	  prayer-cyclog    $(BROOT)$(BIN_DIR)
+ 
+ prayer: $(PRAYER_OBJS)
diff --git a/mail/prayer/patches/patch-af b/mail/prayer/patches/patch-af
new file mode 100644
index 00000000000..e3c6a380021
--- /dev/null
+++ b/mail/prayer/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.4 2004/02/28 23:50:59 heinz Exp $
+
+--- prayer/mydb_db3.c.orig	Tue Apr 15 15:00:03 2003
++++ prayer/mydb_db3.c
+@@ -80,8 +80,11 @@ extern void fatal(const char *, int);
+ /* --- cut here --- */
+ 
+ #if DB_VERSION_MAJOR >= 4
++#define txn_begin(xx1,xx2,xx3,xx4) (xx1)->txn_begin(xx1,xx2,xx3,xx4)
+ #define txn_checkpoint(xx1,xx2,xx3,xx4) (xx1)->txn_checkpoint(xx1,xx2,xx3,xx4)
+ #define txn_id(xx1) (xx1)->id(xx1)
++#define txn_abort(xx1) (xx1)->abort(xx1)
++#define txn_commit(xx1,xx2) (xx1)->commit(xx1,xx2)
+ #define log_archive(xx1,xx2,xx3,xx4) (xx1)->log_archive(xx1,xx2,xx3)
+ #elif DB_VERSION_MINOR == 3
+ #define log_archive(xx1,xx2,xx3,xx4) log_archive(xx1,xx2,xx3)