Thu Aug 15 17:50:04 2013 UTC ()
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.


(taca)
diff -r1.8 -r1.9 pkgsrc/www/contao211/Makefile
diff -r1.5 -r1.6 pkgsrc/www/contao211/PLIST
cvs diff -r1.8 -r1.9 pkgsrc/www/contao211/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/contao211/Attic/Makefile 2013/04/02 15:29:00 1.8
+++ pkgsrc/www/contao211/Attic/Makefile 2013/08/15 17:50:04 1.9
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1# $NetBSD: Makefile,v 1.8 2013/04/02 15:29:00 taca Exp $ 1# $NetBSD: Makefile,v 1.9 2013/08/15 17:50:04 taca Exp $
2# 2#
3 3
4DISTNAME= contao-${CT_VERSION} 4DISTNAME= contao-${CT_VERSION}
5PKGNAME= contao${CT_VER}-${CT_PKGVER} 5PKGNAME= contao${CT_VER}-${CT_PKGVER}
 6PKGREVISION= 1
6CATEGORIES= www 7CATEGORIES= www
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=contao/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=contao/}
8DIST_SUBDIR= ${CT_DIST_SUBDIR} 9DIST_SUBDIR= ${CT_DIST_SUBDIR}
9 10
10MAINTAINER= taca@NetBSD.org 11MAINTAINER= taca@NetBSD.org
11HOMEPAGE= http://www.contao.org/ 12HOMEPAGE= http://www.contao.org/
12COMMENT= Contao Open Source CMS ${CT_VERBASE} 13COMMENT= Contao Open Source CMS ${CT_VERBASE}
13LICENSE= gnu-lgpl-v3 14LICENSE= gnu-lgpl-v3
14 15
15DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom 16DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom
16DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd 17DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
17DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring 18DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring
18DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.2.0:../../databases/php-mysqli 19DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.2.0:../../databases/php-mysqli
19DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt 20DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt
20DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap 21DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap
21 22
22CT_VERS= 211 23CT_VERS= 211
23USE_TOOLS= pax 24USE_TOOLS= pax
24NO_BUILD= yes 25NO_BUILD= yes
25 26
26EG_CONFIG= agents.php codeMirror.php config.php countries.php \ 27EG_CONFIG= agents.php codeMirror.php countries.php \
27 languages.php tcpdf.php timezones.php tinyFlash.php \ 28 languages.php tcpdf.php timezones.php tinyFlash.php \
28 tinyMCE.php tinyNews.php 29 tinyMCE.php tinyNews.php
29EG_DATA= ${WWW_EG_FILES} system/config tl_files 30EG_DATA= ${WWW_EG_FILES} system/config tl_files
30EG_TEMPLATES= tinymce.css tiny_templates/index.html 31EG_TEMPLATES= tinymce.css tiny_templates/index.html
31WWW_EG_FILES= robots.txt 32WWW_EG_FILES= robots.txt
32RESTRICT_DIRS= system/html system/logs system/scripts system/tmp \ 33RESTRICT_DIRS= system/html system/logs system/scripts system/tmp \
33 templates tl_files 34 templates tl_files
34 35
35CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf 36CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf
36CONF_FILES+= ${CT_EGDIR}/htaccess.default ${CT_WEBDIR}/.htaccess 37CONF_FILES+= ${CT_EGDIR}/htaccess.default ${CT_WEBDIR}/.htaccess
37 38
38.for f in ${EG_CONFIG} 39.for f in ${EG_CONFIG}
39CONF_FILES+= ${CT_EGDIR}/system/config/${f} ${CT_WEBDIR}/system/config/${f} 40CONF_FILES+= ${CT_EGDIR}/system/config/${f} ${CT_WEBDIR}/system/config/${f}
@@ -52,53 +53,51 @@ REQD_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDI @@ -52,53 +53,51 @@ REQD_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDI
52.for d in ${RESTRICT_DIRS} 53.for d in ${RESTRICT_DIRS}
53OWN_DIRS_PERMS+= ${CT_WEBDIR}/${d} ${APACHE_USER} ${APACHE_GROUP} 0770 54OWN_DIRS_PERMS+= ${CT_WEBDIR}/${d} ${APACHE_USER} ${APACHE_GROUP} 0770
54.endfor 55.endfor
55 56
56SUBST_CLASSES+= conf 57SUBST_CLASSES+= conf
57SUBST_FILES.conf+= ${WRKDIR}/contao.conf 58SUBST_FILES.conf+= ${WRKDIR}/contao.conf
58SUBST_SED.conf+= -e 's|@PREFIX@|${PREFIX:Q}|g' 59SUBST_SED.conf+= -e 's|@PREFIX@|${PREFIX:Q}|g'
59SUBST_SED.conf+= -e 's|@CT_WEBDIR@|${CT_WEBDIR:Q}|g' 60SUBST_SED.conf+= -e 's|@CT_WEBDIR@|${CT_WEBDIR:Q}|g'
60SUBST_STAGE.conf= post-configure 61SUBST_STAGE.conf= post-configure
61 62
62WWW_FILES= CHANGELOG.md GPL.txt LGPL.txt README.md \ 63WWW_FILES= CHANGELOG.md GPL.txt LGPL.txt README.md \
63 contao cron.php index.php plugins share.php templates \ 64 contao cron.php index.php plugins share.php templates \
64 typolight 65 typolight
65WWW_SYSFILES= config/.htaccess constants.php contao.css drivers \ 66WWW_SYSFILES= config/.htaccess config/config.php constants.php contao.css \
66 functions.php html initialize.php interface.php libraries \ 67 drivers functions.php html initialize.php interface.php \
67 logs/.htaccess mbstring.php modules scripts/index.html \ 68 libraries logs/.htaccess mbstring.php modules \
68 themes tmp/.htaccess utf8_lookup.php 69 scripts/index.html themes tmp/.htaccess utf8_lookup.php
69 70
70INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config 71INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config
71 72
72PKG_GROUPS_VARS+= APACHE_GROUP 73PKG_GROUPS_VARS+= APACHE_GROUP
73PKG_USERS_VARS+= APACHE_USER 74PKG_USERS_VARS+= APACHE_USER
74 75
75pre-configure: 76pre-configure:
76 ${RM} -f ${WRKSRC}/.gitignore ${WRKSRC}/system/tmp/*.txt 77 ${RM} -f ${WRKSRC}/.gitignore ${WRKSRC}/system/tmp/*.txt
77 ${CP} ${FILESDIR}/contao.conf ${WRKDIR} 78 ${CP} ${FILESDIR}/contao.conf ${WRKDIR}
78 79
79pre-install: 80pre-install:
80 cd ${WRKSRC}; ${RM} -rf music_academy.css \ 81 cd ${WRKSRC}; ${RM} -rf music_academy.css \
81 templates/music_academy.sql tl_files/music_academy 82 templates/music_academy.sql tl_files/music_academy
82 ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \; 83 ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;
83 ${FIND} ${WRKSRC}/plugins/tinyMCE -type f -exec ${CHMOD} -x {} \; 84 ${FIND} ${WRKSRC}/plugins/tinyMCE -type f -exec ${CHMOD} -x {} \;
84 85
85do-install: 86do-install:
86 cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR} 87 cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR}
87 cd ${WRKSRC}/system; \ 88 cd ${WRKSRC}/system; \
88 pax -rw ${WWW_SYSFILES} \ 89 pax -rw ${WWW_SYSFILES} \
89 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system; \ 90 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system
90 ${INSTALL_DATA} config/.htaccess \ 
91 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system/config 
92 ${INSTALL_DATA} ${WRKSRC}/templates/.htaccess \ 91 ${INSTALL_DATA} ${WRKSRC}/templates/.htaccess \
93 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/templates 92 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/templates
94 cd ${WRKSRC}; pax -rw ${EG_DATA} ${DESTDIR}${PREFIX}/${CT_EGDIR} 93 cd ${WRKSRC}; pax -rw ${EG_DATA} ${DESTDIR}${PREFIX}/${CT_EGDIR}
95 rm -f ${DESTDIR}${PREFIX}/${CT_EGDIR}/system/config/.htaccess 94 rm -f ${DESTDIR}${PREFIX}/${CT_EGDIR}/system/config/.htaccess
96 ${INSTALL_DATA} ${WRKSRC}/.htaccess.default \ 95 ${INSTALL_DATA} ${WRKSRC}/.htaccess.default \
97 ${DESTDIR}${PREFIX}/${CT_EGDIR}/htaccess.default 96 ${DESTDIR}${PREFIX}/${CT_EGDIR}/htaccess.default
98 ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR} 97 ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR}
99 ${INSTALL_DATA} ${FILESDIR}/README \ 98 ${INSTALL_DATA} ${FILESDIR}/README \
100 ${DESTDIR}${PREFIX}/${CT_DOCDIR} 99 ${DESTDIR}${PREFIX}/${CT_DOCDIR}
101 100
102.include "../../www/contao/Makefile.common" 101.include "../../www/contao/Makefile.common"
103.include "../../lang/php/phpversion.mk" 102.include "../../lang/php/phpversion.mk"
104.include "../../mk/bsd.pkg.mk" 103.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/www/contao211/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/www/contao211/Attic/PLIST 2013/04/02 15:29:00 1.5
+++ pkgsrc/www/contao211/Attic/PLIST 2013/08/15 17:50:04 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2013/04/02 15:29:00 taca Exp $ 1@comment $NetBSD: PLIST,v 1.6 2013/08/15 17:50:04 taca Exp $
2${CT_WEBDIR}/CHANGELOG.md 2${CT_WEBDIR}/CHANGELOG.md
3${CT_WEBDIR}/GPL.txt 3${CT_WEBDIR}/GPL.txt
4${CT_WEBDIR}/LGPL.txt 4${CT_WEBDIR}/LGPL.txt
5${CT_WEBDIR}/README.md 5${CT_WEBDIR}/README.md
6${CT_WEBDIR}/contao/contao-uncompressed.js 6${CT_WEBDIR}/contao/contao-uncompressed.js
7${CT_WEBDIR}/contao/contao.js 7${CT_WEBDIR}/contao/contao.js
8${CT_WEBDIR}/contao/file.php 8${CT_WEBDIR}/contao/file.php
9${CT_WEBDIR}/contao/files.php 9${CT_WEBDIR}/contao/files.php
10${CT_WEBDIR}/contao/help.php 10${CT_WEBDIR}/contao/help.php
11${CT_WEBDIR}/contao/index.php 11${CT_WEBDIR}/contao/index.php
12${CT_WEBDIR}/contao/install.php 12${CT_WEBDIR}/contao/install.php
13${CT_WEBDIR}/contao/main.php 13${CT_WEBDIR}/contao/main.php
14${CT_WEBDIR}/contao/page.php 14${CT_WEBDIR}/contao/page.php
@@ -1120,26 +1120,27 @@ ${CT_WEBDIR}/plugins/tinyMCE/themes/simp @@ -1120,26 +1120,27 @@ ${CT_WEBDIR}/plugins/tinyMCE/themes/simp
1120${CT_WEBDIR}/plugins/tinyMCE/themes/simple/skins/o2k7/content.css 1120${CT_WEBDIR}/plugins/tinyMCE/themes/simple/skins/o2k7/content.css
1121${CT_WEBDIR}/plugins/tinyMCE/themes/simple/skins/o2k7/img/button_bg.png 1121${CT_WEBDIR}/plugins/tinyMCE/themes/simple/skins/o2k7/img/button_bg.png
1122${CT_WEBDIR}/plugins/tinyMCE/themes/simple/skins/o2k7/ui.css 1122${CT_WEBDIR}/plugins/tinyMCE/themes/simple/skins/o2k7/ui.css
1123${CT_WEBDIR}/plugins/tinyMCE/tiny_mce.js 1123${CT_WEBDIR}/plugins/tinyMCE/tiny_mce.js
1124${CT_WEBDIR}/plugins/tinyMCE/tiny_mce_gzip.js 1124${CT_WEBDIR}/plugins/tinyMCE/tiny_mce_gzip.js
1125${CT_WEBDIR}/plugins/tinyMCE/tiny_mce_gzip.php 1125${CT_WEBDIR}/plugins/tinyMCE/tiny_mce_gzip.php
1126${CT_WEBDIR}/plugins/tinyMCE/tiny_mce_popup.js 1126${CT_WEBDIR}/plugins/tinyMCE/tiny_mce_popup.js
1127${CT_WEBDIR}/plugins/tinyMCE/utils/editable_selects.js 1127${CT_WEBDIR}/plugins/tinyMCE/utils/editable_selects.js
1128${CT_WEBDIR}/plugins/tinyMCE/utils/form_utils.js 1128${CT_WEBDIR}/plugins/tinyMCE/utils/form_utils.js
1129${CT_WEBDIR}/plugins/tinyMCE/utils/mctabs.js 1129${CT_WEBDIR}/plugins/tinyMCE/utils/mctabs.js
1130${CT_WEBDIR}/plugins/tinyMCE/utils/validate.js 1130${CT_WEBDIR}/plugins/tinyMCE/utils/validate.js
1131${CT_WEBDIR}/share.php 1131${CT_WEBDIR}/share.php
1132${CT_WEBDIR}/system/config/.htaccess 1132${CT_WEBDIR}/system/config/.htaccess
 1133${CT_WEBDIR}/system/config/config.php
1133${CT_WEBDIR}/system/constants.php 1134${CT_WEBDIR}/system/constants.php
1134${CT_WEBDIR}/system/contao.css 1135${CT_WEBDIR}/system/contao.css
1135${CT_WEBDIR}/system/drivers/.htaccess 1136${CT_WEBDIR}/system/drivers/.htaccess
1136${CT_WEBDIR}/system/drivers/DB_Mssql.php 1137${CT_WEBDIR}/system/drivers/DB_Mssql.php
1137${CT_WEBDIR}/system/drivers/DB_Mysql.php 1138${CT_WEBDIR}/system/drivers/DB_Mysql.php
1138${CT_WEBDIR}/system/drivers/DB_Mysqli.php 1139${CT_WEBDIR}/system/drivers/DB_Mysqli.php
1139${CT_WEBDIR}/system/drivers/DB_Oracle.php 1140${CT_WEBDIR}/system/drivers/DB_Oracle.php
1140${CT_WEBDIR}/system/drivers/DB_Postgresql.php 1141${CT_WEBDIR}/system/drivers/DB_Postgresql.php
1141${CT_WEBDIR}/system/drivers/DB_Sybase.php 1142${CT_WEBDIR}/system/drivers/DB_Sybase.php
1142${CT_WEBDIR}/system/drivers/DC_File.php 1143${CT_WEBDIR}/system/drivers/DC_File.php
1143${CT_WEBDIR}/system/drivers/DC_Folder.php 1144${CT_WEBDIR}/system/drivers/DC_Folder.php
1144${CT_WEBDIR}/system/drivers/DC_Table.php 1145${CT_WEBDIR}/system/drivers/DC_Table.php
1145${CT_WEBDIR}/system/functions.php 1146${CT_WEBDIR}/system/functions.php