Sat Nov 28 06:02:08 2015 UTC ()
Clean up www/contao*:

o Do not set version in contao/Makefile.common but in each Makefile of
  contao?? package.
o Utilize mk/fetch/github.mk.
o Remove unused CT_FILES.


(taca)
diff -r1.102 -r1.103 pkgsrc/www/contao/Makefile.common
diff -r1.9 -r1.10 pkgsrc/www/contao32/Makefile
diff -r1.3 -r1.4 pkgsrc/www/contao35/Makefile
cvs diff -r1.102 -r1.103 pkgsrc/www/contao/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/contao/Makefile.common 2015/11/28 05:45:42 1.102
+++ pkgsrc/www/contao/Makefile.common 2015/11/28 06:02:08 1.103
@@ -1,48 +1,24 @@ @@ -1,48 +1,24 @@
1# $NetBSD: Makefile.common,v 1.102 2015/11/28 05:45:42 taca Exp $ 1# $NetBSD: Makefile.common,v 1.103 2015/11/28 06:02:08 taca Exp $
2# 2#
3# used by www/contao32/Makefile 3# used by www/contao32/Makefile
4# used by www/contao35/Makefile 4# used by www/contao35/Makefile
5 5
6# current release 
7CT32_VERSION= 3.2.21 
8CT35_VERSION= 3.5.6 
9 
10CT_VERS?= 35 
11 
12.if ${CT_VERS} == "32" 
13CT_VERSION= ${CT32_VERSION} 
14.elif ${CT_VERS} == "35" 
15CT_VERSION= ${CT35_VERSION} 
16.else 
17.error "Illegal version specified: ${CT_VERS}" 
18.endif 
19 
20# Contao master site (on GitHub). 
21.if ${CT_VERS} == "32" 
22DIST_SUBDIR?= contao 
23CT_MASTER_SITE= https://github.com/contao/core/archive/ 
24WRKSRC?= ${WRKDIR}/core-${CT_VERSION} 
25.else 
26CT_MASTER_SITE= https://github.com/contao/core/releases/download/${CT_VERSION}/ 
27.endif 
28 
29CT_FILES= files 
30FILESDIR= ${.CURDIR}/../../www/contao/files 
31 
32CT_VER= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/} 6CT_VER= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
33CT_VERBASE= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/} 7CT_VERBASE= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/}
34CT_PKGVER= ${CT_VERSION:S/.RC/rc/} 8CT_PKGVER= ${CT_VERSION:S/.RC/rc/}
35 9
 10FILESDIR= ${.CURDIR}/../../www/contao/files
 11
36FILES_SUBST+= PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \ 12FILES_SUBST+= PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \
37 WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q} 13 WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q}
38MESSAGE_SUBST+= CT_VER=${CT_VER} 14MESSAGE_SUBST+= CT_VER=${CT_VER}
39PLIST_SUBST+= CT_DOCDIR=${CT_DOCDIR:Q} CT_EGDIR=${CT_EGDIR:Q} \ 15PLIST_SUBST+= CT_DOCDIR=${CT_DOCDIR:Q} CT_EGDIR=${CT_EGDIR:Q} \
40 CT_WEBDIR=${CT_WEBDIR:Q} 16 CT_WEBDIR=${CT_WEBDIR:Q}
41 17
42PRINT_PLIST_AWK+= /^${CT_WEBDIR:S|/|\\/|g}/ \ 18PRINT_PLIST_AWK+= /^${CT_WEBDIR:S|/|\\/|g}/ \
43 { gsub(/${CT_WEBDIR:S|/|\\/|g}/, "$${CT_WEBDIR}"); \ 19 { gsub(/${CT_WEBDIR:S|/|\\/|g}/, "$${CT_WEBDIR}"); \
44 print; next; } 20 print; next; }
45PRINT_PLIST_AWK+= /^${CT_DOCDIR:S|/|\\/|g}/ \ 21PRINT_PLIST_AWK+= /^${CT_DOCDIR:S|/|\\/|g}/ \
46 { gsub(/${CT_DOCDIR:S|/|\\/|g}/, "$${CT_DOCDIR}"); \ 22 { gsub(/${CT_DOCDIR:S|/|\\/|g}/, "$${CT_DOCDIR}"); \
47 print; next; } 23 print; next; }
48PRINT_PLIST_AWK+= /^${CT_EGDIR:S|/|\\/|g}/ \ 24PRINT_PLIST_AWK+= /^${CT_EGDIR:S|/|\\/|g}/ \
cvs diff -r1.9 -r1.10 pkgsrc/www/contao32/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/contao32/Attic/Makefile 2015/02/01 04:49:39 1.9
+++ pkgsrc/www/contao32/Attic/Makefile 2015/11/28 06:02:08 1.10
@@ -1,36 +1,39 @@ @@ -1,36 +1,39 @@
1# $NetBSD: Makefile,v 1.9 2015/02/01 04:49:39 taca Exp $ 1# $NetBSD: Makefile,v 1.10 2015/11/28 06:02:08 taca Exp $
2# 2#
3 3
4DISTNAME= ${CT_VERSION} 4DISTNAME= ${CT_VERSION}
5PKGNAME= contao${CT_VER}-${CT_PKGVER} 5PKGNAME= contao${CT_VER}-${CT_PKGVER}
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= ${CT_MASTER_SITE} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=contao/}
 8GITHUB_PROJECT= core
 9GITHUB_TAG= ${CT_VERSION}
 10DIST_SUBDIR= contao
8 11
9MAINTAINER= taca@NetBSD.org 12MAINTAINER= taca@NetBSD.org
10HOMEPAGE= http://www.contao.org/ 13HOMEPAGE= http://www.contao.org/
11COMMENT= Contao Open Source CMS ${CT_VERSION} 14COMMENT= Contao Open Source CMS ${CT_VERSION}
12LICENSE= gnu-lgpl-v3 15LICENSE= gnu-lgpl-v3
13 16
14DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.3.2:../../textproc/php-dom 17DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.3.2:../../textproc/php-dom
15DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.3.2:../../graphics/php-gd 18DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.3.2:../../graphics/php-gd
16DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.3.2:../../converters/php-mbstring 19DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.3.2:../../converters/php-mbstring
17DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.3.2:../../databases/php-mysqli 20DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.3.2:../../databases/php-mysqli
18DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.3.2:../../security/php-mcrypt 21DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.3.2:../../security/php-mcrypt
19DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.3.2:../../net/php-soap 22DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.3.2:../../net/php-soap
20DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.2.7:../../archivers/php-zlib 23DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.2.7:../../archivers/php-zlib
21DEPENDS+= bash>=4.0:../../shells/bash 24DEPENDS+= bash>=4.0:../../shells/bash
22 25
23CT_VERS= 32 26CT_VERSION= 3.2.21
24USE_TOOLS= bash pax 27USE_TOOLS= bash pax
25NO_BUILD= yes 28NO_BUILD= yes
26 29
27EG_CONFIG= ace.php agents.php constants.php countries.php \ 30EG_CONFIG= ace.php agents.php constants.php countries.php \
28 languages.php tcpdf.php timezones.php \ 31 languages.php tcpdf.php timezones.php \
29 tinyFlash.php tinyMCE.php tinyNews.php 32 tinyFlash.php tinyMCE.php tinyNews.php
30EG_DATA= ${WWW_EG_FILES} system/config files 33EG_DATA= ${WWW_EG_FILES} system/config files
31EG_TEMPLATES= tinymce.css tiny_templates/index.html 34EG_TEMPLATES= tinymce.css tiny_templates/index.html
32WWW_EG_FILES= robots.txt 35WWW_EG_FILES= robots.txt
33RESTRICT_DIRS= system/config system/cache system/logs system/tmp templates \ 36RESTRICT_DIRS= system/config system/cache system/logs system/tmp templates \
34 files 37 files
35 38
36CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf 39CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf
cvs diff -r1.3 -r1.4 pkgsrc/www/contao35/Makefile (expand / switch to unified diff)

--- pkgsrc/www/contao35/Makefile 2015/10/12 05:47:19 1.3
+++ pkgsrc/www/contao35/Makefile 2015/11/28 06:02:08 1.4
@@ -1,37 +1,39 @@ @@ -1,37 +1,39 @@
1# $NetBSD: Makefile,v 1.3 2015/10/12 05:47:19 taca Exp $ 1# $NetBSD: Makefile,v 1.4 2015/11/28 06:02:08 taca Exp $
2# 2#
3 3
4DISTNAME= contao-${CT_PKGVER} 4DISTNAME= contao-${CT_PKGVER}
5PKGNAME= contao${CT_VER}-${CT_PKGVER} 5PKGNAME= contao${CT_VER}-${CT_PKGVER}
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= ${CT_MASTER_SITE} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=contao/}
 8GITHUB_PROJECT= core
 9GITHUB_RELEASE= ${CT_VERSION}
8 10
9MAINTAINER= taca@NetBSD.org 11MAINTAINER= taca@NetBSD.org
10HOMEPAGE= http://www.contao.org/ 12HOMEPAGE= http://www.contao.org/
11COMMENT= Contao Open Source CMS ${CT_VERSION} 13COMMENT= Contao Open Source CMS ${CT_VERSION}
12LICENSE= gnu-lgpl-v3 14LICENSE= gnu-lgpl-v3
13 15
14DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.4.0:../../textproc/php-dom 16DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.4.0:../../textproc/php-dom
15DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd 17DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd
16DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.4.0:../../converters/php-mbstring 18DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.4.0:../../converters/php-mbstring
17DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.4.0:../../databases/php-mysqli 19DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.4.0:../../databases/php-mysqli
18DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.4.0:../../security/php-mcrypt 20DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.4.0:../../security/php-mcrypt
19DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.4.0:../../net/php-soap 21DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.4.0:../../net/php-soap
20DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.4.0:../../www/php-curl 22DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.4.0:../../www/php-curl
21DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.4.0:../../archivers/php-zlib 23DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.4.0:../../archivers/php-zlib
22DEPENDS+= bash>=4.0:../../shells/bash 24DEPENDS+= bash>=4.0:../../shells/bash
23 25
24CT_VERS= 35 26CT_VERSION= 3.5.6
25USE_TOOLS= bash pax 27USE_TOOLS= bash pax
26NO_BUILD= yes 28NO_BUILD= yes
27 29
28EG_CONFIG= ace.php agents.php constants.php countries.php \ 30EG_CONFIG= ace.php agents.php constants.php countries.php \
29 languages.php mimetypes.php tcpdf.php timezones.php \ 31 languages.php mimetypes.php tcpdf.php timezones.php \
30 tinyFlash.php tinyMCE.php tinyNews.php 32 tinyFlash.php tinyMCE.php tinyNews.php
31EG_DATA= ${WWW_EG_FILES} system/config files 33EG_DATA= ${WWW_EG_FILES} system/config files
32EG_TEMPLATES= tinymce.css tiny_templates/index.html 34EG_TEMPLATES= tinymce.css tiny_templates/index.html
33WWW_EG_FILES= robots.txt 35WWW_EG_FILES= robots.txt
34RESTRICT_DIRS= system/config system/cache system/logs system/tmp templates \ 36RESTRICT_DIRS= system/config system/cache system/logs system/tmp templates \
35 files 37 files
36 38
37CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf 39CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf