Fri Oct 25 11:14:10 2013 UTC ()
Don't mechanically install .htaccess.  It accidently block glogal setting
of httpd.conf.

Bump PKGREVISION.


(taca)
diff -r1.11 -r1.12 pkgsrc/www/contao211/Makefile
diff -r1.7 -r1.8 pkgsrc/www/contao211/PLIST
cvs diff -r1.11 -r1.12 pkgsrc/www/contao211/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/contao211/Attic/Makefile 2013/08/30 15:46:25 1.11
+++ pkgsrc/www/contao211/Attic/Makefile 2013/10/25 11:14:10 1.12
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.11 2013/08/30 15:46:25 taca Exp $ 1# $NetBSD: Makefile,v 1.12 2013/10/25 11:14:10 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= 1
6CATEGORIES= www 7CATEGORIES= www
7MASTER_SITES= ${CT_MASTER_SITE} 8MASTER_SITES= ${CT_MASTER_SITE}
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_VERBASE} 12COMMENT= Contao Open Source CMS ${CT_VERBASE}
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
@@ -22,53 +23,52 @@ CT_VERS= 211 @@ -22,53 +23,52 @@ CT_VERS= 211
22USE_TOOLS= pax 23USE_TOOLS= pax
23NO_BUILD= yes 24NO_BUILD= yes
24 25
25EG_CONFIG= agents.php codeMirror.php countries.php \ 26EG_CONFIG= agents.php codeMirror.php countries.php \
26 languages.php tcpdf.php timezones.php tinyFlash.php \ 27 languages.php tcpdf.php timezones.php tinyFlash.php \
27 tinyMCE.php tinyNews.php 28 tinyMCE.php tinyNews.php
28EG_DATA= ${WWW_EG_FILES} system/config tl_files 29EG_DATA= ${WWW_EG_FILES} system/config tl_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/html system/logs system/scripts system/tmp \ 32RESTRICT_DIRS= system/html system/logs system/scripts system/tmp \
32 templates tl_files 33 templates tl_files
33 34
34CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf 35CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf
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
41MAKE_DIRS+= ${CT_WEBDIR}/tl_files/tiny_templates 41MAKE_DIRS+= ${CT_WEBDIR}/tl_files/tiny_templates
42 42
43.for f in ${EG_TEMPLATES} 43.for f in ${EG_TEMPLATES}
44REQD_FILES+= ${CT_EGDIR}/tl_files/${f} ${CT_WEBDIR}/tl_files/${f} 44REQD_FILES+= ${CT_EGDIR}/tl_files/${f} ${CT_WEBDIR}/tl_files/${f}
45.endfor 45.endfor
46 46
47.for f in ${WWW_EG_FILES} 47.for f in ${WWW_EG_FILES}
48REQD_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f} 48REQD_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f}
49.endfor 49.endfor
50 50
51.for d in ${RESTRICT_DIRS} 51.for d in ${RESTRICT_DIRS}
52OWN_DIRS_PERMS+= ${CT_WEBDIR}/${d} ${APACHE_USER} ${APACHE_GROUP} 0770 52OWN_DIRS_PERMS+= ${CT_WEBDIR}/${d} ${APACHE_USER} ${APACHE_GROUP} 0770
53.endfor 53.endfor
54 54
55SUBST_CLASSES+= conf 55SUBST_CLASSES+= conf
56SUBST_FILES.conf+= ${WRKDIR}/contao.conf 56SUBST_FILES.conf+= ${WRKDIR}/contao.conf
57SUBST_SED.conf+= -e 's|@PREFIX@|${PREFIX:Q}|g' 57SUBST_SED.conf+= -e 's|@PREFIX@|${PREFIX:Q}|g'
58SUBST_SED.conf+= -e 's|@CT_WEBDIR@|${CT_WEBDIR:Q}|g' 58SUBST_SED.conf+= -e 's|@CT_WEBDIR@|${CT_WEBDIR:Q}|g'
59SUBST_STAGE.conf= post-configure 59SUBST_STAGE.conf= post-configure
60 60
61WWW_FILES= CHANGELOG.md GPL.txt LGPL.txt README.md \ 61WWW_FILES= .htaccess.default CHANGELOG.md GPL.txt LGPL.txt README.md \
62 contao cron.php index.php plugins share.php templates \ 62 contao cron.php index.php plugins share.php templates \
63 typolight 63 typolight
64WWW_SYSFILES= config/.htaccess config/config.php constants.php contao.css \ 64WWW_SYSFILES= config/.htaccess config/config.php constants.php contao.css \
65 drivers functions.php html initialize.php interface.php \ 65 drivers functions.php html initialize.php interface.php \
66 libraries logs/.htaccess mbstring.php modules \ 66 libraries logs/.htaccess mbstring.php modules \
67 scripts/index.html themes tmp/.htaccess utf8_lookup.php 67 scripts/index.html themes tmp/.htaccess utf8_lookup.php
68 68
69INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config 69INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config
70 70
71PKG_GROUPS_VARS+= APACHE_GROUP 71PKG_GROUPS_VARS+= APACHE_GROUP
72PKG_USERS_VARS+= APACHE_USER 72PKG_USERS_VARS+= APACHE_USER
73 73
74pre-configure: 74pre-configure:
@@ -80,22 +80,20 @@ pre-install: @@ -80,22 +80,20 @@ pre-install:
80 templates/music_academy.sql tl_files/music_academy 80 templates/music_academy.sql tl_files/music_academy
81 ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \; 81 ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;
82 ${FIND} ${WRKSRC}/plugins/tinyMCE -type f -exec ${CHMOD} -x {} \; 82 ${FIND} ${WRKSRC}/plugins/tinyMCE -type f -exec ${CHMOD} -x {} \;
83 83
84do-install: 84do-install:
85 cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR} 85 cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR}
86 cd ${WRKSRC}/system; \ 86 cd ${WRKSRC}/system; \
87 pax -rw ${WWW_SYSFILES} \ 87 pax -rw ${WWW_SYSFILES} \
88 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system 88 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system
89 ${INSTALL_DATA} ${WRKSRC}/templates/.htaccess \ 89 ${INSTALL_DATA} ${WRKSRC}/templates/.htaccess \
90 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/templates 90 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/templates
91 cd ${WRKSRC}; pax -rw ${EG_DATA} ${DESTDIR}${PREFIX}/${CT_EGDIR} 91 cd ${WRKSRC}; pax -rw ${EG_DATA} ${DESTDIR}${PREFIX}/${CT_EGDIR}
92 rm -f ${DESTDIR}${PREFIX}/${CT_EGDIR}/system/config/.htaccess 92 rm -f ${DESTDIR}${PREFIX}/${CT_EGDIR}/system/config/.htaccess
93 ${INSTALL_DATA} ${WRKSRC}/.htaccess.default \ 
94 ${DESTDIR}${PREFIX}/${CT_EGDIR}/htaccess.default 
95 ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR} 93 ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR}
96 ${INSTALL_DATA} ${FILESDIR}/README \ 94 ${INSTALL_DATA} ${FILESDIR}/README \
97 ${DESTDIR}${PREFIX}/${CT_DOCDIR} 95 ${DESTDIR}${PREFIX}/${CT_DOCDIR}
98 96
99.include "../../www/contao/Makefile.common" 97.include "../../www/contao/Makefile.common"
100.include "../../lang/php/phpversion.mk" 98.include "../../lang/php/phpversion.mk"
101.include "../../mk/bsd.pkg.mk" 99.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/www/contao211/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/www/contao211/Attic/PLIST 2013/08/22 17:10:04 1.7
+++ pkgsrc/www/contao211/Attic/PLIST 2013/10/25 11:14:10 1.8
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1@comment $NetBSD: PLIST,v 1.7 2013/08/22 17:10:04 taca Exp $ 1@comment $NetBSD: PLIST,v 1.8 2013/10/25 11:14:10 taca Exp $
 2${CT_WEBDIR}/.htaccess.default
2${CT_WEBDIR}/CHANGELOG.md 3${CT_WEBDIR}/CHANGELOG.md
3${CT_WEBDIR}/GPL.txt 4${CT_WEBDIR}/GPL.txt
4${CT_WEBDIR}/LGPL.txt 5${CT_WEBDIR}/LGPL.txt
5${CT_WEBDIR}/README.md 6${CT_WEBDIR}/README.md
6${CT_WEBDIR}/contao/contao-uncompressed.js 7${CT_WEBDIR}/contao/contao-uncompressed.js
7${CT_WEBDIR}/contao/contao.js 8${CT_WEBDIR}/contao/contao.js
8${CT_WEBDIR}/contao/file.php 9${CT_WEBDIR}/contao/file.php
9${CT_WEBDIR}/contao/files.php 10${CT_WEBDIR}/contao/files.php
10${CT_WEBDIR}/contao/help.php 11${CT_WEBDIR}/contao/help.php
11${CT_WEBDIR}/contao/index.php 12${CT_WEBDIR}/contao/index.php
12${CT_WEBDIR}/contao/install.php 13${CT_WEBDIR}/contao/install.php
13${CT_WEBDIR}/contao/main.php 14${CT_WEBDIR}/contao/main.php
14${CT_WEBDIR}/contao/page.php 15${CT_WEBDIR}/contao/page.php
@@ -2080,27 +2081,26 @@ ${CT_WEBDIR}/system/themes/default/src/m @@ -2080,27 +2081,26 @@ ${CT_WEBDIR}/system/themes/default/src/m
2080${CT_WEBDIR}/system/themes/default/src/page.css 2081${CT_WEBDIR}/system/themes/default/src/page.css
2081${CT_WEBDIR}/system/themes/default/src/popup.css 2082${CT_WEBDIR}/system/themes/default/src/popup.css
2082${CT_WEBDIR}/system/themes/default/src/switch.css 2083${CT_WEBDIR}/system/themes/default/src/switch.css
2083${CT_WEBDIR}/system/themes/default/switch.css 2084${CT_WEBDIR}/system/themes/default/switch.css
2084${CT_WEBDIR}/system/themes/tinymce.css 2085${CT_WEBDIR}/system/themes/tinymce.css
2085${CT_WEBDIR}/system/tmp/.htaccess 2086${CT_WEBDIR}/system/tmp/.htaccess
2086${CT_WEBDIR}/system/utf8_lookup.php 2087${CT_WEBDIR}/system/utf8_lookup.php
2087${CT_WEBDIR}/templates/.htaccess 2088${CT_WEBDIR}/templates/.htaccess
2088${CT_WEBDIR}/typolight/index.php 2089${CT_WEBDIR}/typolight/index.php
2089${CT_WEBDIR}/typolight/install.php 2090${CT_WEBDIR}/typolight/install.php
2090${CT_WEBDIR}/typolight/main.php 2091${CT_WEBDIR}/typolight/main.php
2091${CT_DOCDIR}/README 2092${CT_DOCDIR}/README
2092${CT_EGDIR}/contao.conf 2093${CT_EGDIR}/contao.conf
2093${CT_EGDIR}/htaccess.default 
2094${CT_EGDIR}/robots.txt 2094${CT_EGDIR}/robots.txt
2095${CT_EGDIR}/system/config/agents.php 2095${CT_EGDIR}/system/config/agents.php
2096${CT_EGDIR}/system/config/codeMirror.php 2096${CT_EGDIR}/system/config/codeMirror.php
2097${CT_EGDIR}/system/config/config.php 2097${CT_EGDIR}/system/config/config.php
2098${CT_EGDIR}/system/config/countries.php 2098${CT_EGDIR}/system/config/countries.php
2099${CT_EGDIR}/system/config/languages.php 2099${CT_EGDIR}/system/config/languages.php
2100${CT_EGDIR}/system/config/tcpdf.php 2100${CT_EGDIR}/system/config/tcpdf.php
2101${CT_EGDIR}/system/config/timezones.php 2101${CT_EGDIR}/system/config/timezones.php
2102${CT_EGDIR}/system/config/tinyFlash.php 2102${CT_EGDIR}/system/config/tinyFlash.php
2103${CT_EGDIR}/system/config/tinyMCE.php 2103${CT_EGDIR}/system/config/tinyMCE.php
2104${CT_EGDIR}/system/config/tinyNews.php 2104${CT_EGDIR}/system/config/tinyNews.php
2105${CT_EGDIR}/tl_files/tiny_templates/index.html 2105${CT_EGDIR}/tl_files/tiny_templates/index.html
2106${CT_EGDIR}/tl_files/tinymce.css 2106${CT_EGDIR}/tl_files/tinymce.css