Thu Jun 27 15:48:29 2013 UTC ()
* Make contao211 to use own FILESDIR.
* A small clean up to common/Makefile.common.

No functional change.


(taca)
diff -r1.35 -r1.36 pkgsrc/www/contao/Makefile.common
diff -r0 -r1.1 pkgsrc/www/contao211/files/README
diff -r0 -r1.1 pkgsrc/www/contao211/files/contao.conf
cvs diff -r1.35 -r1.36 pkgsrc/www/contao/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/contao/Makefile.common 2013/05/23 14:58:34 1.35
+++ pkgsrc/www/contao/Makefile.common 2013/06/27 15:48:29 1.36
@@ -1,42 +1,48 @@ @@ -1,42 +1,48 @@
1# $NetBSD: Makefile.common,v 1.35 2013/05/23 14:58:34 taca Exp $ 1# $NetBSD: Makefile.common,v 1.36 2013/06/27 15:48:29 taca Exp $
2# 2#
3# used by www/contao/Makefile.example" 3# used by www/contao/Makefile.example"
4# used by www/contao211/Makefile 4# used by www/contao211/Makefile
5# used by www/contao211-translations/Makefile 5# used by www/contao211-translations/Makefile
6# used by www/contao30/Makefile 6# used by www/contao30/Makefile
7# 7#
8 8
9# current release 9# current release
10CT211_VERSION= 2.11.11 10CT211_VERSION= 2.11.11
11CT300_VERSION= 3.0.6 11CT300_VERSION= 3.0.6
12CT310_VERSION= 3.1.0 12CT310_VERSION= 3.1.0
13 13
14CT_VERS?= 211 14CT_VERS?= 211
15 15
16.if ${CT_VERS} == "211" 16.if ${CT_VERS} == "211"
17CT_VERSION= ${CT211_VERSION} 17CT_VERSION= ${CT211_VERSION}
18CT_FILES= tl_files 
19.elif ${CT_VERS} == "30" 18.elif ${CT_VERS} == "30"
20CT_VERSION= ${CT300_VERSION} 19CT_VERSION= ${CT300_VERSION}
21CT_FILES= files 
22CT_DIST_SUBDIR= contao-20120109 
23.elif ${CT_VERS} == "31" 20.elif ${CT_VERS} == "31"
24CT_VERSION= ${CT310_VERSION} 21CT_VERSION= ${CT310_VERSION}
25CT_FILES= files 
26.else 22.else
27.error "Illegal version specified: ${CT_VERS}" 23.error "Illegal version specified: ${CT_VERS}"
28.endif 24.endif
29 25
 26.if ${CT_VERS} == "211"
 27CT_FILES= tl_files
 28.else
 29. if ${CT_VERS} == "30"
 30CT_DIST_SUBDIR= contao-20120109
 31. endif
 32CT_FILES= files
 33FILESDIR= ${.CURDIR}/../../www/contao/files
 34.endif
 35
30CT_VER= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/} 36CT_VER= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
31CT_VERBASE= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/} 37CT_VERBASE= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/}
32CT_PKGVER= ${CT_VERSION:S/.RC/rc/} 38CT_PKGVER= ${CT_VERSION:S/.RC/rc/}
33 39
34FILES_SUBST+= PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \ 40FILES_SUBST+= PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \
35 WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q} 41 WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q}
36MESSAGE_SUBST+= CT_VER=${CT_VER} 42MESSAGE_SUBST+= CT_VER=${CT_VER}
37PLIST_SUBST+= CT_DOCDIR=${CT_DOCDIR:Q} CT_EGDIR=${CT_EGDIR:Q} \ 43PLIST_SUBST+= CT_DOCDIR=${CT_DOCDIR:Q} CT_EGDIR=${CT_EGDIR:Q} \
38 CT_WEBDIR=${CT_WEBDIR:Q} 44 CT_WEBDIR=${CT_WEBDIR:Q}
39 45
40PRINT_PLIST_AWK+= /^${CT_WEBDIR:S|/|\\/|g}/ \ 46PRINT_PLIST_AWK+= /^${CT_WEBDIR:S|/|\\/|g}/ \
41 { gsub(/${CT_WEBDIR:S|/|\\/|g}/, "$${CT_WEBDIR}"); \ 47 { gsub(/${CT_WEBDIR:S|/|\\/|g}/, "$${CT_WEBDIR}"); \
42 print; next; } 48 print; next; }
@@ -46,15 +52,13 @@ PRINT_PLIST_AWK+= /^${CT_DOCDIR:S|/|\\/| @@ -46,15 +52,13 @@ PRINT_PLIST_AWK+= /^${CT_DOCDIR:S|/|\\/|
46PRINT_PLIST_AWK+= /^${CT_EGDIR:S|/|\\/|g}/ \ 52PRINT_PLIST_AWK+= /^${CT_EGDIR:S|/|\\/|g}/ \
47 { gsub(/${CT_EGDIR:S|/|\\/|g}/, "$${CT_EGDIR}"); \ 53 { gsub(/${CT_EGDIR:S|/|\\/|g}/, "$${CT_EGDIR}"); \
48 print; next; } 54 print; next; }
49 55
50.include "../../mk/bsd.prefs.mk" 56.include "../../mk/bsd.prefs.mk"
51 57
52PKG_SYSCONFSUBDIR?= contao${CT_VER} 58PKG_SYSCONFSUBDIR?= contao${CT_VER}
53 59
54CT_DOCDIR?= share/doc/contao${CT_VER} 60CT_DOCDIR?= share/doc/contao${CT_VER}
55CT_EGDIR?= share/examples/contao${CT_VER} 61CT_EGDIR?= share/examples/contao${CT_VER}
56CT_WEBDIR?= share/contao${CT_VER} 62CT_WEBDIR?= share/contao${CT_VER}
57 63
58BUILD_DEFS+= APACHE_USER CT_DOCDIR CT_EGDIR CT_WEBDIR 64BUILD_DEFS+= APACHE_USER CT_DOCDIR CT_EGDIR CT_WEBDIR
59 
60FILESDIR= ${.CURDIR}/../../www/contao/files 
File Added: pkgsrc/www/contao211/files/Attic/README
$NetBSD: README,v 1.1 2013/06/27 15:48:29 taca Exp $

1. First, create a database for Contao Open Source CMS.

	# mysqladmin -p -u <administrator> create <dbname>.

2. Next, create a user for accessing that database.

	# mysql -p -u <administrator> <dbname>
	mysql> grant select, insert, update, delete, create, drop,
	       index, alter, create temporary tables, lock tables on
	       <dbname>.* to '<dbuser>'@'localhost'
	       identified by '<dbpass>' ;

3. Edit ${PKG_SYSCONFDIR}/contao.conf and include from httpd.conf.

	Include ${PKG_SYSCONFDIR}/contao.conf

   Then reload or restart apache.

4. Start setup from Contao installer.  If your setup Contao's
   URL as http://www.example.org/, the installer's URL will be
   http://www.example.org/contao/install.php.
File Added: pkgsrc/www/contao211/files/Attic/contao.conf
# $NetBSD: contao.conf,v 1.1 2013/06/27 15:48:29 taca Exp $

#
# If you set DocumentRoot to "@PREFIX@/@CT_WEBDIR@",
# Set DocuemntRoot of Apache to it.
# If you want to access contao via sub directory, uncomment
# below line.  (http://www.example.org/subdir/)
# 
#Alias	/subdir		"@PREFIX@/@CT_WEBDIR@"

<Directory "@PREFIX@/@CT_WEBDIR@">
	DirectoryIndex index.php index.html
        Options Indexes SymLinksIfOwnerMatch FollowSymLinks
        AllowOverride All
        Order allow,deny
        Allow from all
</Directory>