Sun Nov 27 16:06:32 2016 UTC ()
Backout previous change.  It is not correct one.


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

--- pkgsrc/www/contao42/Attic/Makefile 2016/11/27 15:41:10 1.7
+++ pkgsrc/www/contao42/Attic/Makefile 2016/11/27 16:06:32 1.8
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.7 2016/11/27 15:41:10 taca Exp $ 1# $NetBSD: Makefile,v 1.8 2016/11/27 16:06:32 taca Exp $
2# 2#
3 3
4DISTNAME= contao-${CT_PKGVER} 4DISTNAME= contao-${CT_PKGVER}
5PKGNAME= ${PHP_PKG_PREFIX}-contao${CT_VER}-${CT_VERSION} 5PKGNAME= ${PHP_PKG_PREFIX}-contao${CT_VER}-${CT_VERSION}
6PKGREVISION= 1 
7CATEGORIES= www 6CATEGORIES= www
8MASTER_SITES= ${MASTER_SITE_GITHUB:=contao/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=contao/}
9GITHUB_PROJECT= standard-edition 8GITHUB_PROJECT= standard-edition
10GITHUB_RELEASE= ${CT_VERSION} 9GITHUB_RELEASE= ${CT_VERSION}
11 10
12MAINTAINER= taca@NetBSD.org 11MAINTAINER= taca@NetBSD.org
13HOMEPAGE= https://contao.org/ 12HOMEPAGE= https://contao.org/
14COMMENT= Contao Open Source CMS ${CT_VERSION} 13COMMENT= Contao Open Source CMS ${CT_VERSION}
15LICENSE= gnu-lgpl-v3 14LICENSE= gnu-lgpl-v3
16 15
17DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.4.0:../../textproc/php-dom 16DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.4.0:../../textproc/php-dom
18DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd 17DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd
19DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.4.0:../../converters/php-mbstring 18DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.4.0:../../converters/php-mbstring
@@ -21,27 +20,27 @@ DEPENDS+= ${PHP_PKG_PREFIX}-mysqli>=5.4. @@ -21,27 +20,27 @@ DEPENDS+= ${PHP_PKG_PREFIX}-mysqli>=5.4.
21DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.4.0:../../security/php-mcrypt 20DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.4.0:../../security/php-mcrypt
22DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.4.0:../../net/php-soap 21DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.4.0:../../net/php-soap
23DEPENDS+= ${PHP_PKG_PREFIX}-intl>=5.4.0:../../textproc/php-intl 22DEPENDS+= ${PHP_PKG_PREFIX}-intl>=5.4.0:../../textproc/php-intl
24DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.4.0:../../www/php-curl 23DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.4.0:../../www/php-curl
25DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.4.0:../../archivers/php-zlib 24DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.4.0:../../archivers/php-zlib
26DEPENDS+= bash>=4.0:../../shells/bash 25DEPENDS+= bash>=4.0:../../shells/bash
27 26
28CT_VERSION= 4.2.5 27CT_VERSION= 4.2.5
29USE_TOOLS= bash pax 28USE_TOOLS= bash pax
30NO_BUILD= yes 29NO_BUILD= yes
31 30
32EG_CONFIG= app/config/config.yml app/config/config_dev.yml \ 31EG_CONFIG= app/config/config.yml app/config/config_dev.yml \
33 app/config/config_prod.yml app/config/config_test.yml \ 32 app/config/config_prod.yml app/config/config_test.yml \
34 app/config/parameters.yml app/config/routing.yml \ 33 app/config/parameters.yml.dist app/config/routing.yml \
35 app/config/routing_dev.yml app/config/security.yml 34 app/config/routing_dev.yml app/config/security.yml
36EG_DATA= app/config 35EG_DATA= app/config
37 36
38RESTRICT_DIRS= app/config app/cache app/logs 37RESTRICT_DIRS= app/config app/cache app/logs
39 38
40CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf 39CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf
41 40
42.for f in ${EG_CONFIG} 41.for f in ${EG_CONFIG}
43CONF_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f} 42CONF_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f}
44.endfor 43.endfor
45 44
46.for d in ${RESTRICT_DIRS} 45.for d in ${RESTRICT_DIRS}
47OWN_DIRS_PERMS+= ${CT_WEBDIR}/${d} ${APACHE_USER} ${APACHE_GROUP} 0770 46OWN_DIRS_PERMS+= ${CT_WEBDIR}/${d} ${APACHE_USER} ${APACHE_GROUP} 0770
@@ -69,27 +68,25 @@ SUBST_SED.conf+= -e 's|@CT_WEBDIR @@ -69,27 +68,25 @@ SUBST_SED.conf+= -e 's|@CT_WEBDIR
69SUBST_STAGE.conf= post-configure 68SUBST_STAGE.conf= post-configure
70 69
71WWW_FILES= CHANGELOG.md README.md app/AppCache.php app/AppKernel.php \ 70WWW_FILES= CHANGELOG.md README.md app/AppCache.php app/AppKernel.php \
72 app/autoload.php app/bootstrap.php.cache app/cache \ 71 app/autoload.php app/bootstrap.php.cache app/cache \
73 app/console app/logs assets build.xml composer.json \ 72 app/console app/logs assets build.xml composer.json \
74 composer.lock vendor web 73 composer.lock vendor web
75 74
76INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/app/config 75INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/app/config
77 76
78PKG_GROUPS_VARS+= APACHE_GROUP 77PKG_GROUPS_VARS+= APACHE_GROUP
79PKG_USERS_VARS+= APACHE_USER 78PKG_USERS_VARS+= APACHE_USER
80 79
81pre-configure: 80pre-configure:
82 ${MV} ${WRKSRC}/app/config/parameters.yml.dist \ 
83 ${WRKSRC}/app/config/parameters.yml 
84 ${CP} ${FILESDIR}/contao.conf ${WRKDIR} 81 ${CP} ${FILESDIR}/contao.conf ${WRKDIR}
85 82
86do-install: 83do-install:
87 cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR} 84 cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR}
88 cd ${WRKSRC}; pax -rw ${EG_DATA} ${DESTDIR}${PREFIX}/${CT_EGDIR} 85 cd ${WRKSRC}; pax -rw ${EG_DATA} ${DESTDIR}${PREFIX}/${CT_EGDIR}
89 ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR} 86 ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR}
90 ${INSTALL_DATA} ${FILESDIR}/README \ 87 ${INSTALL_DATA} ${FILESDIR}/README \
91 ${DESTDIR}${PREFIX}/${CT_DOCDIR} 88 ${DESTDIR}${PREFIX}/${CT_DOCDIR}
92 89
93.include "../../www/contao/Makefile.common" 90.include "../../www/contao/Makefile.common"
94.include "../../lang/php/phpversion.mk" 91.include "../../lang/php/phpversion.mk"
95.include "../../mk/bsd.pkg.mk" 92.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/www/contao42/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/www/contao42/Attic/PLIST 2016/11/27 15:41:10 1.6
+++ pkgsrc/www/contao42/Attic/PLIST 2016/11/27 16:06:32 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2016/11/27 15:41:10 taca Exp $ 1@comment $NetBSD: PLIST,v 1.7 2016/11/27 16:06:32 taca Exp $
2${CT_WEBDIR}/CHANGELOG.md 2${CT_WEBDIR}/CHANGELOG.md
3${CT_WEBDIR}/README.md 3${CT_WEBDIR}/README.md
4${CT_WEBDIR}/app/AppCache.php 4${CT_WEBDIR}/app/AppCache.php
5${CT_WEBDIR}/app/AppKernel.php 5${CT_WEBDIR}/app/AppKernel.php
6${CT_WEBDIR}/app/autoload.php 6${CT_WEBDIR}/app/autoload.php
7${CT_WEBDIR}/app/bootstrap.php.cache 7${CT_WEBDIR}/app/bootstrap.php.cache
8${CT_WEBDIR}/app/cache/.gitignore 8${CT_WEBDIR}/app/cache/.gitignore
9${CT_WEBDIR}/app/console 9${CT_WEBDIR}/app/console
10${CT_WEBDIR}/app/logs/.gitignore 10${CT_WEBDIR}/app/logs/.gitignore
11${CT_WEBDIR}/assets/ace/README.md 11${CT_WEBDIR}/assets/ace/README.md
12${CT_WEBDIR}/assets/ace/composer.json 12${CT_WEBDIR}/assets/ace/composer.json
13${CT_WEBDIR}/assets/ace/js/ace.js 13${CT_WEBDIR}/assets/ace/js/ace.js
14${CT_WEBDIR}/assets/ace/js/ext-searchbox.js 14${CT_WEBDIR}/assets/ace/js/ext-searchbox.js
@@ -7852,18 +7852,18 @@ ${CT_WEBDIR}/vendor/twig/twig/lib/Twig/T @@ -7852,18 +7852,18 @@ ${CT_WEBDIR}/vendor/twig/twig/lib/Twig/T
7852${CT_WEBDIR}/vendor/twig/twig/lib/Twig/TokenStream.php 7852${CT_WEBDIR}/vendor/twig/twig/lib/Twig/TokenStream.php
7853${CT_WEBDIR}/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php 7853${CT_WEBDIR}/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
7854${CT_WEBDIR}/vendor/twig/twig/lib/Twig/Util/TemplateDirIterator.php 7854${CT_WEBDIR}/vendor/twig/twig/lib/Twig/Util/TemplateDirIterator.php
7855${CT_WEBDIR}/vendor/twig/twig/phpunit.xml.dist 7855${CT_WEBDIR}/vendor/twig/twig/phpunit.xml.dist
7856${CT_WEBDIR}/web/.htaccess 7856${CT_WEBDIR}/web/.htaccess
7857${CT_WEBDIR}/web/app.php 7857${CT_WEBDIR}/web/app.php
7858${CT_WEBDIR}/web/app_dev.php 7858${CT_WEBDIR}/web/app_dev.php
7859${CT_WEBDIR}/web/install.php 7859${CT_WEBDIR}/web/install.php
7860${CT_DOCDIR}/README 7860${CT_DOCDIR}/README
7861${CT_EGDIR}/app/config/config.yml 7861${CT_EGDIR}/app/config/config.yml
7862${CT_EGDIR}/app/config/config_dev.yml 7862${CT_EGDIR}/app/config/config_dev.yml
7863${CT_EGDIR}/app/config/config_prod.yml 7863${CT_EGDIR}/app/config/config_prod.yml
7864${CT_EGDIR}/app/config/config_test.yml 7864${CT_EGDIR}/app/config/config_test.yml
7865${CT_EGDIR}/app/config/parameters.yml 7865${CT_EGDIR}/app/config/parameters.yml.dist
7866${CT_EGDIR}/app/config/routing.yml 7866${CT_EGDIR}/app/config/routing.yml
7867${CT_EGDIR}/app/config/routing_dev.yml 7867${CT_EGDIR}/app/config/routing_dev.yml
7868${CT_EGDIR}/app/config/security.yml 7868${CT_EGDIR}/app/config/security.yml
7869${CT_EGDIR}/contao.conf 7869${CT_EGDIR}/contao.conf