From bf9d505fe3fb233762abf31d60d1fea5bbf5bd2c Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 2 May 2005 13:37:16 +0000
Subject: Convert to standard format, add RCS Id. XXX: this should _not_
 hardcode /usr/pkg

---
 www/album/patches/patch-aa | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

(limited to 'www/album/patches')

diff --git a/www/album/patches/patch-aa b/www/album/patches/patch-aa
index 2fd3673b2ec..637630e02dd 100644
--- a/www/album/patches/patch-aa
+++ b/www/album/patches/patch-aa
@@ -1,24 +1,18 @@
-*** album.orig	Wed Mar  9 14:59:01 2005
---- album	Wed Mar  9 15:01:17 2005
-***************
-*** 1308,1318 ****
-  
-    unless ($themes) {
-      # Try to guess path
-!     $themes = '/var/www/html' unless -x $themes;
-!     $themes = '/var/www' unless -x $themes;
-!     $themes = '/home/httpd' unless -x $themes;
-!     $themes = '/home/http' unless -x $themes;
-!     $themes = "$ENV{HOME}/public_html" unless -x $themes;
-      $themes = '' unless -x $themes;
-      $themes .= "/Themes" if $themes;
-    }
---- 1308,1314 ----
-  
-    unless ($themes) {
-      # Try to guess path
-!     $themes = '/usr/pkg/share/httpd/htdocs/Album' unless -x $themes;
-!     $themes = '/usr/pkg/share/Album' unless -x $themes;
-      $themes = '' unless -x $themes;
-      $themes .= "/Themes" if $themes;
-    }
+$NetBSD: patch-aa,v 1.2 2005/05/02 13:37:16 wiz Exp $
+
+--- album.orig	2004-12-31 10:24:04.000000000 +0100
++++ album
+@@ -1308,11 +1308,8 @@ sub install_theme_path {
+ 
+   unless ($themes) {
+     # Try to guess path
+-    $themes = '/var/www/html' unless -x $themes;
+-    $themes = '/var/www' unless -x $themes;
+-    $themes = '/home/httpd' unless -x $themes;
+-    $themes = '/home/http' unless -x $themes;
+-    $themes = "$ENV{HOME}/public_html" unless -x $themes;
++    $themes = '/usr/pkg/share/httpd/htdocs/Album' unless -x $themes;
++    $themes = '/usr/pkg/share/Album' unless -x $themes;
+     $themes = '' unless -x $themes;
+     $themes .= "/Themes" if $themes;
+   }
-- 
cgit v1.2.3