aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/prayer/Makefile5
-rw-r--r--mail/prayer/distinfo6
-rw-r--r--mail/prayer/files/patch-Config23
-rw-r--r--mail/prayer/pkg-plist10
4 files changed, 29 insertions, 15 deletions
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index b72b90da9164..20c84beb7be8 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -6,10 +6,9 @@
#
PORTNAME= prayer
-PORTVERSION= 1.0.12
+PORTVERSION= 1.0.16
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
-# ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/prayer-1.0.8.tar.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= Prayer Webmail System
@@ -19,9 +18,9 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libc-client4.a:${PORTSDIR}/mail/cclient
LIB_DEPENDS+= ${BERKELEYDB_LIB}:${PORTSDIR}/${BERKELEYDB_PORT}
.endif
+USE_OPENLDAP= yes
USE_GMAKE= yes
USE_OPENSSL= yes
-USE_REINPLACE= yes
USE_PERL5_BUILD= yes
MAKE_ENV+= PORTCFLAGS="${CFLAGS}"
BERKELEYDB_PORT?= databases/db42
diff --git a/mail/prayer/distinfo b/mail/prayer/distinfo
index 3a7d64c88dda..1d343b54d945 100644
--- a/mail/prayer/distinfo
+++ b/mail/prayer/distinfo
@@ -1,3 +1,3 @@
-MD5 (prayer-1.0.12.tar.gz) = e2bb8fb3ccc54ab1719896bb4cc226db
-SHA256 (prayer-1.0.12.tar.gz) = d8152bdbac2469eef6e01f40bf9ee6701e130018a817ea13fb0437437deb14b4
-SIZE (prayer-1.0.12.tar.gz) = 544239
+MD5 (prayer-1.0.16.tar.gz) = bede9f6cb3502d6180581bc4ff1f1961
+SHA256 (prayer-1.0.16.tar.gz) = 227fc7130b1ca2cc07cfe32aabc1b47ea5edfe9c8960dd46502f748a92cfd69b
+SIZE (prayer-1.0.16.tar.gz) = 575980
diff --git a/mail/prayer/files/patch-Config b/mail/prayer/files/patch-Config
index 9da3491ad873..b36650de1d98 100644
--- a/mail/prayer/files/patch-Config
+++ b/mail/prayer/files/patch-Config
@@ -1,6 +1,6 @@
---- Config.orig Thu Feb 17 12:18:46 2005
-+++ Config Thu Feb 17 12:23:25 2005
-@@ -27,7 +27,7 @@
+--- Config.orig Tue Feb 7 12:38:13 2006
++++ Config Tue Feb 7 12:38:46 2006
+@@ -28,7 +28,7 @@
############################################################################
# Location of compiler
@@ -9,7 +9,7 @@
# Location of make program (GNU make required)
MAKE = gmake
# Location of install program (GNU install or compatible required)
-@@ -36,7 +36,8 @@
+@@ -37,7 +37,8 @@
# Base Compiler options for GCC.
#BASECFLAGS = -Wall -g
#BASELDFLAGS = -g
@@ -19,7 +19,7 @@
BASELDFLAGS = -g -O2
BASE_LIBS = -lcrypt
-@@ -57,9 +58,9 @@
+@@ -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.
#
@@ -32,7 +32,7 @@
CCLIENT_SSL_ENABLE = true
#
-@@ -79,12 +80,14 @@
+@@ -80,12 +81,14 @@
# Following works with the mail/cclient port from FreeBSD
#
#CCLIENT_INCLUDE = -I/usr/local/include/c-client
@@ -48,7 +48,16 @@
#CCLIENT_KERB_ENABLE = true
############################################################################
-@@ -123,12 +126,12 @@
+@@ -99,7 +102,7 @@
+ Z_LIB = -lz
+
+ # LDAP (required if LDAP_ENABLE set)
+-LDAP_INCLUDE =
++LDAP_INCLUDE = -I${LOCALBASE}/include
+ LDAP_LIB = -lldap
+
+ # Pam (required if CCLIENT_PAM_ENABLE set)
+@@ -128,12 +131,12 @@
# DB definitions (required if SESSION_CACHE_ENABLE set)
#
# Following suitable for Redhat Linux which has DB 3 preinstalled
diff --git a/mail/prayer/pkg-plist b/mail/prayer/pkg-plist
index 978fc33f2e81..c44b7633fa1d 100644
--- a/mail/prayer/pkg-plist
+++ b/mail/prayer/pkg-plist
@@ -4,7 +4,6 @@ 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
@@ -14,7 +13,10 @@ prayer/help/compose/postponed.html
prayer/help/compose/role_list.html
prayer/help/abook_add.html
prayer/help/abook_list.html
+prayer/help/abook_lookup.html
prayer/help/abook_search.html
+prayer/help/abook_take.html
+prayer/help/abook_update.html
prayer/help/abook_xfer.html
prayer/help/attachments.html
prayer/help/block.html
@@ -50,9 +52,12 @@ prayer/help/prefs/CVS/Repository
prayer/help/prefs/CVS/Entries
prayer/help/prefs/compose1.html
prayer/help/prefs/compose2.html
+prayer/help/prefs/compose2.html.~1.2.~
prayer/help/prefs/display1.html
+prayer/help/prefs/display1.html.~1.2.~
prayer/help/prefs/folder.html
prayer/help/prefs/general.html
+prayer/help/prefs/general.html.~1.2.~
prayer/icons/CVS/Root
prayer/icons/CVS/Repository
prayer/icons/CVS/Entries
@@ -96,6 +101,7 @@ prayer/etc/prayer-accountd.cf-dist
prayer/etc/motd.html
prayer/etc/welcome.html
prayer/sbin/prayer
+prayer/sbin/prayer-db-prune
prayer/sbin/prayer-session
prayer/sbin/prayer-ssl-prune
prayer/sbin/prayer-sem-prune
@@ -130,4 +136,4 @@ prayer/sbin/prayer-cyclog
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@exec mkdir -p /var/spool/prayer
@exec chown -R prayer:prayer /var/spool/prayer
-@unexec rmdir /var/spool/prayer
+@dirrmtry /var/spool/prayer