Sun Jul 18 14:46:44 2010 UTC ()
* Install sample .htaccess file as configuration file.  It was silently
  discarded before.
* Don't handle templates/.htaccess as configuration file.

Bump PKGREVISION.


(taca)
diff -r1.1.1.1 -r1.2 pkgsrc/www/contao29/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/www/contao29/PLIST
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/contao29/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/contao29/Attic/Makefile 2010/07/05 14:45:21 1.1.1.1
+++ pkgsrc/www/contao29/Attic/Makefile 2010/07/18 14:46:44 1.2
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.1.1.1 2010/07/05 14:45:21 taca Exp $ 1# $NetBSD: Makefile,v 1.2 2010/07/18 14:46:44 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:=typolight/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=typolight/}
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 12COMMENT= Contao Open Source CMS
12LICENSE= gnu-lgpl-v3 13LICENSE= gnu-lgpl-v3
13 14
14DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd 15DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
15DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring 16DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring
16DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql 17DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql
17DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt 18DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt
18DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap 19DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap
@@ -27,30 +28,28 @@ EG_FILES= system/config/config.php syste @@ -27,30 +28,28 @@ EG_FILES= system/config/config.php syste
27 system/config/dcaconfig.php system/config/editArea.php \ 28 system/config/dcaconfig.php system/config/editArea.php \
28 system/config/fancyUpload.php system/config/initconfig.php \ 29 system/config/fancyUpload.php system/config/initconfig.php \
29 system/config/langconfig.php system/config/languages.php \ 30 system/config/langconfig.php system/config/languages.php \
30 system/config/tcpdf.php system/config/timezones.php \ 31 system/config/tcpdf.php system/config/timezones.php \
31 system/config/tinyFlash.php system/config/tinyMCE.php \ 32 system/config/tinyFlash.php system/config/tinyMCE.php \
32 system/config/tinyNews.php 33 system/config/tinyNews.php
33TMPL_FILES= tl_files/tinymce.css tl_files/tiny_templates/index.html 34TMPL_FILES= tl_files/tinymce.css tl_files/tiny_templates/index.html
34WWW_EG_FILES= basic.css print.css robots.txt 35WWW_EG_FILES= basic.css print.css robots.txt
35 36
36CONF_FILES_PERMS+= ${CT_EGDIR}/system/config/localconfig.php \ 37CONF_FILES_PERMS+= ${CT_EGDIR}/system/config/localconfig.php \
37 ${CT_WEBDIR}/system/config/localconfig.php \ 38 ${CT_WEBDIR}/system/config/localconfig.php \
38 ${APACHE_USER} ${APACHE_GROUP} 0600 39 ${APACHE_USER} ${APACHE_GROUP} 0600
39 40
40CONF_FILES+= ${CT_EGDIR}/contao.conf \ 41CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf \
41 ${PKG_SYSCONFDIR}/contao.conf \ 42 ${CT_EGDIR}/htaccess.default ${CT_WEBDIR}/.htaccess
42 ${CT_EGDIR}/templates-htaccess \ 
43 ${CT_WEBDIR}/templates/.htaccess 
44 43
45.for f in ${EG_FILES} 44.for f in ${EG_FILES}
46CONF_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f} 45CONF_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f}
47.endfor 46.endfor
48 47
49.for f in ${TMPL_FILES} 48.for f in ${TMPL_FILES}
50REQD_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f} 49REQD_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f}
51.endfor 50.endfor
52 51
53.for f in ${WWW_EG_FILES} 52.for f in ${WWW_EG_FILES}
54CONF_FILES_PERMS+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f} \ 53CONF_FILES_PERMS+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f} \
55 ${APACHE_USER} ${APACHE_GROUP} 0644 54 ${APACHE_USER} ${APACHE_GROUP} 0644
56.endfor 55.endfor
@@ -84,40 +83,41 @@ OWN_DIRS_PERMS+= \ @@ -84,40 +83,41 @@ OWN_DIRS_PERMS+= \
84 ${CT_WEBDIR}/system/themes ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \ 83 ${CT_WEBDIR}/system/themes ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
85 ${CT_WEBDIR}/system/tmp ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \ 84 ${CT_WEBDIR}/system/tmp ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \
86 ${CT_WEBDIR}/templates ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \ 85 ${CT_WEBDIR}/templates ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \
87 ${CT_WEBDIR}/tl_files ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \ 86 ${CT_WEBDIR}/tl_files ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \
88 ${CT_WEBDIR}/tl_files/tiny_templates \ 87 ${CT_WEBDIR}/tl_files/tiny_templates \
89 ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 88 ${REAL_ROOT_USER} ${APACHE_GROUP} 0770
90 89
91PKG_GROUPS_VARS+= APACHE_GROUP 90PKG_GROUPS_VARS+= APACHE_GROUP
92PKG_USERS_VARS+= APACHE_USER 91PKG_USERS_VARS+= APACHE_USER
93 92
94.include "../../www/contao/options.mk" 93.include "../../www/contao/options.mk"
95 94
96pre-configure: 95pre-configure:
97 ${MV} ${WRKSRC}/templates/.htaccess ${WRKDIR}/templates-htaccess 
98 ${CP} ${FILESDIR}/contao.conf ${WRKDIR} 96 ${CP} ${FILESDIR}/contao.conf ${WRKDIR}
99 97
100pre-install: 98pre-install:
101 cd ${WRKSRC}; ${RM} -rf music_academy.css \ 99 cd ${WRKSRC}; ${RM} -rf music_academy.css \
102 templates/music_academy.sql tl_files/music_academy 100 templates/music_academy.sql tl_files/music_academy
103 ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \; 101 ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;
104 102
105do-install: 103do-install:
106 cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR} 104 cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR}
107 cd ${WRKSRC}/system; \ 105 cd ${WRKSRC}/system; \
108 pax -rw ${WWW_SYSFILES} \ 106 pax -rw ${WWW_SYSFILES} \
109 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system; \ 107 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system; \
110 ${INSTALL_DATA} config/.htaccess \ 108 ${INSTALL_DATA} config/.htaccess \
111 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system/config 109 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system/config
 110 ${INSTALL_DATA} ${WRKSRC}/templates/.htaccess \
 111 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/templates
112 cd ${WRKSRC}; pax -rw ${EG_DATA} ${DESTDIR}${PREFIX}/${CT_EGDIR} 112 cd ${WRKSRC}; pax -rw ${EG_DATA} ${DESTDIR}${PREFIX}/${CT_EGDIR}
113 rm -f ${DESTDIR}${PREFIX}/${CT_EGDIR}/system/config/.htaccess 113 rm -f ${DESTDIR}${PREFIX}/${CT_EGDIR}/system/config/.htaccess
 114 ${INSTALL_DATA} ${WRKSRC}/.htaccess.default \
 115 ${DESTDIR}${PREFIX}/${CT_EGDIR}/htaccess.default
114 ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR} 116 ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR}
115 ${INSTALL_DATA} ${WRKDIR}/templates-htaccess \ 
116 ${DESTDIR}${PREFIX}/${CT_EGDIR} 
117 ${INSTALL_DATA} ${FILESDIR}/README \ 117 ${INSTALL_DATA} ${FILESDIR}/README \
118 ${DESTDIR}${PREFIX}/${CT_DOCDIR} 118 ${DESTDIR}${PREFIX}/${CT_DOCDIR}
119 119
120.include "Makefile.version" 120.include "Makefile.version"
121.include "../../www/contao/Makefile.common" 121.include "../../www/contao/Makefile.common"
122.include "../../lang/php/phpversion.mk" 122.include "../../lang/php/phpversion.mk"
123.include "../../mk/bsd.pkg.mk" 123.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/contao29/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/www/contao29/Attic/PLIST 2010/07/05 14:45:22 1.1.1.1
+++ pkgsrc/www/contao29/Attic/PLIST 2010/07/18 14:46:44 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2010/07/05 14:45:22 taca Exp $ 1@comment $NetBSD: PLIST,v 1.2 2010/07/18 14:46:44 taca Exp $
2${CT_WEBDIR}/CHANGELOG.txt 2${CT_WEBDIR}/CHANGELOG.txt
3${CT_WEBDIR}/GPL.txt 3${CT_WEBDIR}/GPL.txt
4${CT_WEBDIR}/INSTALL.txt 4${CT_WEBDIR}/INSTALL.txt
5${CT_WEBDIR}/LGPL.txt 5${CT_WEBDIR}/LGPL.txt
6${CT_WEBDIR}/contao/contao.js 6${CT_WEBDIR}/contao/contao.js
7${CT_WEBDIR}/contao/contao.js.gz 7${CT_WEBDIR}/contao/contao.js.gz
8${CT_WEBDIR}/contao/contao_src.js 8${CT_WEBDIR}/contao/contao_src.js
9${CT_WEBDIR}/contao/file.php 9${CT_WEBDIR}/contao/file.php
10${CT_WEBDIR}/contao/files.php 10${CT_WEBDIR}/contao/files.php
11${CT_WEBDIR}/contao/help.php 11${CT_WEBDIR}/contao/help.php
12${CT_WEBDIR}/contao/index.php 12${CT_WEBDIR}/contao/index.php
13${CT_WEBDIR}/contao/install.php 13${CT_WEBDIR}/contao/install.php
14${CT_WEBDIR}/contao/main.php 14${CT_WEBDIR}/contao/main.php
@@ -1971,33 +1971,33 @@ ${CT_WEBDIR}/system/themes/default/src/m @@ -1971,33 +1971,33 @@ ${CT_WEBDIR}/system/themes/default/src/m
1971${CT_WEBDIR}/system/themes/default/src/page.css 1971${CT_WEBDIR}/system/themes/default/src/page.css
1972${CT_WEBDIR}/system/themes/default/src/popup.css 1972${CT_WEBDIR}/system/themes/default/src/popup.css
1973${CT_WEBDIR}/system/themes/default/src/switch.css 1973${CT_WEBDIR}/system/themes/default/src/switch.css
1974${CT_WEBDIR}/system/themes/default/switch.css 1974${CT_WEBDIR}/system/themes/default/switch.css
1975${CT_WEBDIR}/system/themes/tinymce.css 1975${CT_WEBDIR}/system/themes/tinymce.css
1976${CT_WEBDIR}/system/utf8_lookup.php 1976${CT_WEBDIR}/system/utf8_lookup.php
1977${CT_WEBDIR}/system/tmp/.htaccess 1977${CT_WEBDIR}/system/tmp/.htaccess
1978${CT_WEBDIR}/typolight/index.php 1978${CT_WEBDIR}/typolight/index.php
1979${CT_WEBDIR}/typolight/install.php 1979${CT_WEBDIR}/typolight/install.php
1980${CT_WEBDIR}/typolight/main.php 1980${CT_WEBDIR}/typolight/main.php
1981${CT_DOCDIR}/README 1981${CT_DOCDIR}/README
1982${CT_EGDIR}/basic.css 1982${CT_EGDIR}/basic.css
1983${CT_EGDIR}/contao.conf 1983${CT_EGDIR}/contao.conf
 1984${CT_EGDIR}/htaccess.default
1984${CT_EGDIR}/print.css 1985${CT_EGDIR}/print.css
1985${CT_EGDIR}/robots.txt 1986${CT_EGDIR}/robots.txt
1986${CT_EGDIR}/system/config/config.php 1987${CT_EGDIR}/system/config/config.php
1987${CT_EGDIR}/system/config/countries.php 1988${CT_EGDIR}/system/config/countries.php
1988${CT_EGDIR}/system/config/dcaconfig.php 1989${CT_EGDIR}/system/config/dcaconfig.php
1989${CT_EGDIR}/system/config/editArea.php 1990${CT_EGDIR}/system/config/editArea.php
1990${CT_EGDIR}/system/config/fancyUpload.php 1991${CT_EGDIR}/system/config/fancyUpload.php
1991${CT_EGDIR}/system/config/initconfig.php 1992${CT_EGDIR}/system/config/initconfig.php
1992${CT_EGDIR}/system/config/langconfig.php 1993${CT_EGDIR}/system/config/langconfig.php
1993${CT_EGDIR}/system/config/languages.php 1994${CT_EGDIR}/system/config/languages.php
1994${CT_EGDIR}/system/config/localconfig.php 1995${CT_EGDIR}/system/config/localconfig.php
1995${CT_EGDIR}/system/config/tcpdf.php 1996${CT_EGDIR}/system/config/tcpdf.php
1996${CT_EGDIR}/system/config/timezones.php 1997${CT_EGDIR}/system/config/timezones.php
1997${CT_EGDIR}/system/config/tinyFlash.php 1998${CT_EGDIR}/system/config/tinyFlash.php
1998${CT_EGDIR}/system/config/tinyMCE.php 1999${CT_EGDIR}/system/config/tinyMCE.php
1999${CT_EGDIR}/system/config/tinyNews.php 2000${CT_EGDIR}/system/config/tinyNews.php
2000${CT_EGDIR}/templates-htaccess 
2001${CT_EGDIR}/tl_files/tiny_templates/index.html 2001${CT_EGDIR}/tl_files/tiny_templates/index.html
2002${CT_EGDIR}/tl_files/tinymce.css 2002${CT_EGDIR}/tl_files/tinymce.css
2003${CT_EGDIR}/contao.conf 2003${CT_EGDIR}/contao.conf