Tue Jun 10 03:47:59 2014 UTC ()
Update contao32 to 3.2.11.

Version 3.2.11 (2014-06-04)
---------------------------

### Fixed
Make `$this->locationLabel` available in the event list (see #7030).

### Fixed
Correctly set the root page title (see #7023).

### Fixed
Only show the sort hint if there is more than one element (see #6935).

### Fixed
Try to raise the PHP limits upon file synchronization (see #7035).


(taca)
diff -r1.72 -r1.73 pkgsrc/www/contao/Makefile.common
diff -r1.6 -r1.7 pkgsrc/www/contao32/Makefile
diff -r1.11 -r1.12 pkgsrc/www/contao32/distinfo
cvs diff -r1.72 -r1.73 pkgsrc/www/contao/Makefile.common (switch to unified diff)

--- pkgsrc/www/contao/Makefile.common 2014/06/01 14:39:12 1.72
+++ pkgsrc/www/contao/Makefile.common 2014/06/10 03:47:59 1.73
@@ -1,61 +1,61 @@ @@ -1,61 +1,61 @@
1# $NetBSD: Makefile.common,v 1.72 2014/06/01 14:39:12 taca Exp $ 1# $NetBSD: Makefile.common,v 1.73 2014/06/10 03:47:59 taca Exp $
2# 2#
3# used by www/contao/Makefile.example" 3# used by www/contao/Makefile.example"
4# used by www/contao32/Makefile 4# used by www/contao32/Makefile
5# used by www/contao33/Makefile 5# used by www/contao33/Makefile
6 6
7# current release 7# current release
8CT32_VERSION= 3.2.10 8CT32_VERSION= 3.2.11
9CT33_VERSION= 3.3.1 9CT33_VERSION= 3.3.1
10 10
11CT_VERS?= 32 11CT_VERS?= 32
12 12
13.if ${CT_VERS} == "32" 13.if ${CT_VERS} == "32"
14CT_VERSION= ${CT32_VERSION} 14CT_VERSION= ${CT32_VERSION}
15.elif ${CT_VERS} == "33" 15.elif ${CT_VERS} == "33"
16CT_VERSION= ${CT33_VERSION} 16CT_VERSION= ${CT33_VERSION}
17.else 17.else
18.error "Illegal version specified: ${CT_VERS}" 18.error "Illegal version specified: ${CT_VERS}"
19.endif 19.endif
20 20
21# Contao master site (on GitHub). 21# Contao master site (on GitHub).
22.if ${CT_VERS} == "32" 22.if ${CT_VERS} == "32"
23DIST_SUBDIR?= contao 23DIST_SUBDIR?= contao
24CT_MASTER_SITE= https://github.com/contao/core/archive/ 24CT_MASTER_SITE= https://github.com/contao/core/archive/
25WRKSRC?= ${WRKDIR}/core-${CT_VERSION} 25WRKSRC?= ${WRKDIR}/core-${CT_VERSION}
26.else 26.else
27CT_MASTER_SITE= https://github.com/contao/core/releases/download/${CT_VERSION}/ 27CT_MASTER_SITE= https://github.com/contao/core/releases/download/${CT_VERSION}/
28.endif 28.endif
29 29
30CT_FILES= files 30CT_FILES= files
31FILESDIR= ${.CURDIR}/../../www/contao/files 31FILESDIR= ${.CURDIR}/../../www/contao/files
32 32
33CT_VER= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/} 33CT_VER= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
34CT_VERBASE= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/} 34CT_VERBASE= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/}
35CT_PKGVER= ${CT_VERSION:S/.RC/rc/} 35CT_PKGVER= ${CT_VERSION:S/.RC/rc/}
36 36
37FILES_SUBST+= PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \ 37FILES_SUBST+= PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \
38 WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q} 38 WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q}
39MESSAGE_SUBST+= CT_VER=${CT_VER} 39MESSAGE_SUBST+= CT_VER=${CT_VER}
40PLIST_SUBST+= CT_DOCDIR=${CT_DOCDIR:Q} CT_EGDIR=${CT_EGDIR:Q} \ 40PLIST_SUBST+= CT_DOCDIR=${CT_DOCDIR:Q} CT_EGDIR=${CT_EGDIR:Q} \
41 CT_WEBDIR=${CT_WEBDIR:Q} 41 CT_WEBDIR=${CT_WEBDIR:Q}
42 42
43PRINT_PLIST_AWK+= /^${CT_WEBDIR:S|/|\\/|g}/ \ 43PRINT_PLIST_AWK+= /^${CT_WEBDIR:S|/|\\/|g}/ \
44 { gsub(/${CT_WEBDIR:S|/|\\/|g}/, "$${CT_WEBDIR}"); \ 44 { gsub(/${CT_WEBDIR:S|/|\\/|g}/, "$${CT_WEBDIR}"); \
45 print; next; } 45 print; next; }
46PRINT_PLIST_AWK+= /^${CT_DOCDIR:S|/|\\/|g}/ \ 46PRINT_PLIST_AWK+= /^${CT_DOCDIR:S|/|\\/|g}/ \
47 { gsub(/${CT_DOCDIR:S|/|\\/|g}/, "$${CT_DOCDIR}"); \ 47 { gsub(/${CT_DOCDIR:S|/|\\/|g}/, "$${CT_DOCDIR}"); \
48 print; next; } 48 print; next; }
49PRINT_PLIST_AWK+= /^${CT_EGDIR:S|/|\\/|g}/ \ 49PRINT_PLIST_AWK+= /^${CT_EGDIR:S|/|\\/|g}/ \
50 { gsub(/${CT_EGDIR:S|/|\\/|g}/, "$${CT_EGDIR}"); \ 50 { gsub(/${CT_EGDIR:S|/|\\/|g}/, "$${CT_EGDIR}"); \
51 print; next; } 51 print; next; }
52 52
53.include "../../mk/bsd.prefs.mk" 53.include "../../mk/bsd.prefs.mk"
54 54
55PKG_SYSCONFSUBDIR?= contao${CT_VER} 55PKG_SYSCONFSUBDIR?= contao${CT_VER}
56 56
57CT_DOCDIR?= share/doc/contao${CT_VER} 57CT_DOCDIR?= share/doc/contao${CT_VER}
58CT_EGDIR?= share/examples/contao${CT_VER} 58CT_EGDIR?= share/examples/contao${CT_VER}
59CT_WEBDIR?= share/contao${CT_VER} 59CT_WEBDIR?= share/contao${CT_VER}
60 60
61BUILD_DEFS+= APACHE_USER CT_DOCDIR CT_EGDIR CT_WEBDIR 61BUILD_DEFS+= APACHE_USER CT_DOCDIR CT_EGDIR CT_WEBDIR
cvs diff -r1.6 -r1.7 pkgsrc/www/contao32/Attic/Makefile (switch to unified diff)

--- pkgsrc/www/contao32/Attic/Makefile 2014/05/29 15:44:57 1.6
+++ pkgsrc/www/contao32/Attic/Makefile 2014/06/10 03:47:59 1.7
@@ -1,106 +1,105 @@ @@ -1,106 +1,105 @@
1# $NetBSD: Makefile,v 1.6 2014/05/29 15:44:57 taca Exp $ 1# $NetBSD: Makefile,v 1.7 2014/06/10 03:47:59 taca Exp $
2# 2#
3 3
4DISTNAME= ${CT_VERSION} 4DISTNAME= ${CT_VERSION}
5PKGNAME= contao${CT_VER}-${CT_PKGVER} 5PKGNAME= contao${CT_VER}-${CT_PKGVER}
6PKGREVISION= 2 
7CATEGORIES= www 6CATEGORIES= www
8MASTER_SITES= ${CT_MASTER_SITE} 7MASTER_SITES= ${CT_MASTER_SITE}
9 8
10MAINTAINER= taca@NetBSD.org 9MAINTAINER= taca@NetBSD.org
11HOMEPAGE= http://www.contao.org/ 10HOMEPAGE= http://www.contao.org/
12COMMENT= Contao Open Source CMS ${CT_VERSION} 11COMMENT= Contao Open Source CMS ${CT_VERSION}
13LICENSE= gnu-lgpl-v3 12LICENSE= gnu-lgpl-v3
14 13
15DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.3.2:../../textproc/php-dom 14DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.3.2:../../textproc/php-dom
16DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.3.2:../../graphics/php-gd 15DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.3.2:../../graphics/php-gd
17DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.3.2:../../converters/php-mbstring 16DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.3.2:../../converters/php-mbstring
18DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.3.2:../../databases/php-mysqli 17DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.3.2:../../databases/php-mysqli
19DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.3.2:../../security/php-mcrypt 18DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.3.2:../../security/php-mcrypt
20DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.3.2:../../net/php-soap 19DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.3.2:../../net/php-soap
21DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.2.7:../../archivers/php-zlib 20DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.2.7:../../archivers/php-zlib
22DEPENDS+= bash>=4.0:../../shells/bash 21DEPENDS+= bash>=4.0:../../shells/bash
23 22
24CT_VERS= 32 23CT_VERS= 32
25USE_TOOLS= bash pax 24USE_TOOLS= bash pax
26NO_BUILD= yes 25NO_BUILD= yes
27 26
28EG_CONFIG= ace.php agents.php constants.php countries.php \ 27EG_CONFIG= ace.php agents.php constants.php countries.php \
29 languages.php tcpdf.php timezones.php \ 28 languages.php tcpdf.php timezones.php \
30 tinyFlash.php tinyMCE.php tinyNews.php 29 tinyFlash.php tinyMCE.php tinyNews.php
31EG_DATA= ${WWW_EG_FILES} system/config files 30EG_DATA= ${WWW_EG_FILES} system/config files
32EG_TEMPLATES= tinymce.css tiny_templates/index.html 31EG_TEMPLATES= tinymce.css tiny_templates/index.html
33WWW_EG_FILES= robots.txt 32WWW_EG_FILES= robots.txt
34RESTRICT_DIRS= system/cache system/logs system/tmp templates files 33RESTRICT_DIRS= system/cache system/logs system/tmp templates files
35 34
36CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf 35CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf
37 36
38.for f in ${EG_CONFIG} 37.for f in ${EG_CONFIG}
39CONF_FILES+= ${CT_EGDIR}/system/config/${f} ${CT_WEBDIR}/system/config/${f} 38CONF_FILES+= ${CT_EGDIR}/system/config/${f} ${CT_WEBDIR}/system/config/${f}
40.endfor 39.endfor
41 40
42MAKE_DIRS+= ${CT_WEBDIR}/files/tiny_templates 41MAKE_DIRS+= ${CT_WEBDIR}/files/tiny_templates
43 42
44REPLACE_BASH= system/bin/minify 43REPLACE_BASH= system/bin/minify
45 44
46.for f in ${EG_TEMPLATES} 45.for f in ${EG_TEMPLATES}
47REQD_FILES+= ${CT_EGDIR}/files/${f} ${CT_WEBDIR}/files/${f} 46REQD_FILES+= ${CT_EGDIR}/files/${f} ${CT_WEBDIR}/files/${f}
48.endfor 47.endfor
49 48
50.for f in ${WWW_EG_FILES} 49.for f in ${WWW_EG_FILES}
51REQD_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f} 50REQD_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f}
52.endfor 51.endfor
53 52
54.for d in ${RESTRICT_DIRS} 53.for d in ${RESTRICT_DIRS}
55OWN_DIRS_PERMS+= ${CT_WEBDIR}/${d} ${APACHE_USER} ${APACHE_GROUP} 0770 54OWN_DIRS_PERMS+= ${CT_WEBDIR}/${d} ${APACHE_USER} ${APACHE_GROUP} 0770
56.endfor 55.endfor
57 56
58REPLACE_INTERPRETER+= php 57REPLACE_INTERPRETER+= php
59REPLACE.php.old= .*php[^ ]* 58REPLACE.php.old= .*php[^ ]*
60REPLACE.php.new= ${PREFIX}/bin/php 59REPLACE.php.new= ${PREFIX}/bin/php
61REPLACE_FILES.php= system/bin/ide_compat 60REPLACE_FILES.php= system/bin/ide_compat
62 61
63SUBST_CLASSES+= conf 62SUBST_CLASSES+= conf
64SUBST_FILES.conf+= ${WRKDIR}/contao.conf 63SUBST_FILES.conf+= ${WRKDIR}/contao.conf
65SUBST_SED.conf+= -e 's|@PREFIX@|${PREFIX:Q}|g' 64SUBST_SED.conf+= -e 's|@PREFIX@|${PREFIX:Q}|g'
66SUBST_SED.conf+= -e 's|@CT_WEBDIR@|${CT_WEBDIR:Q}|g' 65SUBST_SED.conf+= -e 's|@CT_WEBDIR@|${CT_WEBDIR:Q}|g'
67SUBST_STAGE.conf= post-configure 66SUBST_STAGE.conf= post-configure
68 67
69SUBST_CLASSES+= php 68SUBST_CLASSES+= php
70SUBST_FILES.php+= ${WRKSRC}/system/bin/transifex 69SUBST_FILES.php+= ${WRKSRC}/system/bin/transifex
71SUBST_SED.php+= -e "s|\#!/.*php|\#!${PREFIX}/bin/php|" 70SUBST_SED.php+= -e "s|\#!/.*php|\#!${PREFIX}/bin/php|"
72SUBST_STAGE.php= post-configure 71SUBST_STAGE.php= post-configure
73 72
74WWW_FILES= .gitignore .htaccess.default README.md assets contao \ 73WWW_FILES= .gitignore .htaccess.default README.md assets contao \
75 index.php share templates 74 index.php share templates
76WWW_SYSFILES= .htaccess bin config/default.php cron docs helper \ 75WWW_SYSFILES= .htaccess bin config/default.php cron docs helper \
77 initialize.php modules themes 76 initialize.php modules themes
78 77
79INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config 78INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config
80 79
81PKG_GROUPS_VARS+= APACHE_GROUP 80PKG_GROUPS_VARS+= APACHE_GROUP
82PKG_USERS_VARS+= APACHE_USER 81PKG_USERS_VARS+= APACHE_USER
83 82
84pre-configure: 83pre-configure:
85 cd ${WRKSRC} && ${RM} -f assets/css/*.css 84 cd ${WRKSRC} && ${RM} -f assets/css/*.css
86 ${CP} ${FILESDIR}/contao.conf ${WRKDIR} 85 ${CP} ${FILESDIR}/contao.conf ${WRKDIR}
87 86
88pre-install: 87pre-install:
89 cd ${WRKSRC}; ${RM} -fr files/music_academy templates/music_academy.sql 88 cd ${WRKSRC}; ${RM} -fr files/music_academy templates/music_academy.sql
90 ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \; 89 ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;
91 cd ${WRKSRC}/assets && \ 90 cd ${WRKSRC}/assets && \
92 ${FIND} ace html5shiv jquery/ui -type f -exec chmod -x {} \; 91 ${FIND} ace html5shiv jquery/ui -type f -exec chmod -x {} \;
93 92
94do-install: 93do-install:
95 cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR} 94 cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR}
96 cd ${WRKSRC}/system; \ 95 cd ${WRKSRC}/system; \
97 pax -rw ${WWW_SYSFILES} \ 96 pax -rw ${WWW_SYSFILES} \
98 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system 97 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system
99 cd ${WRKSRC}; pax -rw ${EG_DATA} ${DESTDIR}${PREFIX}/${CT_EGDIR} 98 cd ${WRKSRC}; pax -rw ${EG_DATA} ${DESTDIR}${PREFIX}/${CT_EGDIR}
100 ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR} 99 ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR}
101 ${INSTALL_DATA} ${FILESDIR}/README \ 100 ${INSTALL_DATA} ${FILESDIR}/README \
102 ${DESTDIR}${PREFIX}/${CT_DOCDIR} 101 ${DESTDIR}${PREFIX}/${CT_DOCDIR}
103 102
104.include "../../www/contao/Makefile.common" 103.include "../../www/contao/Makefile.common"
105.include "../../lang/php/phpversion.mk" 104.include "../../lang/php/phpversion.mk"
106.include "../../mk/bsd.pkg.mk" 105.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/www/contao32/Attic/distinfo (switch to unified diff)

--- pkgsrc/www/contao32/Attic/distinfo 2014/05/21 16:03:21 1.11
+++ pkgsrc/www/contao32/Attic/distinfo 2014/06/10 03:47:59 1.12
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.11 2014/05/21 16:03:21 taca Exp $ 1$NetBSD: distinfo,v 1.12 2014/06/10 03:47:59 taca Exp $
2 2
3SHA1 (contao/3.2.10.tar.gz) = c50b32bdda40c5540ddc705e31c0eee15216c83c 3SHA1 (contao/3.2.11.tar.gz) = 98d1996f5782f04e58c99eb09f93f3a971c3a180
4RMD160 (contao/3.2.10.tar.gz) = 6003bee086b1c760d80daaf250bdf441f3526040 4RMD160 (contao/3.2.11.tar.gz) = 4b6fd0cb10aceb17c579561913121bbfe78a937e
5Size (contao/3.2.10.tar.gz) = 11070987 bytes 5Size (contao/3.2.11.tar.gz) = 10493191 bytes
6SHA1 (patch-system_bin_sqldump) = 920e6e8e579ae2cbeb84ca6ac74f4b9951a66f5c 6SHA1 (patch-system_bin_sqldump) = 920e6e8e579ae2cbeb84ca6ac74f4b9951a66f5c