diff options
| author | taca <taca@pkgsrc.org> | 2012-10-01 15:31:00 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2012-10-01 15:31:00 +0000 |
| commit | 4ef0f20e4c947aa1ddac0750493347abaf33b7fb (patch) | |
| tree | 228510f76656e24bad9e6641b4561b43d4fc720b /www | |
| parent | 2b38d77a5e5999315e091a7da2bd55a80d0aca26 (diff) | |
| download | pkgsrc-4ef0f20e4c947aa1ddac0750493347abaf33b7fb.tar.gz | |
Some tweaks:
* Include contao/Makefile.common from contao/Makefile.example.
* Add code some fragment tward to Contao 3.0 support.
* Add CT_VERBASE to use COMMENT.
* Use CT_FILES to Contao's files directory name.
Diffstat (limited to 'www')
| -rw-r--r-- | www/contao/Makefile.common | 12 | ||||
| -rw-r--r-- | www/contao/Makefile.example | 10 | ||||
| -rw-r--r-- | www/contao211-example/Makefile | 3 |
3 files changed, 16 insertions, 9 deletions
diff --git a/www/contao/Makefile.common b/www/contao/Makefile.common index a06da6c1667..28c92d2f574 100644 --- a/www/contao/Makefile.common +++ b/www/contao/Makefile.common @@ -1,22 +1,28 @@ -# $NetBSD: Makefile.common,v 1.19 2012/07/26 03:06:05 taca Exp $ +# $NetBSD: Makefile.common,v 1.20 2012/10/01 15:31:00 taca Exp $ # +# used by www/contao/Makefile.example" # used by www/contao211/Makefile -# used by www/contao211-example/Makefile # used by www/contao211-translations/Makefile # # current release CT211_VERSION= 2.11.5 +CT300_VERSION= 3.0.RC2 CT_VERS?= 211 .if ${CT_VERS} == "211" CT_VERSION= ${CT211_VERSION} +CT_FILES= tl_files +.elif ${CT_VERS} == "30" +CT_VERSION= ${CT300_VERSION} +CT_FILES= files .else .error "Illegal version specified: ${CT_VERS}" .endif -CT_VER?= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/} +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/} FILES_SUBST+= PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \ diff --git a/www/contao/Makefile.example b/www/contao/Makefile.example index 6da9ab84d56..392c5c861d6 100644 --- a/www/contao/Makefile.example +++ b/www/contao/Makefile.example @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.example,v 1.7 2012/06/25 08:57:10 jperkin Exp $ +# $NetBSD: Makefile.example,v 1.8 2012/10/01 15:31:00 taca Exp $ # # used by www/contao211-example/Makefile # @@ -10,7 +10,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=contao/} MAINTAINER= taca@NetBSD.org HOMEPAGE= http://www.contao.org/ -COMMENT= Sample site data for Contao Open Source CMS +COMMENT= Sample site data for Contao Open Source CMS ${CT_VERBASE} DEPENDS+= contao${CT_VER}>=${CT_PKGVER}:../../www/contao${CT_VER} @@ -22,8 +22,10 @@ NO_CONFIGURE= yes PKG_DESTDIR_SUPPORT= user-destdir -WWW_EG_FILES?= tl_files/music_academy -WWW_FILE?= templates/music_academy.sql +WWW_EG_FILES= ${CT_FILES}/music_academy +WWW_FILE= templates/music_academy.sql + +.include "../../www/contao/Makefile.common" .for f in ${WWW_EG_FILES} ${WWW_FILE} EXTRACT_ELEMENTS+= ${DISTNAME}/${f} diff --git a/www/contao211-example/Makefile b/www/contao211-example/Makefile index 9ce9dc3f595..b2642e119ee 100644 --- a/www/contao211-example/Makefile +++ b/www/contao211-example/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2012/02/19 10:55:32 taca Exp $ +# $NetBSD: Makefile,v 1.2 2012/10/01 15:31:00 taca Exp $ # DIST_SUBDIR= ${CT_DIST_SUBDIR} @@ -7,6 +7,5 @@ LICENSE= gnu-lgpl-v3 CT_VERS= 211 .include "../../www/contao/Makefile.example" -.include "../../www/contao/Makefile.common" .include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" |