Thu Aug 15 17:53:23 2013 UTC ()
Since system/config/default.php isn't configuration file, install it as
normal files.  It might cause trouble with old default.php.

Bump PKGREVISION.


(taca)
diff -r1.3 -r1.4 pkgsrc/www/contao31/Makefile
diff -r1.2 -r1.3 pkgsrc/www/contao31/PLIST
cvs diff -r1.3 -r1.4 pkgsrc/www/contao31/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/contao31/Attic/Makefile 2013/06/27 16:17:55 1.3
+++ pkgsrc/www/contao31/Attic/Makefile 2013/08/15 17:53:23 1.4
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1# $NetBSD: Makefile,v 1.3 2013/06/27 16:17:55 taca Exp $ 1# $NetBSD: Makefile,v 1.4 2013/08/15 17:53:23 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/}
8 9
9MAINTAINER= taca@NetBSD.org 10MAINTAINER= taca@NetBSD.org
10HOMEPAGE= http://www.contao.org/ 11HOMEPAGE= http://www.contao.org/
11COMMENT= Contao Open Source CMS ${CT_VERSION} 12COMMENT= Contao Open Source CMS ${CT_VERSION}
12LICENSE= gnu-lgpl-v3 13LICENSE= gnu-lgpl-v3
13 14
14DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom 15DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom
15DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd 16DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
16DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring 17DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring
17DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.2.0:../../databases/php-mysqli 18DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.2.0:../../databases/php-mysqli
18DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt 19DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt
19DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap 20DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap
20 21
21CT_VERS= 31 22CT_VERS= 31
22USE_TOOLS= bash pax 23USE_TOOLS= bash pax
23NO_BUILD= yes 24NO_BUILD= yes
24 25
25EG_CONFIG= ace.php agents.php constants.php countries.php \ 26EG_CONFIG= ace.php agents.php constants.php countries.php \
26 default.php languages.php tcpdf.php timezones.php \ 27 languages.php tcpdf.php timezones.php \
27 tinyFlash.php tinyMCE.php tinyNews.php 28 tinyFlash.php tinyMCE.php tinyNews.php
28EG_DATA= ${WWW_EG_FILES} system/config files 29EG_DATA= ${WWW_EG_FILES} system/config files
29EG_TEMPLATES= tinymce.css tiny_templates/index.html 30EG_TEMPLATES= tinymce.css tiny_templates/index.html
30WWW_EG_FILES= robots.txt 31WWW_EG_FILES= robots.txt
31RESTRICT_DIRS= system/cache system/logs system/tmp templates files 32RESTRICT_DIRS= system/cache system/logs system/tmp templates files
32 33
33CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf 34CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf
34CONF_FILES+= ${CT_EGDIR}/htaccess.default ${CT_WEBDIR}/.htaccess 35CONF_FILES+= ${CT_EGDIR}/htaccess.default ${CT_WEBDIR}/.htaccess
35 36
36.for f in ${EG_CONFIG} 37.for f in ${EG_CONFIG}
37CONF_FILES+= ${CT_EGDIR}/system/config/${f} ${CT_WEBDIR}/system/config/${f} 38CONF_FILES+= ${CT_EGDIR}/system/config/${f} ${CT_WEBDIR}/system/config/${f}
38.endfor 39.endfor
39 40
@@ -55,27 +56,28 @@ OWN_DIRS_PERMS+= ${CT_WEBDIR}/${d} ${APA @@ -55,27 +56,28 @@ OWN_DIRS_PERMS+= ${CT_WEBDIR}/${d} ${APA
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
62SUBST_CLASSES+= php 63SUBST_CLASSES+= php
63SUBST_FILES.php+= ${WRKSRC}/system/bin/transifex 64SUBST_FILES.php+= ${WRKSRC}/system/bin/transifex
64SUBST_SED.php+= -e "s|\#!/.*php|\#!${PREFIX}/bin/php|" 65SUBST_SED.php+= -e "s|\#!/.*php|\#!${PREFIX}/bin/php|"
65SUBST_STAGE.php= post-configure 66SUBST_STAGE.php= post-configure
66 67
67WWW_FILES= .gitignore README.md assets contao index.php share templates 68WWW_FILES= .gitignore README.md assets contao index.php share templates
68WWW_SYSFILES= .htaccess bin cron docs helper initialize.php modules themes 69WWW_SYSFILES= .htaccess bin config/default.php cron docs helper \
 70 initialize.php modules themes
69 71
70INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config 72INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config
71 73
72PKG_GROUPS_VARS+= APACHE_GROUP 74PKG_GROUPS_VARS+= APACHE_GROUP
73PKG_USERS_VARS+= APACHE_USER 75PKG_USERS_VARS+= APACHE_USER
74 76
75pre-configure: 77pre-configure:
76 cd ${WRKSRC} && ${RM} -f assets/css/*.css 78 cd ${WRKSRC} && ${RM} -f assets/css/*.css
77 ${CP} ${FILESDIR}/contao.conf ${WRKDIR} 79 ${CP} ${FILESDIR}/contao.conf ${WRKDIR}
78 80
79pre-install: 81pre-install:
80 cd ${WRKSRC}; ${RM} -fr files/music_academy templates/music_academy.sql 82 cd ${WRKSRC}; ${RM} -fr files/music_academy templates/music_academy.sql
81 ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \; 83 ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;
cvs diff -r1.2 -r1.3 pkgsrc/www/contao31/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/www/contao31/Attic/PLIST 2013/06/27 16:17:55 1.2
+++ pkgsrc/www/contao31/Attic/PLIST 2013/08/15 17:53:23 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2013/06/27 16:17:55 taca Exp $ 1@comment $NetBSD: PLIST,v 1.3 2013/08/15 17:53:23 taca Exp $
2${CT_WEBDIR}/.gitignore 2${CT_WEBDIR}/.gitignore
3${CT_WEBDIR}/README.md 3${CT_WEBDIR}/README.md
4${CT_WEBDIR}/assets/ace/1.0.01/ace.js 4${CT_WEBDIR}/assets/ace/1.0.01/ace.js
5${CT_WEBDIR}/assets/ace/1.0.01/ext-searchbox.js 5${CT_WEBDIR}/assets/ace/1.0.01/ext-searchbox.js
6${CT_WEBDIR}/assets/ace/1.0.01/ext-spellcheck.js 6${CT_WEBDIR}/assets/ace/1.0.01/ext-spellcheck.js
7${CT_WEBDIR}/assets/ace/1.0.01/ext-static_highlight.js 7${CT_WEBDIR}/assets/ace/1.0.01/ext-static_highlight.js
8${CT_WEBDIR}/assets/ace/1.0.01/ext-textarea.js 8${CT_WEBDIR}/assets/ace/1.0.01/ext-textarea.js
9${CT_WEBDIR}/assets/ace/1.0.01/keybinding-emacs.js 9${CT_WEBDIR}/assets/ace/1.0.01/keybinding-emacs.js
10${CT_WEBDIR}/assets/ace/1.0.01/keybinding-vim.js 10${CT_WEBDIR}/assets/ace/1.0.01/keybinding-vim.js
11${CT_WEBDIR}/assets/ace/1.0.01/mode-asciidoc.js 11${CT_WEBDIR}/assets/ace/1.0.01/mode-asciidoc.js
12${CT_WEBDIR}/assets/ace/1.0.01/mode-css.js 12${CT_WEBDIR}/assets/ace/1.0.01/mode-css.js
13${CT_WEBDIR}/assets/ace/1.0.01/mode-diff.js 13${CT_WEBDIR}/assets/ace/1.0.01/mode-diff.js
14${CT_WEBDIR}/assets/ace/1.0.01/mode-html.js 14${CT_WEBDIR}/assets/ace/1.0.01/mode-html.js
@@ -975,26 +975,27 @@ ${CT_WEBDIR}/contao/help.php @@ -975,26 +975,27 @@ ${CT_WEBDIR}/contao/help.php
975${CT_WEBDIR}/contao/index.php 975${CT_WEBDIR}/contao/index.php
976${CT_WEBDIR}/contao/install.php 976${CT_WEBDIR}/contao/install.php
977${CT_WEBDIR}/contao/main.php 977${CT_WEBDIR}/contao/main.php
978${CT_WEBDIR}/contao/page.php 978${CT_WEBDIR}/contao/page.php
979${CT_WEBDIR}/contao/password.php 979${CT_WEBDIR}/contao/password.php
980${CT_WEBDIR}/contao/popup.php 980${CT_WEBDIR}/contao/popup.php
981${CT_WEBDIR}/contao/preview.php 981${CT_WEBDIR}/contao/preview.php
982${CT_WEBDIR}/contao/switch.php 982${CT_WEBDIR}/contao/switch.php
983${CT_WEBDIR}/index.php 983${CT_WEBDIR}/index.php
984${CT_WEBDIR}/share/index.php 984${CT_WEBDIR}/share/index.php
985${CT_WEBDIR}/system/.htaccess 985${CT_WEBDIR}/system/.htaccess
986${CT_WEBDIR}/system/bin/minify 986${CT_WEBDIR}/system/bin/minify
987${CT_WEBDIR}/system/bin/yuicompressor-2.4.6.jar 987${CT_WEBDIR}/system/bin/yuicompressor-2.4.6.jar
 988${CT_WEBDIR}/system/config/default.php
988${CT_WEBDIR}/system/cron/.htaccess 989${CT_WEBDIR}/system/cron/.htaccess
989${CT_WEBDIR}/system/cron/cron.php 990${CT_WEBDIR}/system/cron/cron.php
990${CT_WEBDIR}/system/docs/CHANGELOG.md 991${CT_WEBDIR}/system/docs/CHANGELOG.md
991${CT_WEBDIR}/system/docs/GPL.txt 992${CT_WEBDIR}/system/docs/GPL.txt
992${CT_WEBDIR}/system/docs/LGPL.txt 993${CT_WEBDIR}/system/docs/LGPL.txt
993${CT_WEBDIR}/system/helper/functions.php 994${CT_WEBDIR}/system/helper/functions.php
994${CT_WEBDIR}/system/helper/ide_compat.php 995${CT_WEBDIR}/system/helper/ide_compat.php
995${CT_WEBDIR}/system/helper/interface.php 996${CT_WEBDIR}/system/helper/interface.php
996${CT_WEBDIR}/system/helper/mbstring.php 997${CT_WEBDIR}/system/helper/mbstring.php
997${CT_WEBDIR}/system/helper/utf8_lookup.php 998${CT_WEBDIR}/system/helper/utf8_lookup.php
998${CT_WEBDIR}/system/initialize.php 999${CT_WEBDIR}/system/initialize.php
999${CT_WEBDIR}/system/modules/calendar/assets/.htaccess 1000${CT_WEBDIR}/system/modules/calendar/assets/.htaccess
1000${CT_WEBDIR}/system/modules/calendar/assets/icon.gif 1001${CT_WEBDIR}/system/modules/calendar/assets/icon.gif