Changes for supporing Contao 3.3.

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

2 files changed, 23 insertions, 11 deletions

diff --git a/www/contao/Makefile.common b/www/contao/Makefile.common
index 7dcab7d57ef..6cbace5abf4 100644
--- a/www/contao/Makefile.common
+++ b/www/contao/Makefile.common
@@ -1,26 +1,38 @@
-# $NetBSD: Makefile.common,v 1.65 2014/05/21 16:03:21 taca Exp $
+# $NetBSD: Makefile.common,v 1.66 2014/05/27 15:17:32 taca Exp $
 #
 # used by www/contao/Makefile.example"
 # used by www/contao211/Makefile
 # used by www/contao32/Makefile
 
-# Contao master site (on GitHub).
-CT_MASTER_SITE=	https://github.com/contao/core/archive/
-
 # current release
 CT211_VERSION=	2.11.17
 CT32_VERSION=	3.2.10
+CT33_VERSION=	3.3.0
 
-CT_VERS?=	211
+CT_VERS?=	32
 
 .if ${CT_VERS} == "211"
 CT_VERSION=	${CT211_VERSION}
 .elif ${CT_VERS} == "32"
 CT_VERSION=	${CT32_VERSION}
+.elif ${CT_VERS} == "33"
+CT_VERSION=	${CT33_VERSION}
 .else
 .error "Illegal version specified: ${CT_VERS}"
 .endif
 
+# Contao master site (on GitHub).
+.if ${CT_VERS} == "211" || ${CT_VERS} == "32"
+DIST_SUBDIR?=	contao
+CT_MASTER_SITE=	https://github.com/contao/core/archive/
+WRKSRC?=	${WRKDIR}/core-${CT_VERSION}
+.else
+FETCH_USING=	wget
+CT_MASTER_SITE=	https://github.com/contao/core/releases/download/${CT_VERSION}/
+WRKSRC?=	${WRKDIR}/contao
+EXTRACT_DIR=	${WRKSRC}
+.endif
+
 .if ${CT_VERS} == "211"
 CT_FILES=	tl_files
 .else
@@ -32,16 +44,12 @@ CT_VER=		${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
 CT_VERBASE=	${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/}
 CT_PKGVER=	${CT_VERSION:S/.RC/rc/}
 
-DIST_SUBDIR?=	contao
-
 FILES_SUBST+=	PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \
 		WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q}
 MESSAGE_SUBST+=	CT_VER=${CT_VER}
 PLIST_SUBST+=	CT_DOCDIR=${CT_DOCDIR:Q} CT_EGDIR=${CT_EGDIR:Q} \
 		CT_WEBDIR=${CT_WEBDIR:Q}
 
-WRKSRC?=	${WRKDIR}/core-${CT_VERSION}
-
 PRINT_PLIST_AWK+=	/^${CT_WEBDIR:S|/|\\/|g}/ \
 			{ gsub(/${CT_WEBDIR:S|/|\\/|g}/, "$${CT_WEBDIR}"); \
 			print; next; }
diff --git a/www/contao/Makefile.example b/www/contao/Makefile.example
index 823b0e872e8..7a6842a30ff 100644
--- a/www/contao/Makefile.example
+++ b/www/contao/Makefile.example
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.example,v 1.16 2013/12/16 01:49:06 taca Exp $
+# $NetBSD: Makefile.example,v 1.17 2014/05/27 15:17:32 taca Exp $
 #
 # used by www/contao211-example/Makefile
 # used by www/contao32-example/Makefile
 #
 
-DISTNAME=	${CT_VERSION}
+DISTNAME?=	contao-${CT_PKGVER}
 PKGNAME=	contao${CT_VER}-example-${CT_PKGVER}
 CATEGORIES=	www
 MASTER_SITES=	${CT_MASTER_SITE}
@@ -26,9 +26,13 @@ WWW_FILE=	templates/music_academy.sql
 
 .include "../../www/contao/Makefile.common"
 
+.if ${CT_VERS} == "211" || ${CT_VERS} == "32"
 .for f in ${WWW_EG_FILES} ${WWW_FILE}
 EXTRACT_ELEMENTS+=	core-${CT_VERSION}/${f}
 .endfor
+.else
+EXTRACT_ELEMENTS=	${WWW_EG_FILES} ${WWW_FILE}
+.endif
 
 PKG_GROUPS_VARS+=	APACHE_GROUP
 PKG_USERS_VARS+=	APACHE_USER