Thu Aug 15 17:52:11 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.9 -r1.10 pkgsrc/www/contao30/Makefile
diff -r1.4 -r1.5 pkgsrc/www/contao30/PLIST
cvs diff -r1.9 -r1.10 pkgsrc/www/contao30/Attic/Makefile (expand / switch to unified diff)

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

--- pkgsrc/www/contao30/Attic/PLIST 2013/02/15 15:42:16 1.4
+++ pkgsrc/www/contao30/Attic/PLIST 2013/08/15 17:52:11 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.4 2013/02/15 15:42:16 taca Exp $ 1@comment $NetBSD: PLIST,v 1.5 2013/08/15 17:52:11 taca Exp $
2${CT_WEBDIR}/.gitignore 2${CT_WEBDIR}/.gitignore
3${CT_WEBDIR}/README.md 3${CT_WEBDIR}/README.md
4${CT_WEBDIR}/assets/codemirror/2.32/codemirror.css 4${CT_WEBDIR}/assets/codemirror/2.32/codemirror.css
5${CT_WEBDIR}/assets/codemirror/2.32/codemirror.js 5${CT_WEBDIR}/assets/codemirror/2.32/codemirror.js
6${CT_WEBDIR}/assets/codemirror/2.32/src/clike.js 6${CT_WEBDIR}/assets/codemirror/2.32/src/clike.js
7${CT_WEBDIR}/assets/codemirror/2.32/src/codemirror.css 7${CT_WEBDIR}/assets/codemirror/2.32/src/codemirror.css
8${CT_WEBDIR}/assets/codemirror/2.32/src/codemirror.js 8${CT_WEBDIR}/assets/codemirror/2.32/src/codemirror.js
9${CT_WEBDIR}/assets/codemirror/2.32/src/css.js 9${CT_WEBDIR}/assets/codemirror/2.32/src/css.js
10${CT_WEBDIR}/assets/codemirror/2.32/src/diff.js 10${CT_WEBDIR}/assets/codemirror/2.32/src/diff.js
11${CT_WEBDIR}/assets/codemirror/2.32/src/htmlmixed.js 11${CT_WEBDIR}/assets/codemirror/2.32/src/htmlmixed.js
12${CT_WEBDIR}/assets/codemirror/2.32/src/javascript.js 12${CT_WEBDIR}/assets/codemirror/2.32/src/javascript.js
13${CT_WEBDIR}/assets/codemirror/2.32/src/markdown.js 13${CT_WEBDIR}/assets/codemirror/2.32/src/markdown.js
14${CT_WEBDIR}/assets/codemirror/2.32/src/mysql.js 14${CT_WEBDIR}/assets/codemirror/2.32/src/mysql.js
@@ -950,26 +950,27 @@ ${CT_WEBDIR}/contao/install.php @@ -950,26 +950,27 @@ ${CT_WEBDIR}/contao/install.php
950${CT_WEBDIR}/contao/main.php 950${CT_WEBDIR}/contao/main.php
951${CT_WEBDIR}/contao/page.php 951${CT_WEBDIR}/contao/page.php
952${CT_WEBDIR}/contao/password.php 952${CT_WEBDIR}/contao/password.php
953${CT_WEBDIR}/contao/popup.php 953${CT_WEBDIR}/contao/popup.php
954${CT_WEBDIR}/contao/preview.php 954${CT_WEBDIR}/contao/preview.php
955${CT_WEBDIR}/contao/switch.php 955${CT_WEBDIR}/contao/switch.php
956${CT_WEBDIR}/index.php 956${CT_WEBDIR}/index.php
957${CT_WEBDIR}/share/index.php 957${CT_WEBDIR}/share/index.php
958${CT_WEBDIR}/system/.htaccess 958${CT_WEBDIR}/system/.htaccess
959${CT_WEBDIR}/system/bin/minify 959${CT_WEBDIR}/system/bin/minify
960${CT_WEBDIR}/system/bin/transifex 960${CT_WEBDIR}/system/bin/transifex
961${CT_WEBDIR}/system/bin/yuicompressor-2.4.6.jar 961${CT_WEBDIR}/system/bin/yuicompressor-2.4.6.jar
962${CT_WEBDIR}/system/cache/.htaccess 962${CT_WEBDIR}/system/cache/.htaccess
 963${CT_WEBDIR}/system/config/default.php
963${CT_WEBDIR}/system/cron/.htaccess 964${CT_WEBDIR}/system/cron/.htaccess
964${CT_WEBDIR}/system/cron/cron.php 965${CT_WEBDIR}/system/cron/cron.php
965${CT_WEBDIR}/system/docs/CHANGELOG.md 966${CT_WEBDIR}/system/docs/CHANGELOG.md
966${CT_WEBDIR}/system/docs/GPL.txt 967${CT_WEBDIR}/system/docs/GPL.txt
967${CT_WEBDIR}/system/docs/LGPL.txt 968${CT_WEBDIR}/system/docs/LGPL.txt
968${CT_WEBDIR}/system/helper/exception.php 969${CT_WEBDIR}/system/helper/exception.php
969${CT_WEBDIR}/system/helper/functions.php 970${CT_WEBDIR}/system/helper/functions.php
970${CT_WEBDIR}/system/helper/ide_compat.php 971${CT_WEBDIR}/system/helper/ide_compat.php
971${CT_WEBDIR}/system/helper/interface.php 972${CT_WEBDIR}/system/helper/interface.php
972${CT_WEBDIR}/system/helper/mbstring.php 973${CT_WEBDIR}/system/helper/mbstring.php
973${CT_WEBDIR}/system/helper/utf8_lookup.php 974${CT_WEBDIR}/system/helper/utf8_lookup.php
974${CT_WEBDIR}/system/initialize.php 975${CT_WEBDIR}/system/initialize.php
975${CT_WEBDIR}/system/logs/.htaccess 976${CT_WEBDIR}/system/logs/.htaccess
@@ -3519,14 +3520,13 @@ ${CT_EGDIR}/files/tinymce.css @@ -3519,14 +3520,13 @@ ${CT_EGDIR}/files/tinymce.css
3519${CT_EGDIR}/htaccess.default 3520${CT_EGDIR}/htaccess.default
3520${CT_EGDIR}/robots.txt 3521${CT_EGDIR}/robots.txt
3521${CT_EGDIR}/system/config/agents.php 3522${CT_EGDIR}/system/config/agents.php
3522${CT_EGDIR}/system/config/codeMirror.php 3523${CT_EGDIR}/system/config/codeMirror.php
3523${CT_EGDIR}/system/config/constants.php 3524${CT_EGDIR}/system/config/constants.php
3524${CT_EGDIR}/system/config/countries.php 3525${CT_EGDIR}/system/config/countries.php
3525${CT_EGDIR}/system/config/default.php 3526${CT_EGDIR}/system/config/default.php
3526${CT_EGDIR}/system/config/languages.php 3527${CT_EGDIR}/system/config/languages.php
3527${CT_EGDIR}/system/config/tcpdf.php 3528${CT_EGDIR}/system/config/tcpdf.php
3528${CT_EGDIR}/system/config/timezones.php 3529${CT_EGDIR}/system/config/timezones.php
3529${CT_EGDIR}/system/config/tinyFlash.php 3530${CT_EGDIR}/system/config/tinyFlash.php
3530${CT_EGDIR}/system/config/tinyMCE.php 3531${CT_EGDIR}/system/config/tinyMCE.php
3531${CT_EGDIR}/system/config/tinyNews.php 3532${CT_EGDIR}/system/config/tinyNews.php
3532@pkgdir share/contao30/system/config