settings.php not default.settings.php is the correct CONF_FILE

Update drupal.conf based on .htaccess supplied with tarball
PKGREVISION++

3 files changed, 16 insertions, 5 deletions

diff --git a/www/drupal6/Makefile b/www/drupal6/Makefile
index 76f47f36ec5..d755076c659 100644
--- a/www/drupal6/Makefile
+++ b/www/drupal6/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2009/01/15 20:09:44 adrianp Exp $
+# $NetBSD: Makefile,v 1.12 2009/02/16 20:55:54 adrianp Exp $
 
 DISTNAME=	drupal-6.9
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://drupal.org/files/projects/
 
@@ -37,7 +38,7 @@ CONF_FILES+=	${PREFIX}/share/examples/drupal/default.profile \
 		${DRUPAL}/profiles/default/default.profile
 
 CONF_FILES_PERMS+=	${PREFIX}/share/examples/drupal/default.settings.php \
-			${DRUPAL}/sites/default/default.settings.php \
+			${DRUPAL}/sites/default/settings.php \
 			${WWW_USER} ${WWW_GROUP} 0640
 
 SUBST_CLASSES+=		conf
@@ -80,6 +81,8 @@ do-install:
 		${PREFIX}/share/examples/drupal/drupal.conf
 	${INSTALL_DATA} ${WRKSRC}/sites/default/default.settings.php \
 		${PREFIX}/share/examples/drupal/default.settings.php
+	${INSTALL_DATA} ${WRKSRC}/sites/default/default.settings.php \
+		${PREFIX}/share/examples/drupal/settings.php
 	${INSTALL_DATA} ${WRKSRC}/profiles/default/default.profile \
 		${PREFIX}/share/examples/drupal/default.profile
 	${INSTALL_DATA} ${WRKSRC}/*.php ${DRUPAL}
diff --git a/www/drupal6/PLIST b/www/drupal6/PLIST
index 9ea2179d528..6e1ed0260dc 100644
--- a/www/drupal6/PLIST
+++ b/www/drupal6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/10/24 18:52:31 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/02/16 20:55:54 adrianp Exp $
 share/doc/drupal/CHANGELOG.txt
 share/doc/drupal/COPYRIGHT.txt
 share/doc/drupal/INSTALL.mysql.txt
@@ -460,6 +460,7 @@ share/drupal/themes/pushbutton/tabs-option-on.png
 share/drupal/update.php
 share/drupal/xmlrpc.php
 share/examples/drupal/default.profile
+share/examples/drupal/settings.php
 share/examples/drupal/default.settings.php
 share/examples/drupal/drupal.conf
 @dirrm share/examples/drupal
diff --git a/www/drupal6/files/drupal.conf b/www/drupal6/files/drupal.conf
index 521fe231f3f..5e7357eeb1f 100644
--- a/www/drupal6/files/drupal.conf
+++ b/www/drupal6/files/drupal.conf
@@ -1,4 +1,4 @@
-# $NetBSD: drupal.conf,v 1.1.1.1 2008/04/06 10:15:27 adrianp Exp $
+# $NetBSD: drupal.conf,v 1.2 2009/02/16 20:55:54 adrianp Exp $
 #
 # Drupal configuration file fragment for Apache
 
@@ -16,7 +16,7 @@ Order allow,deny
 Allow from all
 
 # Protect files and directories from prying eyes.
-<FilesMatch "\.(engine|inc|info|install|module|profile|po|sh|.*sql|theme|tpl(\.php)?|xtmpl)$|^(code-style\.pl|Entries.*|Repository|Root|Tag|Template)$">
+<FilesMatch "\.(engine|inc|info|install|module|profile|test|po|sh|.*sql|theme|tpl(\.php)?|xtmpl|svn-base)$|^(code-style\.pl|Entries.*|Repository|Root|Tag|Template|all-wcprops|entries|format)$">
   Order allow,deny
 </FilesMatch>
 
@@ -29,6 +29,12 @@ Options +FollowSymLinks
 # Customized error messages.
 ErrorDocument 404 /index.php
 
+# Force simple error message for requests for non-existent favicon.ico.
+<Files favicon.ico>
+  # There is no end quote below, for compatibility with Apache 1.3.
+  ErrorDocument 404 "The requested file favicon.ico was not found.
+</Files>
+
 # Set the default handler.
 DirectoryIndex index.php
 
@@ -111,6 +117,7 @@ php_value memory_limit 16M
   # Rewrite URLs of the form 'index.php?q=x'.
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteCond %{REQUEST_URI} !=/favicon.ico
   RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
 </IfModule>