Fri Mar 14 02:00:22 2014 UTC ()
Forgot to commit with contao32's update.


(taca)
diff -r1.61 -r1.62 pkgsrc/www/contao/Makefile.common
cvs diff -r1.61 -r1.62 pkgsrc/www/contao/Makefile.common (switch to unified diff)

--- pkgsrc/www/contao/Makefile.common 2014/02/13 14:12:20 1.61
+++ pkgsrc/www/contao/Makefile.common 2014/03/14 02:00:22 1.62
@@ -1,63 +1,63 @@ @@ -1,63 +1,63 @@
1# $NetBSD: Makefile.common,v 1.61 2014/02/13 14:12:20 taca Exp $ 1# $NetBSD: Makefile.common,v 1.62 2014/03/14 02:00:22 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). 7# Contao master site (on GitHub).
8CT_MASTER_SITE= https://github.com/contao/core/archive/ 8CT_MASTER_SITE= https://github.com/contao/core/archive/
9 9
10# current release 10# current release
11CT211_VERSION= 2.11.16 11CT211_VERSION= 2.11.16
12CT32_VERSION= 3.2.7 12CT32_VERSION= 3.2.8
13 13
14CT_VERS?= 211 14CT_VERS?= 211
15 15
16.if ${CT_VERS} == "211" 16.if ${CT_VERS} == "211"
17CT_VERSION= ${CT211_VERSION} 17CT_VERSION= ${CT211_VERSION}
18.elif ${CT_VERS} == "32" 18.elif ${CT_VERS} == "32"
19CT_VERSION= ${CT32_VERSION} 19CT_VERSION= ${CT32_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.if ${CT_VERS} == "211" 24.if ${CT_VERS} == "211"
25CT_FILES= tl_files 25CT_FILES= tl_files
26.else 26.else
27CT_FILES= files 27CT_FILES= files
28FILESDIR= ${.CURDIR}/../../www/contao/files 28FILESDIR= ${.CURDIR}/../../www/contao/files
29.endif 29.endif
30 30
31CT_VER= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/} 31CT_VER= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
32CT_VERBASE= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/} 32CT_VERBASE= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/}
33CT_PKGVER= ${CT_VERSION:S/.RC/rc/} 33CT_PKGVER= ${CT_VERSION:S/.RC/rc/}
34 34
35DIST_SUBDIR?= contao 35DIST_SUBDIR?= contao
36 36
37FILES_SUBST+= PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \ 37FILES_SUBST+= PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \
38 WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q} 38 WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q}
39MESSAGE_SUBST+= CT_VER=${CT_VER} 39MESSAGE_SUBST+= CT_VER=${CT_VER}
40PLIST_SUBST+= CT_DOCDIR=${CT_DOCDIR:Q} CT_EGDIR=${CT_EGDIR:Q} \ 40PLIST_SUBST+= CT_DOCDIR=${CT_DOCDIR:Q} CT_EGDIR=${CT_EGDIR:Q} \
41 CT_WEBDIR=${CT_WEBDIR:Q} 41 CT_WEBDIR=${CT_WEBDIR:Q}
42 42
43WRKSRC?= ${WRKDIR}/core-${CT_VERSION} 43WRKSRC?= ${WRKDIR}/core-${CT_VERSION}
44 44
45PRINT_PLIST_AWK+= /^${CT_WEBDIR:S|/|\\/|g}/ \ 45PRINT_PLIST_AWK+= /^${CT_WEBDIR:S|/|\\/|g}/ \
46 { gsub(/${CT_WEBDIR:S|/|\\/|g}/, "$${CT_WEBDIR}"); \ 46 { gsub(/${CT_WEBDIR:S|/|\\/|g}/, "$${CT_WEBDIR}"); \
47 print; next; } 47 print; next; }
48PRINT_PLIST_AWK+= /^${CT_DOCDIR:S|/|\\/|g}/ \ 48PRINT_PLIST_AWK+= /^${CT_DOCDIR:S|/|\\/|g}/ \
49 { gsub(/${CT_DOCDIR:S|/|\\/|g}/, "$${CT_DOCDIR}"); \ 49 { gsub(/${CT_DOCDIR:S|/|\\/|g}/, "$${CT_DOCDIR}"); \
50 print; next; } 50 print; next; }
51PRINT_PLIST_AWK+= /^${CT_EGDIR:S|/|\\/|g}/ \ 51PRINT_PLIST_AWK+= /^${CT_EGDIR:S|/|\\/|g}/ \
52 { gsub(/${CT_EGDIR:S|/|\\/|g}/, "$${CT_EGDIR}"); \ 52 { gsub(/${CT_EGDIR:S|/|\\/|g}/, "$${CT_EGDIR}"); \
53 print; next; } 53 print; next; }
54 54
55.include "../../mk/bsd.prefs.mk" 55.include "../../mk/bsd.prefs.mk"
56 56
57PKG_SYSCONFSUBDIR?= contao${CT_VER} 57PKG_SYSCONFSUBDIR?= contao${CT_VER}
58 58
59CT_DOCDIR?= share/doc/contao${CT_VER} 59CT_DOCDIR?= share/doc/contao${CT_VER}
60CT_EGDIR?= share/examples/contao${CT_VER} 60CT_EGDIR?= share/examples/contao${CT_VER}
61CT_WEBDIR?= share/contao${CT_VER} 61CT_WEBDIR?= share/contao${CT_VER}
62 62
63BUILD_DEFS+= APACHE_USER CT_DOCDIR CT_EGDIR CT_WEBDIR 63BUILD_DEFS+= APACHE_USER CT_DOCDIR CT_EGDIR CT_WEBDIR