Fri Aug 30 15:46:25 2013 UTC ()
Contao project has switched download site from SourceForge.net to GitHub.
So, change primary download download.contao.org which redirects to GitHub.

No functional change should be made.


(taca)
diff -r1.39 -r1.40 pkgsrc/www/contao/Makefile.common
diff -r1.10 -r1.11 pkgsrc/www/contao/Makefile.example
diff -r1.10 -r1.11 pkgsrc/www/contao211/Makefile
diff -r1.16 -r1.17 pkgsrc/www/contao211/distinfo
diff -r1.29 -r1.30 pkgsrc/www/contao211-translations/Makefile
diff -r1.10 -r1.11 pkgsrc/www/contao30/Makefile
diff -r1.8 -r1.9 pkgsrc/www/contao30/distinfo
diff -r1.5 -r1.6 pkgsrc/www/contao31/Makefile
diff -r1.3 -r1.4 pkgsrc/www/contao31/distinfo
cvs diff -r1.39 -r1.40 pkgsrc/www/contao/Makefile.common (expand / switch to unified diff)

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

--- pkgsrc/www/contao/Attic/Makefile.example 2013/04/02 15:27:58 1.10
+++ pkgsrc/www/contao/Attic/Makefile.example 2013/08/30 15:46:25 1.11
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile.example,v 1.10 2013/04/02 15:27:58 taca Exp $ 1# $NetBSD: Makefile.example,v 1.11 2013/08/30 15:46:25 taca Exp $
2# 2#
3# used by www/contao211-example/Makefile 3# used by www/contao211-example/Makefile
4# used by www/contao30-example/Makefile 4# used by www/contao30-example/Makefile
5# 5#
6 6
7DISTNAME= contao-${CT_VERSION} 7DISTNAME= ${CT_VERSION}
8PKGNAME= contao${CT_VER}-example-${CT_PKGVER} 8PKGNAME= contao${CT_VER}-example-${CT_PKGVER}
9CATEGORIES= www 9CATEGORIES= www
10MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=contao/} 10MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=contao/}
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
cvs diff -r1.10 -r1.11 pkgsrc/www/contao211/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/contao211/Attic/Makefile 2013/08/22 17:10:04 1.10
+++ pkgsrc/www/contao211/Attic/Makefile 2013/08/30 15:46:25 1.11
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.10 2013/08/22 17:10:04 taca Exp $ 1# $NetBSD: Makefile,v 1.11 2013/08/30 15:46:25 taca Exp $
2# 2#
3 3
4DISTNAME= contao-${CT_VERSION} 4DISTNAME= ${CT_VERSION}
5PKGNAME= contao${CT_VER}-${CT_PKGVER} 5PKGNAME= contao${CT_VER}-${CT_PKGVER}
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=contao/} 7MASTER_SITES= ${CT_MASTER_SITE}
8DIST_SUBDIR= ${CT_DIST_SUBDIR} 
9 8
10MAINTAINER= taca@NetBSD.org 9MAINTAINER= taca@NetBSD.org
11HOMEPAGE= http://www.contao.org/ 10HOMEPAGE= http://www.contao.org/
12COMMENT= Contao Open Source CMS ${CT_VERBASE} 11COMMENT= Contao Open Source CMS ${CT_VERBASE}
13LICENSE= gnu-lgpl-v3 12LICENSE= gnu-lgpl-v3
14 13
15DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom 14DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom
16DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd 15DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
17DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring 16DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring
18DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.2.0:../../databases/php-mysqli 17DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.2.0:../../databases/php-mysqli
19DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt 18DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt
20DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap 19DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap
21 20
cvs diff -r1.16 -r1.17 pkgsrc/www/contao211/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/contao211/Attic/distinfo 2013/08/22 17:10:04 1.16
+++ pkgsrc/www/contao211/Attic/distinfo 2013/08/30 15:46:25 1.17
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.16 2013/08/22 17:10:04 taca Exp $ 1$NetBSD: distinfo,v 1.17 2013/08/30 15:46:25 taca Exp $
2 2
3SHA1 (contao-2.11.12.tar.gz) = e3602c1ecc9266a186fb55825a8bc7001547e3a4 3SHA1 (contao/2.11.12.tar.gz) = 2a9d50a3a545ef1a1788680ed3002ce81829b5ab
4RMD160 (contao-2.11.12.tar.gz) = d3f74ae0c5390e8fa8faa0b97a05897752265bdf 4RMD160 (contao/2.11.12.tar.gz) = 15fac9aa8f82455edcf5d0e863af6d96a6f79638
5Size (contao-2.11.12.tar.gz) = 5354775 bytes 5Size (contao/2.11.12.tar.gz) = 5354849 bytes
6SHA1 (patch-system_initialize.php) = 109f381bef4bae32617549709601eb2a30bbb01a 6SHA1 (patch-system_initialize.php) = 109f381bef4bae32617549709601eb2a30bbb01a
cvs diff -r1.29 -r1.30 pkgsrc/www/contao211-translations/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/contao211-translations/Attic/Makefile 2013/08/30 15:43:05 1.29
+++ pkgsrc/www/contao211-translations/Attic/Makefile 2013/08/30 15:46:25 1.30
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.29 2013/08/30 15:43:05 taca Exp $ 1# $NetBSD: Makefile,v 1.30 2013/08/30 15:46:25 taca Exp $
2# 2#
3 3
4DISTNAME= contao${CT_VER}-translations-${VERS} 4DISTNAME= contao${CT_VER}-translations-${VERS}
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= # defined for each distfiles 6MASTER_SITES= # defined for each distfiles
7DISTFILES= ${CT_DISTFILES} 7DISTFILES= ${CT_DISTFILES}
8EXTRACT_DIR= ${WRKSRC} 8EXTRACT_DIR= ${WRKSRC}
 9DIST_SUBDIR?=
9 10
10MAINTAINER= taca@NetBSD.org 11MAINTAINER= taca@NetBSD.org
11HOMEPAGE= http://www.contao.org/download.html 12HOMEPAGE= http://www.contao.org/download.html
12COMMENT= Language files for Contao CMS 13COMMENT= Language files for Contao CMS
13LICENSE= gnu-lgpl-v3 14LICENSE= gnu-lgpl-v3
14 15
15DEPENDS+= contao${CT_VER}>=${CT_PKGVER}:../../www/contao${CT_VER} 16DEPENDS+= contao${CT_VER}>=${CT_PKGVER}:../../www/contao${CT_VER}
16 17
17# Use time stamp of latest translation. 18# Use time stamp of latest translation.
18VERS= 201308270 19VERS= 201308270
19CT_VERS= 211 20CT_VERS= 211
20 21
21USE_TOOLS= pax 22USE_TOOLS= pax
cvs diff -r1.10 -r1.11 pkgsrc/www/contao30/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/contao30/Attic/Makefile 2013/08/15 17:52:11 1.10
+++ pkgsrc/www/contao30/Attic/Makefile 2013/08/30 15:46:25 1.11
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.10 2013/08/15 17:52:11 taca Exp $ 1# $NetBSD: Makefile,v 1.11 2013/08/30 15:46:25 taca Exp $
2# 2#
3 3
4DISTNAME= contao-${CT_VERSION} 4DISTNAME= ${CT_VERSION}
5PKGNAME= contao${CT_VER}-${CT_PKGVER} 5PKGNAME= contao${CT_VER}-${CT_PKGVER}
6PKGREVISION= 2 6PKGREVISION= 2
7CATEGORIES= www 7CATEGORIES= www
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=contao/} 8MASTER_SITES= ${CT_MASTER_SITE}
9 9
10MAINTAINER= taca@NetBSD.org 10MAINTAINER= taca@NetBSD.org
11HOMEPAGE= http://www.contao.org/ 11HOMEPAGE= http://www.contao.org/
12COMMENT= Contao Open Source CMS ${CT_VERSION} 12COMMENT= Contao Open Source CMS ${CT_VERSION}
13LICENSE= gnu-lgpl-v3 13LICENSE= gnu-lgpl-v3
14 14
15DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom 15DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom
16DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd 16DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
17DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring 17DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring
18DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.2.0:../../databases/php-mysqli 18DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.2.0:../../databases/php-mysqli
19DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt 19DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt
20DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap 20DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap
21 21
cvs diff -r1.8 -r1.9 pkgsrc/www/contao30/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/contao30/Attic/distinfo 2013/04/02 15:34:35 1.8
+++ pkgsrc/www/contao30/Attic/distinfo 2013/08/30 15:46:25 1.9
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.8 2013/04/02 15:34:35 taca Exp $ 1$NetBSD: distinfo,v 1.9 2013/08/30 15:46:25 taca Exp $
2 2
3SHA1 (contao-3.0.6.tar.gz) = 21c7bea1789ef74ed090ae972bf7071d0689b3a1 3SHA1 (contao/3.0.6.tar.gz) = 83bf061f050f83c03efc8d6687c589e23e749da3
4RMD160 (contao-3.0.6.tar.gz) = 48ab35e76d7853a23e0612b98e924b9162ab6ab2 4RMD160 (contao/3.0.6.tar.gz) = 2a23500f00829d5197982146eac088fae6ca4645
5Size (contao-3.0.6.tar.gz) = 7717948 bytes 5Size (contao/3.0.6.tar.gz) = 7717715 bytes
cvs diff -r1.5 -r1.6 pkgsrc/www/contao31/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/contao31/Attic/Makefile 2013/08/27 16:08:03 1.5
+++ pkgsrc/www/contao31/Attic/Makefile 2013/08/30 15:46:25 1.6
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.5 2013/08/27 16:08:03 taca Exp $ 1# $NetBSD: Makefile,v 1.6 2013/08/30 15:46:25 taca Exp $
2# 2#
3 3
4DISTNAME= contao-${CT_VERSION} 4DISTNAME= ${CT_VERSION}
5PKGNAME= contao${CT_VER}-${CT_PKGVER} 5PKGNAME= contao${CT_VER}-${CT_PKGVER}
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=contao/} 7MASTER_SITES= ${CT_MASTER_SITE}
8 8
9MAINTAINER= taca@NetBSD.org 9MAINTAINER= taca@NetBSD.org
10HOMEPAGE= http://www.contao.org/ 10HOMEPAGE= http://www.contao.org/
11COMMENT= Contao Open Source CMS ${CT_VERSION} 11COMMENT= Contao Open Source CMS ${CT_VERSION}
12LICENSE= gnu-lgpl-v3 12LICENSE= gnu-lgpl-v3
13 13
14DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom 14DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom
15DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd 15DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
16DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring 16DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring
17DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.2.0:../../databases/php-mysqli 17DEPENDS+= ${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.2.0:../../databases/php-mysqli
18DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt 18DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt
19DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap 19DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap
20 20
cvs diff -r1.3 -r1.4 pkgsrc/www/contao31/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/contao31/Attic/distinfo 2013/08/27 16:08:03 1.3
+++ pkgsrc/www/contao31/Attic/distinfo 2013/08/30 15:46:25 1.4
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.3 2013/08/27 16:08:03 taca Exp $ 1$NetBSD: distinfo,v 1.4 2013/08/30 15:46:25 taca Exp $
2 2
3SHA1 (contao-3.1.2.tar.gz) = babc410ad8a6bef5b31e5e59172d8b01576b9fc8 3SHA1 (contao/3.1.2.tar.gz) = ed7d155aa780643480ebedc1617a44faa5671694
4RMD160 (contao-3.1.2.tar.gz) = 58fdb5fc1ea9e11913b2b18cd949b9cf1234e1f0 4RMD160 (contao/3.1.2.tar.gz) = 2ea78a3e5212b898d799b770b7638809b4af2b0b
5Size (contao-3.1.2.tar.gz) = 9214519 bytes 5Size (contao/3.1.2.tar.gz) = 9214376 bytes