Sat Nov 28 06:02:08 2015 UTC ()
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.
(taca)
diff -r1.102 -r1.103 pkgsrc/www/contao/Makefile.common
diff -r1.9 -r1.10 pkgsrc/www/contao32/Makefile
diff -r1.3 -r1.4 pkgsrc/www/contao35/Makefile
--- pkgsrc/www/contao/Makefile.common 2015/11/28 05:45:42 1.102
+++ pkgsrc/www/contao/Makefile.common 2015/11/28 06:02:08 1.103
@@ -1,37 +1,13 @@
-# $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}
--- pkgsrc/www/contao32/Attic/Makefile 2015/02/01 04:49:39 1.9
+++ pkgsrc/www/contao32/Attic/Makefile 2015/11/28 06:02:08 1.10
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2015/02/01 04:49:39 taca Exp $
+# $NetBSD: Makefile,v 1.10 2015/11/28 06:02:08 taca Exp $
#
DISTNAME= ${CT_VERSION}
PKGNAME= contao${CT_VER}-${CT_PKGVER}
CATEGORIES= www
-MASTER_SITES= ${CT_MASTER_SITE}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=contao/}
+GITHUB_PROJECT= core
+GITHUB_TAG= ${CT_VERSION}
+DIST_SUBDIR= contao
MAINTAINER= taca@NetBSD.org
HOMEPAGE= http://www.contao.org/
@@ -20,7 +23,7 @@
DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.2.7:../../archivers/php-zlib
DEPENDS+= bash>=4.0:../../shells/bash
-CT_VERS= 32
+CT_VERSION= 3.2.21
USE_TOOLS= bash pax
NO_BUILD= yes
--- pkgsrc/www/contao35/Makefile 2015/10/12 05:47:19 1.3
+++ pkgsrc/www/contao35/Makefile 2015/11/28 06:02:08 1.4
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2015/10/12 05:47:19 taca Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/28 06:02:08 taca Exp $
#
DISTNAME= contao-${CT_PKGVER}
PKGNAME= contao${CT_VER}-${CT_PKGVER}
CATEGORIES= www
-MASTER_SITES= ${CT_MASTER_SITE}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=contao/}
+GITHUB_PROJECT= core
+GITHUB_RELEASE= ${CT_VERSION}
MAINTAINER= taca@NetBSD.org
HOMEPAGE= http://www.contao.org/
@@ -21,7 +23,7 @@
DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.4.0:../../archivers/php-zlib
DEPENDS+= bash>=4.0:../../shells/bash
-CT_VERS= 35
+CT_VERSION= 3.5.6
USE_TOOLS= bash pax
NO_BUILD= yes