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 context 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,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2013/05/23 14:58:34 taca Exp $
+# $NetBSD: Makefile.common,v 1.36 2013/06/27 15:48:29 taca Exp $
 #
 # used by www/contao/Makefile.example"
 # used by www/contao211/Makefile
@@ -15,18 +15,24 @@
 
 .if ${CT_VERS} == "211"
 CT_VERSION=	${CT211_VERSION}
-CT_FILES=	tl_files
 .elif ${CT_VERS} == "30"
 CT_VERSION=	${CT300_VERSION}
-CT_FILES=	files
-CT_DIST_SUBDIR=	contao-20120109
 .elif ${CT_VERS} == "31"
 CT_VERSION=	${CT310_VERSION}
-CT_FILES=	files
 .else
 .error "Illegal version specified: ${CT_VERS}"
 .endif
 
+.if ${CT_VERS} == "211"
+CT_FILES=	tl_files
+.else
+. if ${CT_VERS} == "30"
+CT_DIST_SUBDIR=	contao-20120109
+. endif
+CT_FILES=	files
+FILESDIR=	${.CURDIR}/../../www/contao/files
+.endif
+
 CT_VER=		${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
 CT_VERBASE=	${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/}
 CT_PKGVER=	${CT_VERSION:S/.RC/rc/}
@@ -56,5 +62,3 @@
 CT_WEBDIR?=	share/contao${CT_VER}
 
 BUILD_DEFS+=	APACHE_USER CT_DOCDIR CT_EGDIR CT_WEBDIR
-
-FILESDIR=	${.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>