5 files changed, 32 insertions, 32 deletions

diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 050b46475ca6..dfbdd7df1121 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	prayer
-PORTVERSION=	1.0.19
+PORTVERSION=	1.1.0
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
 
@@ -22,11 +22,15 @@ USE_OPENLDAP=	yes
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 USE_PERL5_BUILD=	yes
+USE_ICONV=	yes
 MAKE_ENV+=	PORTCFLAGS="${CFLAGS}"
 
 PORTDOCS=	ACCOUNTD CMD_LINE DESIGN DONE DONE-OLD FEATURES ICONLIST \
 		INSTALL LOGS NOTICE README ROADMAP SECURITY TODO URL_OPTIONS
 
+post-extract:
+	@${FIND} ${WRKSRC} -depth -type d -name CVS -exec ${RM} -rf {} \;
+
 pre-patch:
 	${CP} ${WRKSRC}/defaults/Config ${WRKSRC}/Config
 
diff --git a/mail/prayer/distinfo b/mail/prayer/distinfo
index c5c562edfcec..299fceeee99c 100644
--- a/mail/prayer/distinfo
+++ b/mail/prayer/distinfo
@@ -1,3 +1,3 @@
-MD5 (prayer-1.0.19.tar.gz) = ca3b418d3ce01e663bed448c1184cc83
-SHA256 (prayer-1.0.19.tar.gz) = 83507ab7cd8021033b85857128c31fd21c35a4b32a130e1becc2b46ad48bb4fa
-SIZE (prayer-1.0.19.tar.gz) = 568966
+MD5 (prayer-1.1.0.tar.gz) = 3a65b0db709146a160a5dc23510c767a
+SHA256 (prayer-1.1.0.tar.gz) = 4cff355aa3847aa8c0816d2be433567eb106f2cd031b4606323bdbe37d2698bd
+SIZE (prayer-1.1.0.tar.gz) = 576023
diff --git a/mail/prayer/files/patch-Config b/mail/prayer/files/patch-Config
index 9ff704f9ce10..f8c621381eb8 100644
--- a/mail/prayer/files/patch-Config
+++ b/mail/prayer/files/patch-Config
@@ -1,5 +1,5 @@
---- Config.orig	2006-04-05 13:35:35.000000000 +0100
-+++ Config	2008-01-09 16:25:14.000000000 +0000
+--- Config.orig	2008-04-16 00:43:56.000000000 -0800
++++ Config	2008-04-16 00:44:36.000000000 -0800
 @@ -28,7 +28,7 @@
  
  ############################################################################
@@ -9,7 +9,7 @@
  # Location of make program (GNU make required)
  MAKE         = gmake
  # Location of install program (GNU install or compatible required)
-@@ -37,7 +37,8 @@
+@@ -37,9 +37,10 @@
  # Base Compiler options for GCC.
  #BASECFLAGS   = -Wall -g
  #BASELDFLAGS  = -g
@@ -17,8 +17,11 @@
 +#BASECFLAGS   = -Wall -g -O2
 +BASECFLAGS   = -Wall -g ${PORTCFLAGS}
  BASELDFLAGS  = -g -O2
- BASE_LIBS    = -lcrypt
+-BASE_LIBS    = -lcrypt
++BASE_LIBS    = -lcrypt -liconv
  
+ # Base Compiler options for Sun SUNWspro compiler
+ #CC          = /opt/SUNWspro/bin/cc
 @@ -58,9 +59,9 @@
  # which points to ../../imap/c-client. This just reduces the amount of
  # noise output on each line when building the package.
diff --git a/mail/prayer/files/patch-os_bsd.c b/mail/prayer/files/patch-os_bsd.c
index e31cf7033590..7b88e9b19af8 100644
--- a/mail/prayer/files/patch-os_bsd.c
+++ b/mail/prayer/files/patch-os_bsd.c
@@ -1,10 +1,18 @@
---- ../p/prayer/os_bsd.c	2008-01-15 17:04:47.000000000 +0000
-+++ prayer/os_bsd.c	2008-02-04 20:56:55.000000000 +0000
-@@ -573,5 +573,7 @@
+--- prayer/os_bsd.c.orig	2008-04-09 12:58:30.000000000 -0800
++++ prayer/os_bsd.c	2008-04-16 00:23:36.000000000 -0800
+@@ -576,14 +576,7 @@
  void
- os_prctl_set_dumpable()
+ os_limit_vm(unsigned long x)
  {
-+#if 0
-     prctl(PR_SET_DUMPABLE, 1);
-+#endif
+-    struct rlimit rl;
+-    rlim_t y = (rlim_t)x;
+-
+-    rl.rlim_cur = y;
+-    rl.rlim_max = y;
+-    if (setrlimit(RLIMIT_DATA, &rl) < 0) {
+-	log_misc("setrlimit: Unable to set vm limit to %ld: %m", x);
+-    }
++  /* Linux specific */
  }
+ 
+ void
diff --git a/mail/prayer/pkg-plist b/mail/prayer/pkg-plist
index 6d76dfd6bad9..ab964dda75fe 100644
--- a/mail/prayer/pkg-plist
+++ b/mail/prayer/pkg-plist
@@ -1,13 +1,6 @@
 @exec if ! pw groupshow prayer; then pw groupadd prayer; fi
 @exec if ! pw usershow prayer; then pw useradd prayer -g prayer -h - -d /nonexistent -s /nonexistent -c "Prayer Webmail"; fi
 etc/rc.d/prayer.sh.sample
-prayer/help/CVS/Root
-prayer/help/CVS/Repository
-prayer/help/CVS/Entries
-prayer/help/CVS/Entries.Log
-prayer/help/compose/CVS/Root
-prayer/help/compose/CVS/Repository
-prayer/help/compose/CVS/Entries
 prayer/help/compose/large.html
 prayer/help/compose/normal.html
 prayer/help/compose/postponed.html
@@ -48,26 +41,22 @@ prayer/help/upload_select.html
 prayer/help/vacation.html
 prayer/help/vaclog.html
 prayer/help/welcome.html
-prayer/help/prefs/CVS/Root
-prayer/help/prefs/CVS/Repository
-prayer/help/prefs/CVS/Entries
 prayer/help/prefs/compose1.html
 prayer/help/prefs/compose2.html
 prayer/help/prefs/display1.html
 prayer/help/prefs/folder.html
 prayer/help/prefs/general.html
-prayer/icons/CVS/Root
-prayer/icons/CVS/Repository
-prayer/icons/CVS/Entries
 prayer/icons/addressbook-inactive.gif
 prayer/icons/addressbook.gif
 prayer/icons/back.gif
+prayer/icons/blank.gif
 prayer/icons/compose-inactive.gif
 prayer/icons/compose.gif
 prayer/icons/cross.gif
 prayer/icons/dir.gif
 prayer/icons/display-inactive.gif
 prayer/icons/display.gif
+prayer/icons/down.gif
 prayer/icons/folders-inactive.gif
 prayer/icons/folders.gif
 prayer/icons/help-inactive.gif
@@ -105,13 +94,9 @@ prayer/sbin/prayer-ssl-prune
 prayer/sbin/prayer-sem-prune
 prayer/sbin/prayer-cyclog
 prayer/sbin/prayer-chroot
-@dirrm prayer/help/CVS
-@dirrm prayer/help/compose/CVS
 @dirrm prayer/help/compose
-@dirrm prayer/help/prefs/CVS
 @dirrm prayer/help/prefs
 @dirrm prayer/help
-@dirrm prayer/icons/CVS
 @dirrm prayer/icons
 @dirrm prayer/etc
 @exec mkdir -p %D/prayer/certs