From 5d1b757552292b0a5dc4b898586308df78ff8fc8 Mon Sep 17 00:00:00 2001 From: taca Date: Sat, 28 Nov 2015 06:02:08 +0000 Subject: 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. --- www/contao/Makefile.common | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) (limited to 'www/contao') diff --git a/www/contao/Makefile.common b/www/contao/Makefile.common index e1586bc3e71..4fc2fe18922 100644 --- a/www/contao/Makefile.common +++ b/www/contao/Makefile.common @@ -1,38 +1,14 @@ -# $NetBSD: Makefile.common,v 1.102 2015/11/28 05:45:42 taca Exp $ +# $NetBSD: Makefile.common,v 1.103 2015/11/28 06:02:08 taca Exp $ # # used by www/contao32/Makefile # used by www/contao35/Makefile -# current release -CT32_VERSION= 3.2.21 -CT35_VERSION= 3.5.6 - -CT_VERS?= 35 - -.if ${CT_VERS} == "32" -CT_VERSION= ${CT32_VERSION} -.elif ${CT_VERS} == "35" -CT_VERSION= ${CT35_VERSION} -.else -.error "Illegal version specified: ${CT_VERS}" -.endif - -# Contao master site (on GitHub). -.if ${CT_VERS} == "32" -DIST_SUBDIR?= contao -CT_MASTER_SITE= https://github.com/contao/core/archive/ -WRKSRC?= ${WRKDIR}/core-${CT_VERSION} -.else -CT_MASTER_SITE= https://github.com/contao/core/releases/download/${CT_VERSION}/ -.endif - -CT_FILES= files -FILESDIR= ${.CURDIR}/../../www/contao/files - 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/} +FILESDIR= ${.CURDIR}/../../www/contao/files + 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} -- cgit v1.2.3