Pullup ticket #4223 - requested by taca

www/contao211: bug fix patch
www/contao30: bug fix patch
www/contao31: bug fix patch

Revisions pulled up:
- www/contao211/Makefile                                        1.9
- www/contao211/PLIST                                           1.6
- www/contao30/Makefile                                         1.10
- www/contao30/PLIST                                            1.5
- www/contao31/Makefile                                         1.4
- www/contao31/PLIST                                            1.3

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Aug 15 17:50:04 UTC 2013

   Modified Files:
   	pkgsrc/www/contao211: Makefile PLIST

   Log Message:
   Since system/config/config.php isn't configuration file, install it as
   normal files.  It caused trouble with old config.php.

   Also, remove extra install process of system/config/.htaccess.

   Bump PKGREVISION.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Aug 15 17:52:11 UTC 2013

   Modified Files:
   	pkgsrc/www/contao30: Makefile PLIST

   Log Message:
   Since system/config/default.php isn't configuration file, install it as
   normal files.  It might cause trouble with old default.php.

   Bump PKGREVISION.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Aug 15 17:53:23 UTC 2013

   Modified Files:
   	pkgsrc/www/contao31: Makefile PLIST

   Log Message:
   Since system/config/default.php isn't configuration file, install it as
   normal files.  It might cause trouble with old default.php.

   Bump PKGREVISION.

6 files changed, 25 insertions, 22 deletions

diff --git a/www/contao211/Makefile b/www/contao211/Makefile
index 756bd8b7bf4..36a9eb2b3b1 100644
--- a/www/contao211/Makefile
+++ b/www/contao211/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2013/04/02 15:29:00 taca Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2013/08/25 17:36:58 tron Exp $
 #
 
 DISTNAME=	contao-${CT_VERSION}
 PKGNAME=	contao${CT_VER}-${CT_PKGVER}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=contao/}
 DIST_SUBDIR=	${CT_DIST_SUBDIR}
@@ -23,7 +24,7 @@ CT_VERS=	211
 USE_TOOLS=	pax
 NO_BUILD=	yes
 
-EG_CONFIG=	agents.php codeMirror.php config.php countries.php \
+EG_CONFIG=	agents.php codeMirror.php countries.php \
 		languages.php tcpdf.php timezones.php tinyFlash.php \
 		tinyMCE.php tinyNews.php
 EG_DATA=	${WWW_EG_FILES} system/config tl_files
@@ -62,10 +63,10 @@ SUBST_STAGE.conf=	post-configure
 WWW_FILES=	CHANGELOG.md GPL.txt LGPL.txt README.md \
 		contao cron.php index.php plugins share.php templates \
 		typolight
-WWW_SYSFILES=	config/.htaccess constants.php contao.css drivers \
-		functions.php html initialize.php interface.php libraries \
-		logs/.htaccess mbstring.php modules scripts/index.html \
-		themes tmp/.htaccess utf8_lookup.php
+WWW_SYSFILES=	config/.htaccess config/config.php constants.php contao.css \
+		drivers functions.php html initialize.php interface.php \
+		libraries logs/.htaccess mbstring.php modules \
+		scripts/index.html themes tmp/.htaccess utf8_lookup.php
 
 INSTALLATION_DIRS+=	${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config
 
@@ -86,9 +87,7 @@ do-install:
 	cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR}
 	cd ${WRKSRC}/system; \
 		pax -rw ${WWW_SYSFILES} \
-			${DESTDIR}${PREFIX}/${CT_WEBDIR}/system; \
-		${INSTALL_DATA} config/.htaccess \
-			${DESTDIR}${PREFIX}/${CT_WEBDIR}/system/config
+			${DESTDIR}${PREFIX}/${CT_WEBDIR}/system
 	${INSTALL_DATA} ${WRKSRC}/templates/.htaccess \
 		${DESTDIR}${PREFIX}/${CT_WEBDIR}/templates
 	cd ${WRKSRC}; pax -rw ${EG_DATA} ${DESTDIR}${PREFIX}/${CT_EGDIR}
diff --git a/www/contao211/PLIST b/www/contao211/PLIST
index 78ff6817954..96929cf9ec6 100644
--- a/www/contao211/PLIST
+++ b/www/contao211/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2013/04/02 15:29:00 taca Exp $
+@comment $NetBSD: PLIST,v 1.5.2.1 2013/08/25 17:36:58 tron Exp $
 ${CT_WEBDIR}/CHANGELOG.md
 ${CT_WEBDIR}/GPL.txt
 ${CT_WEBDIR}/LGPL.txt
@@ -1130,6 +1130,7 @@ ${CT_WEBDIR}/plugins/tinyMCE/utils/mctabs.js
 ${CT_WEBDIR}/plugins/tinyMCE/utils/validate.js
 ${CT_WEBDIR}/share.php
 ${CT_WEBDIR}/system/config/.htaccess
+${CT_WEBDIR}/system/config/config.php
 ${CT_WEBDIR}/system/constants.php
 ${CT_WEBDIR}/system/contao.css
 ${CT_WEBDIR}/system/drivers/.htaccess
diff --git a/www/contao30/Makefile b/www/contao30/Makefile
index 7c13e185756..a4ff265144a 100644
--- a/www/contao30/Makefile
+++ b/www/contao30/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2013/06/27 16:11:20 taca Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2013/08/25 17:36:58 tron Exp $
 #
 
 DISTNAME=	contao-${CT_VERSION}
 PKGNAME=	contao${CT_VER}-${CT_PKGVER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=contao/}
 
@@ -24,7 +24,7 @@ USE_TOOLS=	bash pax
 NO_BUILD=	yes
 
 EG_CONFIG=	agents.php codeMirror.php constants.php countries.php \
-		default.php languages.php tcpdf.php timezones.php \
+		languages.php tcpdf.php timezones.php \
 		tinyFlash.php tinyMCE.php tinyNews.php
 EG_DATA=	${WWW_EG_FILES} system/config files
 EG_TEMPLATES=	tinymce.css tiny_templates/index.html
@@ -66,9 +66,9 @@ SUBST_SED.php+=		-e "s|\#!/.*php|\#!${PREFIX}/bin/php|"
 SUBST_STAGE.php=	post-configure
 
 WWW_FILES=	.gitignore README.md assets contao index.php share templates
-WWW_SYSFILES=	.htaccess bin cache/.htaccess cron docs helper \
-		initialize.php logs/.htaccess modules themes tmp/.htaccess \
-		vendor
+WWW_SYSFILES=	.htaccess bin cache/.htaccess config/default.php cron docs \
+		helper initialize.php logs/.htaccess modules themes \
+		tmp/.htaccess vendor
 
 INSTALLATION_DIRS+=	${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config
 
diff --git a/www/contao30/PLIST b/www/contao30/PLIST
index fba4c9f4776..e8d1d947d01 100644
--- a/www/contao30/PLIST
+++ b/www/contao30/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/02/15 15:42:16 taca Exp $
+@comment $NetBSD: PLIST,v 1.4.4.1 2013/08/25 17:36:58 tron Exp $
 ${CT_WEBDIR}/.gitignore
 ${CT_WEBDIR}/README.md
 ${CT_WEBDIR}/assets/codemirror/2.32/codemirror.css
@@ -960,6 +960,7 @@ ${CT_WEBDIR}/system/bin/minify
 ${CT_WEBDIR}/system/bin/transifex
 ${CT_WEBDIR}/system/bin/yuicompressor-2.4.6.jar
 ${CT_WEBDIR}/system/cache/.htaccess
+${CT_WEBDIR}/system/config/default.php
 ${CT_WEBDIR}/system/cron/.htaccess
 ${CT_WEBDIR}/system/cron/cron.php
 ${CT_WEBDIR}/system/docs/CHANGELOG.md
@@ -3529,4 +3530,3 @@ ${CT_EGDIR}/system/config/timezones.php
 ${CT_EGDIR}/system/config/tinyFlash.php
 ${CT_EGDIR}/system/config/tinyMCE.php
 ${CT_EGDIR}/system/config/tinyNews.php
-@pkgdir share/contao30/system/config
diff --git a/www/contao31/Makefile b/www/contao31/Makefile
index dd503147d91..0fd25a171ed 100644
--- a/www/contao31/Makefile
+++ b/www/contao31/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2013/06/27 16:17:55 taca Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2013/08/25 17:36:58 tron Exp $
 #
 
 DISTNAME=	contao-${CT_VERSION}
 PKGNAME=	contao${CT_VER}-${CT_PKGVER}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=contao/}
 
@@ -23,7 +24,7 @@ USE_TOOLS=	bash pax
 NO_BUILD=	yes
 
 EG_CONFIG=	ace.php agents.php constants.php countries.php \
-		default.php languages.php tcpdf.php timezones.php \
+		languages.php tcpdf.php timezones.php \
 		tinyFlash.php tinyMCE.php tinyNews.php
 EG_DATA=	${WWW_EG_FILES} system/config files
 EG_TEMPLATES=	tinymce.css tiny_templates/index.html
@@ -65,7 +66,8 @@ SUBST_SED.php+=		-e "s|\#!/.*php|\#!${PREFIX}/bin/php|"
 SUBST_STAGE.php=	post-configure
 
 WWW_FILES=	.gitignore README.md assets contao index.php share templates
-WWW_SYSFILES=	.htaccess bin cron docs helper initialize.php modules themes
+WWW_SYSFILES=	.htaccess bin config/default.php cron docs helper \
+		initialize.php modules themes
 
 INSTALLATION_DIRS+=	${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config
 
diff --git a/www/contao31/PLIST b/www/contao31/PLIST
index fb44af4fa3c..23e7816122d 100644
--- a/www/contao31/PLIST
+++ b/www/contao31/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/06/27 16:17:55 taca Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2013/08/25 17:36:58 tron Exp $
 ${CT_WEBDIR}/.gitignore
 ${CT_WEBDIR}/README.md
 ${CT_WEBDIR}/assets/ace/1.0.01/ace.js
@@ -985,6 +985,7 @@ ${CT_WEBDIR}/share/index.php
 ${CT_WEBDIR}/system/.htaccess
 ${CT_WEBDIR}/system/bin/minify
 ${CT_WEBDIR}/system/bin/yuicompressor-2.4.6.jar
+${CT_WEBDIR}/system/config/default.php
 ${CT_WEBDIR}/system/cron/.htaccess
 ${CT_WEBDIR}/system/cron/cron.php
 ${CT_WEBDIR}/system/docs/CHANGELOG.md