Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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.
  • Loading branch information...
commit 4c2fbd83eed0430348e52f70bc84d43b5f682b7a 1 parent a64cb0d
authored October 01, 2012
12  www/contao/Makefile.common
... ...
@@ -1,22 +1,28 @@
1  
-# $NetBSD: Makefile.common,v 1.19 2012/07/26 03:06:05 taca Exp $
  1
+# $NetBSD: Makefile.common,v 1.20 2012/10/01 15:31:00 taca Exp $
2 2
 #
  3
+# used by www/contao/Makefile.example"
3 4
 # used by www/contao211/Makefile
4  
-# used by www/contao211-example/Makefile
5 5
 # used by www/contao211-translations/Makefile
6 6
 #
7 7
 
8 8
 # current release
9 9
 CT211_VERSION=	2.11.5
  10
+CT300_VERSION=	3.0.RC2
10 11
 
11 12
 CT_VERS?=	211
12 13
 
13 14
 .if ${CT_VERS} == "211"
14 15
 CT_VERSION=	${CT211_VERSION}
  16
+CT_FILES=	tl_files
  17
+.elif ${CT_VERS} == "30"
  18
+CT_VERSION=	${CT300_VERSION}
  19
+CT_FILES=	files
15 20
 .else
16 21
 .error "Illegal version specified: ${CT_VERS}"
17 22
 .endif
18 23
 
19  
-CT_VER?=	${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
  24
+CT_VER=		${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
  25
+CT_VERBASE=	${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/}
20 26
 CT_PKGVER=	${CT_VERSION:S/.RC/rc/}
21 27
 
22 28
 FILES_SUBST+=	PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \
10  www/contao/Makefile.example
... ...
@@ -1,4 +1,4 @@
1  
-# $NetBSD: Makefile.example,v 1.7 2012/06/25 08:57:10 jperkin Exp $
  1
+# $NetBSD: Makefile.example,v 1.8 2012/10/01 15:31:00 taca Exp $
2 2
 #
3 3
 # used by www/contao211-example/Makefile
4 4
 #
@@ -10,7 +10,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=contao/}
10 10
 
11 11
 MAINTAINER=	taca@NetBSD.org
12 12
 HOMEPAGE=	http://www.contao.org/
13  
-COMMENT=	Sample site data for Contao Open Source CMS
  13
+COMMENT=	Sample site data for Contao Open Source CMS ${CT_VERBASE}
14 14
 
15 15
 DEPENDS+=	contao${CT_VER}>=${CT_PKGVER}:../../www/contao${CT_VER}
16 16
 
@@ -22,8 +22,10 @@ NO_CONFIGURE=	yes
22 22
 
23 23
 PKG_DESTDIR_SUPPORT=	user-destdir
24 24
 
25  
-WWW_EG_FILES?=	tl_files/music_academy
26  
-WWW_FILE?=	templates/music_academy.sql
  25
+WWW_EG_FILES=	${CT_FILES}/music_academy
  26
+WWW_FILE=	templates/music_academy.sql
  27
+
  28
+.include "../../www/contao/Makefile.common"
27 29
 
28 30
 .for f in ${WWW_EG_FILES} ${WWW_FILE}
29 31
 EXTRACT_ELEMENTS+=	${DISTNAME}/${f}
3  www/contao211-example/Makefile
... ...
@@ -1,4 +1,4 @@
1  
-# $NetBSD: Makefile,v 1.1.1.1 2012/02/19 10:55:32 taca Exp $
  1
+# $NetBSD: Makefile,v 1.2 2012/10/01 15:31:00 taca Exp $
2 2
 #
3 3
 
4 4
 DIST_SUBDIR=	${CT_DIST_SUBDIR}
@@ -7,6 +7,5 @@ LICENSE=	gnu-lgpl-v3
7 7
 CT_VERS=	211
8 8
 
9 9
 .include "../../www/contao/Makefile.example"
10  
-.include "../../www/contao/Makefile.common"
11 10
 .include "../../lang/php/phpversion.mk"
12 11
 .include "../../mk/bsd.pkg.mk"

0 notes on commit 4c2fbd8

Please sign in to comment.
Something went wrong with that request. Please try again.