Tue May 27 15:17:32 2014 UTC ()
Changes for supporing Contao 3.3.

* Add CT33_VERSION.
* Conditional CT_MASTER_SITE, CT_MASTER_SITE and so on.


(taca)
diff -r1.65 -r1.66 pkgsrc/www/contao/Makefile.common
diff -r1.16 -r1.17 pkgsrc/www/contao/Makefile.example
cvs diff -r1.65 -r1.66 pkgsrc/www/contao/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/contao/Makefile.common 2014/05/21 16:03:21 1.65
+++ pkgsrc/www/contao/Makefile.common 2014/05/27 15:17:32 1.66
@@ -1,57 +1,65 @@ @@ -1,57 +1,65 @@
1# $NetBSD: Makefile.common,v 1.65 2014/05/21 16:03:21 taca Exp $ 1# $NetBSD: Makefile.common,v 1.66 2014/05/27 15:17:32 taca Exp $
2# 2#
3# used by www/contao/Makefile.example" 3# used by www/contao/Makefile.example"
4# used by www/contao211/Makefile 4# used by www/contao211/Makefile
5# used by www/contao32/Makefile 5# used by www/contao32/Makefile
6 6
7# Contao master site (on GitHub). 
8CT_MASTER_SITE= https://github.com/contao/core/archive/ 
9 
10# current release 7# current release
11CT211_VERSION= 2.11.17 8CT211_VERSION= 2.11.17
12CT32_VERSION= 3.2.10 9CT32_VERSION= 3.2.10
 10CT33_VERSION= 3.3.0
13 11
14CT_VERS?= 211 12CT_VERS?= 32
15 13
16.if ${CT_VERS} == "211" 14.if ${CT_VERS} == "211"
17CT_VERSION= ${CT211_VERSION} 15CT_VERSION= ${CT211_VERSION}
18.elif ${CT_VERS} == "32" 16.elif ${CT_VERS} == "32"
19CT_VERSION= ${CT32_VERSION} 17CT_VERSION= ${CT32_VERSION}
 18.elif ${CT_VERS} == "33"
 19CT_VERSION= ${CT33_VERSION}
20.else 20.else
21.error "Illegal version specified: ${CT_VERS}" 21.error "Illegal version specified: ${CT_VERS}"
22.endif 22.endif
23 23
 24# Contao master site (on GitHub).
 25.if ${CT_VERS} == "211" || ${CT_VERS} == "32"
 26DIST_SUBDIR?= contao
 27CT_MASTER_SITE= https://github.com/contao/core/archive/
 28WRKSRC?= ${WRKDIR}/core-${CT_VERSION}
 29.else
 30FETCH_USING= wget
 31CT_MASTER_SITE= https://github.com/contao/core/releases/download/${CT_VERSION}/
 32WRKSRC?= ${WRKDIR}/contao
 33EXTRACT_DIR= ${WRKSRC}
 34.endif
 35
24.if ${CT_VERS} == "211" 36.if ${CT_VERS} == "211"
25CT_FILES= tl_files 37CT_FILES= tl_files
26.else 38.else
27CT_FILES= files 39CT_FILES= files
28FILESDIR= ${.CURDIR}/../../www/contao/files 40FILESDIR= ${.CURDIR}/../../www/contao/files
29.endif 41.endif
30 42
31CT_VER= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/} 43CT_VER= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
32CT_VERBASE= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/} 44CT_VERBASE= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/}
33CT_PKGVER= ${CT_VERSION:S/.RC/rc/} 45CT_PKGVER= ${CT_VERSION:S/.RC/rc/}
34 46
35DIST_SUBDIR?= contao 
36 
37FILES_SUBST+= PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \ 47FILES_SUBST+= PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \
38 WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q} 48 WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q}
39MESSAGE_SUBST+= CT_VER=${CT_VER} 49MESSAGE_SUBST+= CT_VER=${CT_VER}
40PLIST_SUBST+= CT_DOCDIR=${CT_DOCDIR:Q} CT_EGDIR=${CT_EGDIR:Q} \ 50PLIST_SUBST+= CT_DOCDIR=${CT_DOCDIR:Q} CT_EGDIR=${CT_EGDIR:Q} \
41 CT_WEBDIR=${CT_WEBDIR:Q} 51 CT_WEBDIR=${CT_WEBDIR:Q}
42 52
43WRKSRC?= ${WRKDIR}/core-${CT_VERSION} 
44 
45PRINT_PLIST_AWK+= /^${CT_WEBDIR:S|/|\\/|g}/ \ 53PRINT_PLIST_AWK+= /^${CT_WEBDIR:S|/|\\/|g}/ \
46 { gsub(/${CT_WEBDIR:S|/|\\/|g}/, "$${CT_WEBDIR}"); \ 54 { gsub(/${CT_WEBDIR:S|/|\\/|g}/, "$${CT_WEBDIR}"); \
47 print; next; } 55 print; next; }
48PRINT_PLIST_AWK+= /^${CT_DOCDIR:S|/|\\/|g}/ \ 56PRINT_PLIST_AWK+= /^${CT_DOCDIR:S|/|\\/|g}/ \
49 { gsub(/${CT_DOCDIR:S|/|\\/|g}/, "$${CT_DOCDIR}"); \ 57 { gsub(/${CT_DOCDIR:S|/|\\/|g}/, "$${CT_DOCDIR}"); \
50 print; next; } 58 print; next; }
51PRINT_PLIST_AWK+= /^${CT_EGDIR:S|/|\\/|g}/ \ 59PRINT_PLIST_AWK+= /^${CT_EGDIR:S|/|\\/|g}/ \
52 { gsub(/${CT_EGDIR:S|/|\\/|g}/, "$${CT_EGDIR}"); \ 60 { gsub(/${CT_EGDIR:S|/|\\/|g}/, "$${CT_EGDIR}"); \
53 print; next; } 61 print; next; }
54 62
55.include "../../mk/bsd.prefs.mk" 63.include "../../mk/bsd.prefs.mk"
56 64
57PKG_SYSCONFSUBDIR?= contao${CT_VER} 65PKG_SYSCONFSUBDIR?= contao${CT_VER}
cvs diff -r1.16 -r1.17 pkgsrc/www/contao/Attic/Makefile.example (expand / switch to unified diff)

--- pkgsrc/www/contao/Attic/Makefile.example 2013/12/16 01:49:06 1.16
+++ pkgsrc/www/contao/Attic/Makefile.example 2014/05/27 15:17:32 1.17
@@ -1,42 +1,46 @@ @@ -1,42 +1,46 @@
1# $NetBSD: Makefile.example,v 1.16 2013/12/16 01:49:06 taca Exp $ 1# $NetBSD: Makefile.example,v 1.17 2014/05/27 15:17:32 taca Exp $
2# 2#
3# used by www/contao211-example/Makefile 3# used by www/contao211-example/Makefile
4# used by www/contao32-example/Makefile 4# used by www/contao32-example/Makefile
5# 5#
6 6
7DISTNAME= ${CT_VERSION} 7DISTNAME?= contao-${CT_PKGVER}
8PKGNAME= contao${CT_VER}-example-${CT_PKGVER} 8PKGNAME= contao${CT_VER}-example-${CT_PKGVER}
9CATEGORIES= www 9CATEGORIES= www
10MASTER_SITES= ${CT_MASTER_SITE} 10MASTER_SITES= ${CT_MASTER_SITE}
11 11
12MAINTAINER= taca@NetBSD.org 12MAINTAINER= taca@NetBSD.org
13HOMEPAGE= http://www.contao.org/ 13HOMEPAGE= http://www.contao.org/
14COMMENT= Sample site data for Contao Open Source CMS ${CT_VERBASE} 14COMMENT= Sample site data for Contao Open Source CMS ${CT_VERBASE}
15 15
16DEPENDS+= contao${CT_VER}>=${CT_PKGVER}:../../www/contao${CT_VER} 16DEPENDS+= contao${CT_VER}>=${CT_PKGVER}:../../www/contao${CT_VER}
17 17
18DISTINFO_FILE= ${.CURDIR}/../../www/contao${CT_VER}/distinfo 18DISTINFO_FILE= ${.CURDIR}/../../www/contao${CT_VER}/distinfo
19 19
20USE_TOOLS= pax 20USE_TOOLS= pax
21NO_BUILD= yes 21NO_BUILD= yes
22NO_CONFIGURE= yes 22NO_CONFIGURE= yes
23 23
24WWW_EG_FILES= ${CT_FILES}/music_academy 24WWW_EG_FILES= ${CT_FILES}/music_academy
25WWW_FILE= templates/music_academy.sql 25WWW_FILE= templates/music_academy.sql
26 26
27.include "../../www/contao/Makefile.common" 27.include "../../www/contao/Makefile.common"
28 28
 29.if ${CT_VERS} == "211" || ${CT_VERS} == "32"
29.for f in ${WWW_EG_FILES} ${WWW_FILE} 30.for f in ${WWW_EG_FILES} ${WWW_FILE}
30EXTRACT_ELEMENTS+= core-${CT_VERSION}/${f} 31EXTRACT_ELEMENTS+= core-${CT_VERSION}/${f}
31.endfor 32.endfor
 33.else
 34EXTRACT_ELEMENTS= ${WWW_EG_FILES} ${WWW_FILE}
 35.endif
32 36
33PKG_GROUPS_VARS+= APACHE_GROUP 37PKG_GROUPS_VARS+= APACHE_GROUP
34PKG_USERS_VARS+= APACHE_USER 38PKG_USERS_VARS+= APACHE_USER
35 39
36INSTALLATION_DIRS+= ${CT_EGDIR} ${CT_WEBDIR}/templates 40INSTALLATION_DIRS+= ${CT_EGDIR} ${CT_WEBDIR}/templates
37 41
38do-install: 42do-install:
39 cd ${WRKSRC}; \ 43 cd ${WRKSRC}; \
40 pax -rw -pm ${WWW_EG_FILES} ${DESTDIR}${PREFIX}/${CT_EGDIR} 44 pax -rw -pm ${WWW_EG_FILES} ${DESTDIR}${PREFIX}/${CT_EGDIR}
41 cd ${WRKSRC}; ${INSTALL_DATA} ${WWW_FILE} \ 45 cd ${WRKSRC}; ${INSTALL_DATA} ${WWW_FILE} \
42 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/templates 46 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/templates