- Update to 20100212

PR:		144210
Submitted by:	Bapt <baptiste.daroussin@gmail.com> (maintainer)
Feature safe:	yes

4 files changed, 15 insertions, 50 deletions

diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 24cec899f546..1491a6b8ca6a 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	prayer
-PORTVERSION=	1.3.1
-PORTREVISION=	2
+PORTVERSION=	1.3.2
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
 
@@ -32,6 +31,9 @@ USE_RC_SUBR=	prayer
 
 OPTIONS=	SESSIONCACHE	"Activate Session Cache" On
 
+USERS=		_prayer
+GROUPS=		prayer
+
 MAN5=		prayer.cf.5
 MAN8=		prayer-session.8 prayer-ssl-prune.8 prayer.8
 
@@ -63,7 +65,6 @@ post-configure:
 
 pre-install:
 	@${MKDIR} ${PREFIX}/etc/prayer
-	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/mail/prayer/distinfo b/mail/prayer/distinfo
index 64448be67177..0e32841d9ef7 100644
--- a/mail/prayer/distinfo
+++ b/mail/prayer/distinfo
@@ -1,3 +1,3 @@
-MD5 (prayer-1.3.1.tar.gz) = 5b124c7ac901e3425cc12884de39d6b3
-SHA256 (prayer-1.3.1.tar.gz) = 77b2791973eda7831c72bf22a1177e5bea024c3e1b238677be43763a38cdd651
-SIZE (prayer-1.3.1.tar.gz) = 706034
+MD5 (prayer-1.3.2.tar.gz) = 4762d3eede64770f0f5f654cceef09f6
+SHA256 (prayer-1.3.2.tar.gz) = 78d6011fd49ca6c085b6e4c44759e6b246a82b859dd3f2e5a45d4775b45ae528
+SIZE (prayer-1.3.2.tar.gz) = 748315
diff --git a/mail/prayer/files/patch-Config b/mail/prayer/files/patch-Config
index f86a591e0e5c..f4515be36db7 100644
--- a/mail/prayer/files/patch-Config
+++ b/mail/prayer/files/patch-Config
@@ -1,5 +1,5 @@
---- Config.orig	2009-03-16 00:51:45.000000000 +0800
-+++ Config	2009-03-16 00:52:23.000000000 +0800
+--- Config.orig	2010-02-22 13:43:01.247512371 +0100
++++ Config	2010-02-22 13:47:49.048414822 +0100
 @@ -27,31 +27,31 @@
  
  ############################################################################
@@ -11,10 +11,9 @@
  # Location of install program (GNU install or compatible required)
  INSTALL      = install
  
--# Base Compiler options for GCC (use CPPFLAGS and LDFLAGS if passed in)
+ # Base Compiler options for GCC (use CPPFLAGS and LDFLAGS if passed in)
 -ifdef CPPFLAGS
 -  BASECFLAGS   = $(CPPFLAGS)
-+# Base Compiler options for GCC (use PORTCFLAGS and LDFLAGS if passed in)
 +ifdef PORTCFLAGS
 +  BASECFLAGS   = $(PORTCFLAGS)
  else
@@ -32,8 +31,8 @@
  endif
  
  # Minimal libraries needed by Linux
--BASE_LIBS    = -lcrypt
-+# BASE_LIBS    = -lcrypt
+-BASE_LIBS    = -lcrypt -lutil
++#BASE_LIBS    = -lcrypt -lutil
  # FreeBSD needs some extra libraries:
 -# BASE_LIBS   = -lcrypt -liconv -lutil
 +BASE_LIBS   = -lcrypt -liconv -lutil
@@ -104,13 +103,13 @@
  RO_USER   = root
  RO_GROUP  = prayer
  
-@@ -181,8 +183,8 @@
+@@ -181,6 +183,6 @@
  PRIVATE_FILE = 0640
  
  # Location of configuration files and binaries
 -PRAYER_CONFIG_FILE   = ${PREFIX}/etc/prayer.cf
-+PRAYER_CONFIG_FILE   = %%PREFIX%%/etc/prayer/prayer.cf
 -BIN_DIR              = ${PREFIX}/sbin
-+BIN_DIR              = %%PREFIX%%/sbin
 -ACCOUNTD_CONFIG_FILE = ${PREFIX}/etc/prayer-accountd.cf
++PRAYER_CONFIG_FILE   = %%PREFIX%%/etc/prayer/prayer.cf
++BIN_DIR              = %%PREFIX%%/sbin
 +ACCOUNTD_CONFIG_FILE = %%PREFIX%%/etc/prayer/accountd.cf
diff --git a/mail/prayer/pkg-install b/mail/prayer/pkg-install
deleted file mode 100644
index c3a8a50581bc..000000000000
--- a/mail/prayer/pkg-install
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-
-USER=_prayer
-GROUP=prayer
-UID=917
-GID=917
-
-case $2 in
-  PRE-INSTALL)
-  if pw group show "$GROUP" 2>/dev/null;then
-    echo "You already have a group \"${GROUP}\", so I will use it."
-  else
-    if pw groupadd "${GROUP}" -g ${GID};then
-      echo "Added group \"${GROUP}\"."
-    else 
-      echo "Adding group \"${GROUP}\" failed..."
-      exit 1
-    fi
-  fi
-  if pw user show "${USER}" 2>/dev/null; then
-    echo "You already have a user \"${USER}\", so I will use it."
-  else
-    if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-      -s /sbin/nologin -L daemon -d /nonexistent -c "Prayer Account"
-    then
-      echo "Added user \"${USER}\"."
-    else
-      echo "Adding user \"${USER}\" failed..."
-      exit 1
-    fi
-  fi
-  ;;
-esac