ports/77632: mail/prayer: update to 1.12 and unbreak

[Johan van Selst]

>Number:         77632
>Category:       ports
>Synopsis:       mail/prayer: update to 1.12 and unbreak
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 17 12:30:22 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Johan van Selst
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 5.3-STABLE FreeBSD 5.3-STABLE #0: Mon Jan 31 22:31:14 CET 2005 root at mud.stack.nl:/usr/obj/usr/src/sys/mud i386


	
>Description:
	
	Update to new version 1.12 (which is fetchable)

	Also updated the used BDB to version 4.2

	Makefile and supplied patches were not in sync, causing
	the program to be compiled without session caching even if
	PRAYER_WITHOUT_SESSION_CACHE was not defined. Fixed this as well

>How-To-Repeat:
	
>Fix:

	


diff -uNr prayer/Makefile prayer/Makefile
--- prayer/Makefile	Thu Feb 17 11:48:18 2005
+++ prayer/Makefile	Thu Feb 17 12:10:44 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	prayer
-PORTVERSION=	1.0.10
+PORTVERSION=	1.0.12
 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
@@ -19,15 +19,13 @@
 LIB_DEPENDS+=	${BERKLEYDB_LIB}:${PORTSDIR}/${BERKLEYDB_PORT}
 .endif
 
-BROKEN=		Does not fetch
-
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 USE_REINPLACE=	yes
 USE_PERL5_BUILD=	yes
 MAKE_ENV+=	PORTCFLAGS="${CFLAGS}"
-BERKLEYDB_PORT?=	databases/db3
-BERKLEYDB_LIB?=		db3.3
+BERKLEYDB_PORT?=	databases/db42
+BERKLEYDB_LIB?=		db-4.2
 
 DOCS=	ACCOUNTD CMD_LINE DESIGN DONE DONE-OLD FEATURES ICONLIST \
 	INSTALL LOGS NOTICE README ROADMAP SECURITY TODO URL_OPTIONS
diff -uNr prayer/distinfo prayer/distinfo
--- prayer/distinfo	Mon Jul 19 07:27:43 2004
+++ prayer/distinfo	Thu Feb 17 11:48:57 2005
@@ -1,2 +1,2 @@
-MD5 (prayer-1.0.10.tar.gz) = a78f802a8ac365a993645fa923f14cb3
-SIZE (prayer-1.0.10.tar.gz) = 525342
+MD5 (prayer-1.0.12.tar.gz) = e2bb8fb3ccc54ab1719896bb4cc226db
+SIZE (prayer-1.0.12.tar.gz) = 544239
diff -uNr prayer/files/patch-Config prayer/files/patch-Config
--- prayer/files/patch-Config	Tue Jan  6 11:01:22 2004
+++ prayer/files/patch-Config	Thu Feb 17 12:23:58 2005
@@ -1,15 +1,6 @@
---- Config.orig	Thu May 29 11:49:38 2003
-+++ Config	Tue Jan  6 10:20:40 2004
-@@ -8,7 +8,7 @@
- # Conventional Configure file.
- 
- SSL_ENABLE           = true   # SSL requires OpenSSL
--SESSION_CACHE_ENABLE = true   # SSL session cache Requires Berkeley DB 3 or 4
-+SESSION_CACHE_ENABLE = false  # SSL session cache Requires Berkeley DB 3 or 4
- GZIP_ENABLE          = true   # Enable on the fly compression of pages
- FENCE_ENABLE         = false  # Use Electric Fence to catch malloc problems
- DIRECT_ENABLE        = false  # Experimental. Leave this switched off... 
-@@ -26,7 +26,7 @@
+--- Config.orig	Thu Feb 17 12:18:46 2005
++++ Config	Thu Feb 17 12:23:25 2005
+@@ -27,7 +27,7 @@
  
  ############################################################################
  # Location of compiler
@@ -18,7 +9,7 @@
  # Location of make program (GNU make required)
  MAKE         = gmake
  # Location of install program (GNU install or compatible required)
-@@ -35,7 +35,8 @@
+@@ -36,7 +36,8 @@
  # Base Compiler options for GCC.
  #BASECFLAGS   = -Wall -g
  #BASELDFLAGS  = -g
@@ -28,7 +19,7 @@
  BASELDFLAGS  = -g -O2
  BASE_LIBS    = -lcrypt
  
-@@ -56,9 +57,9 @@
+@@ -57,9 +58,9 @@
  # which points to ../../imap/c-client. This just reduces the amount of
  # noise output on each line when building the package.
  #
@@ -41,7 +32,7 @@
  CCLIENT_SSL_ENABLE  = true
  
  #
-@@ -78,12 +79,14 @@
+@@ -79,12 +80,14 @@
  # Following works with the mail/cclient port from FreeBSD
  #
  #CCLIENT_INCLUDE = -I/usr/local/include/c-client
@@ -57,3 +48,20 @@
  #CCLIENT_KERB_ENABLE = true
  
  ############################################################################
+@@ -123,12 +126,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
+ 
+ ############################################################################
+ 
diff -uNr prayer/pkg-plist prayer/pkg-plist
--- prayer/pkg-plist	Mon Jul 19 07:27:43 2004
+++ prayer/pkg-plist	Thu Feb 17 12:01:46 2005
@@ -98,6 +98,7 @@
 prayer/sbin/prayer
 prayer/sbin/prayer-session
 prayer/sbin/prayer-ssl-prune
+prayer/sbin/prayer-sem-prune
 prayer/sbin/prayer-cyclog
 @dirrm prayer/help/CVS
 @dirrm prayer/help/compose/CVS
>Release-Note:
>Audit-Trail:
>Unformatted: