Sat Sep 7 07:31:40 2013 UTC ()
Adjust example config file for Apache 2.4


(adam)
diff -r1.21 -r1.22 pkgsrc/www/moodle/Makefile
cvs diff -r1.21 -r1.22 pkgsrc/www/moodle/Makefile (expand / switch to unified diff)

--- pkgsrc/www/moodle/Makefile 2013/07/08 13:52:08 1.21
+++ pkgsrc/www/moodle/Makefile 2013/09/07 07:31:40 1.22
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1# $NetBSD: Makefile,v 1.21 2013/07/08 13:52:08 wen Exp $ 1# $NetBSD: Makefile,v 1.22 2013/09/07 07:31:40 adam Exp $
2 2
3DISTNAME= moodle-2.5.1 3DISTNAME= moodle-2.5.1
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=moodle/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=moodle/}
6EXTRACT_SUFX= .tgz 6EXTRACT_SUFX= .tgz
7 7
8MAINTAINER= wenheping@gmail.com 8MAINTAINER= wenheping@gmail.com
9HOMEPAGE= http://www.moodle.org/ 9HOMEPAGE= http://www.moodle.org/
10COMMENT= Course management system based on social constructionism 10COMMENT= Course management system based on social constructionism
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd 13DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd
14DEPENDS+= ${PHP_PKG_PREFIX}-iconv-[0-9]*:../../converters/php-iconv 14DEPENDS+= ${PHP_PKG_PREFIX}-iconv-[0-9]*:../../converters/php-iconv
15DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring 15DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring
16DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.2.0:../../www/php-curl 16DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.2.0:../../www/php-curl
17DEPENDS+= ${PHP_PKG_PREFIX}-xmlrpc>=5.2.0:../../net/php-xmlrpc 17DEPENDS+= ${PHP_PKG_PREFIX}-xmlrpc>=5.2.0:../../net/php-xmlrpc
 18# XXX php-zlib is probably not required -- verify on next update
18DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.2.0:../../archivers/php-zlib 19DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.2.0:../../archivers/php-zlib
19DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom 20DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom
20DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap 21DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap
21DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.2.0:../../textproc/php-json 22DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.2.0:../../textproc/php-json
22DEPENDS+= ${PHP_PKG_PREFIX}-intl>=2.0.0:../../textproc/php-intl 23DEPENDS+= ${PHP_PKG_PREFIX}-intl>=2.0.0:../../textproc/php-intl
23DEPENDS+= ${PHP_PKG_PREFIX}-zip>=5.2.0:../../archivers/php-zip 24DEPENDS+= ${PHP_PKG_PREFIX}-zip>=5.2.0:../../archivers/php-zip
24 25
25EGDIR= share/examples/moodle 26EGDIR= share/examples/moodle
26MOODLEDIR= ${PREFIX}/share/moodle 27MOODLEDIR= ${PREFIX}/share/moodle
27MOODLEDATADIR= ${PREFIX}/moodledata 28MOODLEDATADIR= ${PREFIX}/moodledata
28 29
29PKG_DESTDIR_SUPPORT= destdir 30PKG_DESTDIR_SUPPORT= destdir
30INSTALLATION_DIRS= ${EGDIR} share/moodle 31INSTALLATION_DIRS= ${EGDIR} share/moodle
@@ -35,35 +36,41 @@ INSTALLATION_DIRS= ${EGDIR} share/moodle @@ -35,35 +36,41 @@ INSTALLATION_DIRS= ${EGDIR} share/moodle
35PKG_INSTALLATION_TYPES= overwrite pkgviews 36PKG_INSTALLATION_TYPES= overwrite pkgviews
36 37
37APACHE_USER?= www 38APACHE_USER?= www
38APACHE_GROUP?= www 39APACHE_GROUP?= www
39BUILD_DEFS+= APACHE_USER APACHE_GROUP 40BUILD_DEFS+= APACHE_USER APACHE_GROUP
40 41
41PKG_SYSCONFSUBDIR= httpd 42PKG_SYSCONFSUBDIR= httpd
42MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 43MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
43 44
44CONF_FILES= ${PREFIX}/${EGDIR}/moodle.conf \ 45CONF_FILES= ${PREFIX}/${EGDIR}/moodle.conf \
45 ${PKG_SYSCONFDIR}/moodle.conf 46 ${PKG_SYSCONFDIR}/moodle.conf
46OWN_DIRS_PERMS+= ${MOODLEDATADIR} ${APACHE_USER} ${APACHE_GROUP} 0750 47OWN_DIRS_PERMS+= ${MOODLEDATADIR} ${APACHE_USER} ${APACHE_GROUP} 0750
47 48
48NO_CONFIGURE= YES 49NO_CONFIGURE= yes
49NO_BUILD= YES 50NO_BUILD= yes
 51
 52.include "../../mk/apache.mk"
50 53
51SUBST_CLASSES+= conf 54SUBST_CLASSES+= conf
52SUBST_MESSAGE.conf= Fixing pathnames in configuration file. 55SUBST_MESSAGE.conf= Fixing pathnames in configuration file.
53SUBST_STAGE.conf= post-patch 56SUBST_STAGE.conf= post-patch
54SUBST_FILES.conf= ../moodle.conf 57SUBST_FILES.conf= ../moodle.conf
55SUBST_SED.conf= -e "s,@MOODLEDIR@,${MOODLEDIR},g" 58SUBST_SED.conf= -e "s,@MOODLEDIR@,${MOODLEDIR},g"
56SUBST_SED.conf+= -e "s,@MOODLEDATADIR@,${MOODLEDATADIR},g" 59SUBST_SED.conf+= -e "s,@MOODLEDATADIR@,${MOODLEDATADIR},g"
 60.if ${PKG_APACHE} == "apache24"
 61SUBST_SED.conf+= -e "/Order allow,deny/d"
 62SUBST_SED.conf+= -e "s,Allow from all,Require all granted,g"
 63.endif
57 64
58SUBST_CLASSES+= php 65SUBST_CLASSES+= php
59SUBST_MESSAGE.php= Fixing the path of php. 66SUBST_MESSAGE.php= Fixing the path of php.
60SUBST_STAGE.php= post-patch 67SUBST_STAGE.php= post-patch
61SUBST_FILES.php= admin/cli/mysql_engine.php admin/cli/maintenance.php admin/cli/cron.php 68SUBST_FILES.php= admin/cli/mysql_engine.php admin/cli/maintenance.php admin/cli/cron.php
62SUBST_FILES.php+= admin/cli/reset_password.php admin/cli/automated_backups.php 69SUBST_FILES.php+= admin/cli/reset_password.php admin/cli/automated_backups.php
63SUBST_FILES.php+= admin/cli/install.php admin/cli/install_database.php admin/cli/upgrade.php 70SUBST_FILES.php+= admin/cli/install.php admin/cli/install_database.php admin/cli/upgrade.php
64SUBST_FILES.php+= admin/mailout-debugger.php admin/process_email.php 71SUBST_FILES.php+= admin/mailout-debugger.php admin/process_email.php
65SUBST_FILES.php+= auth/ldap/cli/sync_users.php auth/cas/cli/sync_users.php auth/db/cli/sync_users.php 72SUBST_FILES.php+= auth/ldap/cli/sync_users.php auth/cas/cli/sync_users.php auth/db/cli/sync_users.php
66SUBST_FILES.php+= enrol/ldap/cli/sync.php enrol/database/cli/sync.php enrol/category/cli/sync.php 73SUBST_FILES.php+= enrol/ldap/cli/sync.php enrol/database/cli/sync.php enrol/category/cli/sync.php
67SUBST_SED.php= -e "s,/usr/bin/php,${PREFIX}/bin/php,g" 74SUBST_SED.php= -e "s,/usr/bin/php,${PREFIX}/bin/php,g"
68 75
69SUBST_CLASSES+= perl 76SUBST_CLASSES+= perl
@@ -82,15 +89,14 @@ do-install: @@ -82,15 +89,14 @@ do-install:
82 ${DESTDIR}${MOODLEDIR}/{} \; -exec ${CHOWN} \ 89 ${DESTDIR}${MOODLEDIR}/{} \; -exec ${CHOWN} \
83 ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MOODLEDIR}/{} \; 90 ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MOODLEDIR}/{} \;
84 cd ${WRKSRC} && ${FIND} . \! -type d -exec ${INSTALL_DATA} {} \ 91 cd ${WRKSRC} && ${FIND} . \! -type d -exec ${INSTALL_DATA} {} \
85 ${DESTDIR}${MOODLEDIR}/{} \; -exec ${CHOWN} \ 92 ${DESTDIR}${MOODLEDIR}/{} \; -exec ${CHOWN} \
86 ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MOODLEDIR}/{} \; 93 ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MOODLEDIR}/{} \;
87 ${INSTALL_DATA} ${WRKDIR}/moodle.conf \ 94 ${INSTALL_DATA} ${WRKDIR}/moodle.conf \
88 ${DESTDIR}${PREFIX}/${EGDIR}/moodle.conf 95 ${DESTDIR}${PREFIX}/${EGDIR}/moodle.conf
89 96
90post-install: 97post-install:
91 ${INSTALL_DATA_DIR} ${DESTDIR}${MOODLEDATADIR} 98 ${INSTALL_DATA_DIR} ${DESTDIR}${MOODLEDATADIR}
92 ${CHOWN} ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MOODLEDATADIR} 99 ${CHOWN} ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MOODLEDATADIR}
93 100
94.include "../../lang/php/phpversion.mk" 101.include "../../lang/php/phpversion.mk"
95.include "../../mk/apache.mk" 
96.include "../../mk/bsd.pkg.mk" 102.include "../../mk/bsd.pkg.mk"