From aecc5f034ec818cf85e424a34650ca5fa0a212de Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 28 Mar 2011 13:38:38 +0000
Subject: [PATCH] Do not try to load rewrite_module if it's already loaded.
 Tighten zendframework dependency.

---
 www/webacula/Makefile                            |  6 +++---
 www/webacula/patches/patch-install_webacula_conf | 16 +++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/www/webacula/Makefile b/www/webacula/Makefile
index 9b01cbe3c39..d145b4bc68a 100644
--- a/www/webacula/Makefile
+++ b/www/webacula/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2011/03/28 13:24:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2011/03/28 13:38:38 ajacoutot Exp $
 
 COMMENT=	bacula(8) web interface
 
 DISTNAME=	webacula-5.0.3
 
-REVISION=	4
+REVISION=	5
 
 CATEGORIES=	www sysutils
 
@@ -20,7 +20,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=webacula/}
 
 RUN_DEPENDS=	www/php5/extensions,-gd \
 		php5-pdo_pgsql-*|php5-pdo_mysql-*|php5-pdo_sqlite-*:www/php5/extensions,-pdo_pgsql \
-		www/zendframework \
+		www/zendframework>=1.10.8p1 \
 		sysutils/bacula,pgsql,-server
 
 NO_BUILD=	Yes
diff --git a/www/webacula/patches/patch-install_webacula_conf b/www/webacula/patches/patch-install_webacula_conf
index d16f285f150..1cafe0b6da9 100644
--- a/www/webacula/patches/patch-install_webacula_conf
+++ b/www/webacula/patches/patch-install_webacula_conf
@@ -1,12 +1,14 @@
-$OpenBSD: patch-install_webacula_conf,v 1.1 2011/03/23 07:41:45 ajacoutot Exp $
---- install/webacula.conf.orig	Wed Mar 23 08:31:24 2011
-+++ install/webacula.conf	Wed Mar 23 08:33:10 2011
-@@ -3,17 +3,22 @@
+$OpenBSD: patch-install_webacula_conf,v 1.2 2011/03/28 13:38:38 ajacoutot Exp $
+--- install/webacula.conf.orig	Mon Jan 24 11:58:16 2011
++++ install/webacula.conf	Mon Mar 28 15:35:25 2011
+@@ -3,17 +3,24 @@
  # Allows only localhost by default
  #
  
 -LoadModule rewrite_module modules/mod_rewrite.so
-+LoadModule rewrite_module /usr/lib/apache/modules/mod_rewrite.so
++<IfModule !mod_rewrite.c>
++   LoadModule rewrite_module /usr/lib/apache/modules/mod_rewrite.so
++</IfModule>
  
 +<IfModule mod_php5.c>
 +   php_value max_execution_time 3600
@@ -28,7 +30,7 @@ $OpenBSD: patch-install_webacula_conf,v 1.1 2011/03/23 07:41:45 ajacoutot Exp $
     RewriteEngine On
  
     RewriteBase   /webacula
-@@ -40,42 +45,42 @@ Alias /webacula  /usr/share/webacula/html
+@@ -40,42 +47,42 @@ Alias /webacula  /usr/share/webacula/html
  
  #   AuthType Basic
  #   AuthName "Webacula"
@@ -79,7 +81,7 @@ $OpenBSD: patch-install_webacula_conf,v 1.1 2011/03/23 07:41:45 ajacoutot Exp $
     RewriteEngine On
     # for test mod_rewrite
     RewriteBase   /webacula/test_mod_rewrite
-@@ -93,4 +98,3 @@ Alias /webacula  /usr/share/webacula/html
+@@ -93,4 +100,3 @@ Alias /webacula  /usr/share/webacula/html
     Allow from localhost
     Allow from ::1
  </Directory>