From ea701a679520108d637fe0126c7c955a4592636a Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Mon, 23 Oct 2006 08:31:29 +0000
Subject: Fixed ownership of the installed files to allow installation as
 unprivileged user. PKGREVISION++

---
 mail/prayer/Makefile         |  8 ++++++--
 mail/prayer/distinfo         |  4 ++--
 mail/prayer/patches/patch-aa | 30 ++++++++++++++++++++++--------
 3 files changed, 30 insertions(+), 12 deletions(-)

(limited to 'mail/prayer')

diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 2f1c7c22afa..86798c201f1 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2006/02/27 01:45:25 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2006/10/23 08:31:29 rillig Exp $
 #
 
 DISTNAME=	prayer-1.0.12
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
 
@@ -16,11 +16,15 @@ PRAYER_GROUP=	prayer
 PKG_GROUPS=	${PRAYER_GROUP}
 PKG_USERS=	${PRAYER_USER}:${PRAYER_GROUP}
 
+BUILD_DEFS+=	PRAYER_USER PRAYER_GROUP VARBASE
+
 MAKE_ENV+=	EGDIR=${EGDIR:Q}
 MAKE_ENV+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 MAKE_ENV+=	BUILDLINK_PREFIX.db4="${BUILDLINK_PREFIX.db4}"
 MAKE_ENV+=	BUILDLINK_PREFIX.imap-uw="${BUILDLINK_PREFIX.imap-uw}"
 MAKE_ENV+=	SSLCERTS=${SSLCERTS:Q}
+MAKE_ENV+=	PRAYER_USER=${PRAYER_USER} PRAYER_GROUP=${PRAYER_GROUP}
+MAKE_ENV+=	ROOT_USER=${ROOT_USER} ROOT_GROUP=${ROOT_GROUP}
 
 PKG_SYSCONFSUBDIR=	prayer
 EGDIR=			${PREFIX}/share/examples/prayer
diff --git a/mail/prayer/distinfo b/mail/prayer/distinfo
index 7bd3bafb5fe..df6bc109993 100644
--- a/mail/prayer/distinfo
+++ b/mail/prayer/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2006/02/27 01:45:25 joerg Exp $
+$NetBSD: distinfo,v 1.12 2006/10/23 08:31:29 rillig Exp $
 
 SHA1 (prayer-1.0.12.tar.gz) = 8ea568f9e0e1fe925102e80451b3c9432f5fed15
 RMD160 (prayer-1.0.12.tar.gz) = 76edc3896d0936c87378f848334bc42d648317f3
 Size (prayer-1.0.12.tar.gz) = 544239 bytes
-SHA1 (patch-aa) = 80559b1fafa397015c45a26b41212f3cc35b1415
+SHA1 (patch-aa) = 715cc47f3f9708e3f97f5b58b4f5bf307c7806bd
 SHA1 (patch-ab) = 72f6b8768303222a8798ca07e83efccdefa8fe25
 SHA1 (patch-ac) = b7df87589bdc2fd2894f2028652e01aa0c181fa1
 SHA1 (patch-ad) = bd8f517d5bede0fd3d3f4e9a108cd0cd99d7c8ab
diff --git a/mail/prayer/patches/patch-aa b/mail/prayer/patches/patch-aa
index 9e4a3f86b11..b046e239645 100644
--- a/mail/prayer/patches/patch-aa
+++ b/mail/prayer/patches/patch-aa
@@ -1,15 +1,16 @@
-$NetBSD: patch-aa,v 1.7 2006/02/27 01:45:25 joerg Exp $
+$NetBSD: patch-aa,v 1.8 2006/10/23 08:31:29 rillig Exp $
 
---- Config.orig	2005-01-06 07:51:08.000000000 -0500
-+++ Config
+--- Config.orig	2005-01-06 13:51:08.000000000 +0100
++++ Config	2006-10-23 10:21:43.000000000 +0200
 @@ -15,9 +15,9 @@ DIRECT_ENABLE        = false  # Experime
  MUTEX_SEMAPHORE      = false  # Use SYSV mutexes rather than file locking
  
  # Following depend on the way that you have configured c-client
 -CCLIENT_SSL_ENABLE   = false  # C-client was built with SSL support
-+CCLIENT_SSL_ENABLE   = true  # C-client was built with SSL support
- CCLIENT_PAM_ENABLE   = false  # C-client was built with PAM 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
@@ -66,15 +67,28 @@ $NetBSD: patch-aa,v 1.7 2006/02/27 01:45:25 joerg Exp $
  
  ############################################################################
  
-@@ -149,7 +149,7 @@ RW_GROUP   = prayer
+@@ -142,16 +142,16 @@ BROOT=
+ 
+ # 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
- RO_GROUP  = prayer
++RO_USER   = ${ROOT_USER}
++RO_GROUP  = ${PRAYER_GROUP}
  
+ # Access permissions for general objects (wrt above users and groups)
+ PUBLIC_EXEC  = 0755
 @@ -164,6 +164,6 @@ PRIVATE_DIR  = 0750
  PRIVATE_FILE = 0640
  
-- 
cgit v1.2.3