pkg/43417: [www/moodle]Patch:Improve Makefile and fix some bugs in conf file

[wenheping%gmail.com@localhost]

>Number:         43417
>Category:       pkg
>Synopsis:       [www/moodle]Patch:Improve Makefile and fix some bugs in conf 
>file
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jun 05 14:00:00 +0000 2010
>Originator:     Wen Heping
>Release:        NetBSD-5.0.2
>Organization:
Private
>Environment:
NetBSD nb502.wenjing.com 5.0.2 NetBSD 5.0.2 (GENERIC) #0: Sat Feb  6 17:53:27 
UTC 2010  
builds%b7.netbsd.org@localhost:/home/builds/ab/netbsd-5-0-2-RELEASE/i386/201002061851Z-obj/home/builds/ab/netbsd-5-0-2-RELEASE/src/sys/arch/i386/compile/GENERIC
 i386
>Description:
Improve Makefile and fix some bugs in conf file
>How-To-Repeat:

>Fix:
--- Makefile.orig       2010-06-06 03:08:38.000000000 +0800
+++ Makefile    2010-06-06 04:17:48.000000000 +0800
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.1.1.1 2010/06/04 09:20:00 wiz Exp $

 DISTNAME=      moodle-1.9.8
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  http://download.moodle.org/stable19/ \
                http://download2.moodle.org/stable19/ \
@@ -44,11 +45,12 @@
 NO_CONFIGURE=          YES
 NO_BUILD=              YES

-SUBST_CLASSES+=                paths
-SUBST_MESSAGE.paths=   Fixing pathnames in configuration file.
-SUBST_STAGE.paths=     post-patch
-SUBST_FILES.paths=     ../moodle.conf
-SUBST_SED.paths=       -e "s,@MOODLEDIR@,${MOODLEDIR},g"
+SUBST_CLASSES+=                conf
+SUBST_MESSAGE.conf=    Fixing pathnames in configuration file.
+SUBST_STAGE.conf=      post-patch
+SUBST_FILES.conf=      ../moodle.conf
+SUBST_SED.conf=                -e "s,@MOODLEDIR@,${MOODLEDIR},g"
+SUBST_SED.conf+=       -e "s,@MOODLEDATADIR@,${MOODLEDATADIR},g"

 SUBST_CLASSES+=                php
 SUBST_MESSAGE.php=     Fixing the path of php.
@@ -57,10 +59,10 @@
 SUBST_SED.php=         -e "s,/usr/bin/php,/usr/pkg/bin/php,g"

 SUBST_CLASSES+=         perl
-SUBST_MESSAGE.paths=   Fixing the path of perl.
-SUBST_STAGE.paths=     post-patch
-SUBST_FILES.paths=     filter/algebra/algebra2tex.pl
-SUBST_SED.paths=       -e "s,/usr/bin/perl,/usr/pkg/bin/perl,g"
+SUBST_MESSAGE.perl=    Fixing the path of perl.
+SUBST_STAGE.perl=      post-patch
+SUBST_FILES.perl=      filter/algebra/algebra2tex.pl
+SUBST_SED.perl=                -e "s,/usr/bin/perl,/usr/pkg/bin/perl,g"

 WRKSRC=                        ${WRKDIR}/moodle

--- files/moodle.conf.orig      2010-06-06 03:07:51.000000000 +0800
+++ files/moodle.conf   2010-06-06 03:37:52.000000000 +0800
@@ -1,4 +1,4 @@
-# MediaWiki configuration file fragment for Apache
+# Moodle configuration file fragment for Apache

 <IfModule mod_alias.c>
     Alias /moodle/ "@MOODLEDIR@/"
@@ -11,3 +11,11 @@
     Order allow,deny
     Allow from all
 </Directory>
+
+<Directory "@MOODLEDATADIR@">
+    Options Indexes
+    DirectoryIndex index.php index.html
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>