diff options
author | taca <taca@pkgsrc.org> | 2013-10-25 11:14:10 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2013-10-25 11:14:10 +0000 |
commit | db9415535c4e320210afafb525fa8635c01ef832 (patch) | |
tree | d1f847b38402b1bf3928d97d4164057a13288334 /www | |
parent | 5bbf39e11fffb2cda080291885eeaf00272acc11 (diff) | |
download | pkgsrc-db9415535c4e320210afafb525fa8635c01ef832.tar.gz |
Don't mechanically install .htaccess. It accidently block glogal setting
of httpd.conf.
Bump PKGREVISION.
Diffstat (limited to 'www')
-rw-r--r-- | www/contao211/Makefile | 8 | ||||
-rw-r--r-- | www/contao211/PLIST | 4 | ||||
-rw-r--r-- | www/contao31/Makefile | 9 | ||||
-rw-r--r-- | www/contao31/PLIST | 4 |
4 files changed, 11 insertions, 14 deletions
diff --git a/www/contao211/Makefile b/www/contao211/Makefile index da61d805468..9e487e76da4 100644 --- a/www/contao211/Makefile +++ b/www/contao211/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2013/08/30 15:46:25 taca Exp $ +# $NetBSD: Makefile,v 1.12 2013/10/25 11:14:10 taca Exp $ # DISTNAME= ${CT_VERSION} PKGNAME= contao${CT_VER}-${CT_PKGVER} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= ${CT_MASTER_SITE} @@ -32,7 +33,6 @@ RESTRICT_DIRS= system/html system/logs system/scripts system/tmp \ templates tl_files CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf -CONF_FILES+= ${CT_EGDIR}/htaccess.default ${CT_WEBDIR}/.htaccess .for f in ${EG_CONFIG} CONF_FILES+= ${CT_EGDIR}/system/config/${f} ${CT_WEBDIR}/system/config/${f} @@ -58,7 +58,7 @@ SUBST_SED.conf+= -e 's|@PREFIX@|${PREFIX:Q}|g' SUBST_SED.conf+= -e 's|@CT_WEBDIR@|${CT_WEBDIR:Q}|g' SUBST_STAGE.conf= post-configure -WWW_FILES= CHANGELOG.md GPL.txt LGPL.txt README.md \ +WWW_FILES= .htaccess.default CHANGELOG.md GPL.txt LGPL.txt README.md \ contao cron.php index.php plugins share.php templates \ typolight WWW_SYSFILES= config/.htaccess config/config.php constants.php contao.css \ @@ -90,8 +90,6 @@ do-install: ${DESTDIR}${PREFIX}/${CT_WEBDIR}/templates cd ${WRKSRC}; pax -rw ${EG_DATA} ${DESTDIR}${PREFIX}/${CT_EGDIR} rm -f ${DESTDIR}${PREFIX}/${CT_EGDIR}/system/config/.htaccess - ${INSTALL_DATA} ${WRKSRC}/.htaccess.default \ - ${DESTDIR}${PREFIX}/${CT_EGDIR}/htaccess.default ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR} ${INSTALL_DATA} ${FILESDIR}/README \ ${DESTDIR}${PREFIX}/${CT_DOCDIR} diff --git a/www/contao211/PLIST b/www/contao211/PLIST index 4fcdc59d428..a474767708b 100644 --- a/www/contao211/PLIST +++ b/www/contao211/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.7 2013/08/22 17:10:04 taca Exp $ +@comment $NetBSD: PLIST,v 1.8 2013/10/25 11:14:10 taca Exp $ +${CT_WEBDIR}/.htaccess.default ${CT_WEBDIR}/CHANGELOG.md ${CT_WEBDIR}/GPL.txt ${CT_WEBDIR}/LGPL.txt @@ -2090,7 +2091,6 @@ ${CT_WEBDIR}/typolight/install.php ${CT_WEBDIR}/typolight/main.php ${CT_DOCDIR}/README ${CT_EGDIR}/contao.conf -${CT_EGDIR}/htaccess.default ${CT_EGDIR}/robots.txt ${CT_EGDIR}/system/config/agents.php ${CT_EGDIR}/system/config/codeMirror.php diff --git a/www/contao31/Makefile b/www/contao31/Makefile index b2d261cb568..d57fda2f865 100644 --- a/www/contao31/Makefile +++ b/www/contao31/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2013/09/30 10:04:34 taca Exp $ +# $NetBSD: Makefile,v 1.9 2013/10/25 11:14:44 taca Exp $ # DISTNAME= ${CT_VERSION} PKGNAME= contao${CT_VER}-${CT_PKGVER} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= ${CT_MASTER_SITE} @@ -31,7 +32,6 @@ WWW_EG_FILES= robots.txt RESTRICT_DIRS= system/cache system/logs system/tmp templates files CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf -CONF_FILES+= ${CT_EGDIR}/htaccess.default ${CT_WEBDIR}/.htaccess .for f in ${EG_CONFIG} CONF_FILES+= ${CT_EGDIR}/system/config/${f} ${CT_WEBDIR}/system/config/${f} @@ -64,7 +64,8 @@ SUBST_FILES.php+= ${WRKSRC}/system/bin/transifex SUBST_SED.php+= -e "s|\#!/.*php|\#!${PREFIX}/bin/php|" SUBST_STAGE.php= post-configure -WWW_FILES= .gitignore README.md assets contao index.php share templates +WWW_FILES= .gitignore .htaccess.default README.md assets contao \ + index.php share templates WWW_SYSFILES= .htaccess bin config/default.php cron docs helper \ initialize.php modules themes @@ -88,8 +89,6 @@ do-install: pax -rw ${WWW_SYSFILES} \ ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system cd ${WRKSRC}; pax -rw ${EG_DATA} ${DESTDIR}${PREFIX}/${CT_EGDIR} - ${INSTALL_DATA} ${WRKSRC}/.htaccess.default \ - ${DESTDIR}${PREFIX}/${CT_EGDIR}/htaccess.default ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR} ${INSTALL_DATA} ${FILESDIR}/README \ ${DESTDIR}${PREFIX}/${CT_DOCDIR} diff --git a/www/contao31/PLIST b/www/contao31/PLIST index 8bc801d6e29..c24ef345496 100644 --- a/www/contao31/PLIST +++ b/www/contao31/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.7 2013/10/15 14:33:28 taca Exp $ +@comment $NetBSD: PLIST,v 1.8 2013/10/25 11:14:44 taca Exp $ ${CT_WEBDIR}/.gitignore +${CT_WEBDIR}/.htaccess.default ${CT_WEBDIR}/README.md ${CT_WEBDIR}/assets/ace/1.0.01/ace.js ${CT_WEBDIR}/assets/ace/1.0.01/ext-searchbox.js @@ -3698,7 +3699,6 @@ ${CT_DOCDIR}/README ${CT_EGDIR}/contao.conf ${CT_EGDIR}/files/tiny_templates/index.html ${CT_EGDIR}/files/tinymce.css -${CT_EGDIR}/htaccess.default ${CT_EGDIR}/robots.txt ${CT_EGDIR}/system/config/ace.php ${CT_EGDIR}/system/config/agents.php |