3 files changed, 24 insertions, 42 deletions

diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index ee2042ee6178..0abfddad23da 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -7,15 +7,15 @@
 
 PORTNAME=	prayer
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Prayer Webmail System
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libc-client4.a:${PORTSDIR}/mail/cclient
+LIB_DEPENDS=	c-client4.9:${PORTSDIR}/mail/cclient
 
-USE_OPENLDAP=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_ICONV=	yes
@@ -66,12 +66,13 @@ post-patch:
 # change the user in the default config and cylog util
 	@${REINPLACE_CMD} "s#prayer_user           = \"prayer\"#prayer_user           = \"_prayer\"#" ${WRKSRC}/files/etc/prayer.cf.SRC
 	@${REINPLACE_CMD} "s#\"prayer\" \"prayer\"#\"_prayer\" \"prayer\"#" ${WRKSRC}/utils/prayer-cyclog.SRC
-	@${REINPLACE_CMD} "s#%%PREFIX%%#${PREFIX}#" ${WRKSRC}/Config
+	@${REINPLACE_CMD} "/^CC\s.*/d" ${WRKSRC}/Config
 
 post-configure:
+	@${REINPLACE_CMD} "s#%%PREFIX%%#${PREFIX}#" ${WRKSRC}/Config
 .if defined(WITH_SESSIONCACHE)
-	@${REINPLACE_CMD} "s#^DB_INCLUDE=.*#DB_INCLUDE=-I${BDB_INCLUDE_DIR}#" ${WRKSRC}/Config
-	@${REINPLACE_CMD} "s#^DB_LIBS=.*#DB_LIBS=-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}#" ${WRKSRC}/Config
+	@${REINPLACE_CMD} "s|^#DB_INCLUDE=.*|DB_INCLUDE=-I${BDB_INCLUDE_DIR}|" ${WRKSRC}/Config
+	@${REINPLACE_CMD} "s|^#DB_LIBS=.*|DB_LIBS=-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}|" ${WRKSRC}/Config
 .else
 	@${REINPLACE_CMD} "s#^SESSION_CACHE_ENABLE = true#SESSION_CACHE_ENABLE = false#" ${WRKSRC}/Config
 .endif
diff --git a/mail/prayer/files/patch-Config b/mail/prayer/files/patch-Config
index f4515be36db7..a472f343e35b 100644
--- a/mail/prayer/files/patch-Config
+++ b/mail/prayer/files/patch-Config
@@ -1,6 +1,6 @@
---- Config.orig	2010-02-22 13:43:01.247512371 +0100
-+++ Config	2010-02-22 13:47:49.048414822 +0100
-@@ -27,31 +27,31 @@
+--- Config.orig	2010-07-29 10:19:04.982393002 +0200
++++ Config	2010-07-29 10:21:55.459770746 +0200
+@@ -28,31 +28,31 @@
  
  ############################################################################
  # Location of compiler
@@ -39,20 +39,7 @@
  # Solaris needs even more libararies:
  # BASE_LIBS   = -lcrypt -lxnet -lnsl -lsocket
  
-@@ -71,9 +71,9 @@
- # which points to ../../imap/c-client. This just reduces the amount of
- # noise output on each line when building the package.
- #
--CCLIENT_DIR=../c-client
--CCLIENT_INCLUDE=-I $(CCLIENT_DIR)
--CCLIENT_LIBS=./$(CCLIENT_DIR)/c-client.a
-+#CCLIENT_DIR=../c-client
-+#CCLIENT_INCLUDE=-I $(CCLIENT_DIR)
-+#CCLIENT_LIBS=./$(CCLIENT_DIR)/c-client.a
- 
- #
- # Following works with imap-devel RPM package from Redhat 7.
-@@ -92,12 +92,14 @@
+@@ -93,12 +93,14 @@
  # Following works with the mail/cclient port from FreeBSD
  #
  #CCLIENT_INCLUDE = -I/usr/local/include/c-client
@@ -68,7 +55,7 @@
  #CCLIENT_KERB_ENABLE = true
  
  ############################################################################
-@@ -111,7 +113,7 @@
+@@ -116,7 +118,7 @@
  Z_LIBS    = -lz
  
  # LDAP (required if LDAP_ENABLE set)
@@ -77,24 +64,7 @@
  LDAP_LIBS    = -lldap
  
  # Pam (required if CCLIENT_PAM_ENABLE set)
-@@ -140,12 +142,12 @@
- # DB definitions (required if SESSION_CACHE_ENABLE set)
- #
- # Following suitable for Redhat Linux which has DB 3 preinstalled
--DB_INCLUDE=
--DB_LIBS=-ldb
-+#DB_INCLUDE=
-+#DB_LIBS=-ldb
- 
- # Following suitable for FreeBSD with DB 4 package installed
--#DB_INCLUDE=-I/usr/local/include/db4
--#DB_LIBS=-L/usr/local/lib -ldb4
-+DB_INCLUDE=-I/usr/local/include/db42
-+DB_LIBS=-L/usr/local/lib -ldb-4.2
- 
- ############################################################################
- 
-@@ -166,7 +168,7 @@
+@@ -171,7 +173,7 @@
  # Default configuration and permissions does not allow prayer user to
  # update prayer configuration file.
  
@@ -103,7 +73,7 @@
  RO_USER   = root
  RO_GROUP  = prayer
  
-@@ -181,6 +183,6 @@
+@@ -186,6 +188,6 @@
  PRIVATE_FILE = 0640
  
  # Location of configuration files and binaries
diff --git a/mail/prayer/files/patch-lib__os.c b/mail/prayer/files/patch-lib__os.c
new file mode 100644
index 000000000000..da20a4409d74
--- /dev/null
+++ b/mail/prayer/files/patch-lib__os.c
@@ -0,0 +1,11 @@
+--- ./lib/os.c.orig	2010-07-28 16:25:44.919661109 +0200
++++ ./lib/os.c	2010-07-28 16:26:35.810521675 +0200
+@@ -238,8 +238,6 @@
+         results[j++] = sockfd;
+     }
+ 
+-    freeaddrinfo(ai);
+-
+     return(results);
+ }
+