 @@ -1,41 +1,38 @@
-# $NetBSD: Makefile.common,v 1.6 2011/12/30 15:12:21 taca Exp $
+# $NetBSD: Makefile.common,v 1.7 2011/12/30 23:21:00 taca Exp $
+#
 # used by www/contao29/Makefile
 # used by www/contao29-example/Makefile
 # used by www/contao29-translations/Makefile
 # used by www/contao210/Makefile
 # used by www/contao210-example/Makefile
 # used by www/contao210-translations/Makefile
+#
 # current release
 CT29_VERSION=	2.9.5
 CT210_VERSION=	2.10.4
 CT_VERS?=	210
 .if ${CT_VERS} == "29"
-CT_VERSION=    ${CT29_VERSION}
+CT_VERSION=	${CT29_VERSION}
 .elif ${CT_VERS} == "210"
-CT_VERSION=    ${CT210_VERSION}
+CT_VERSION=	${CT210_VERSION}
-CT_WRKSRC=     contao-core-ef27969
+CT_DIST_SUBDIR=	201112300
 .else
 .error "Illegal version specified: ${CT_VERS}"
 .endif
 CT_WRKSRC?=	${DISTNAME}
 WRKSRC?=	${WRKDIR}/${CT_WRKSRC}
 CT_VER?=	${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} \
 		WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q}
 MESSAGE_SUBST+=	CT_VER=${CT_VER}
 PLIST_SUBST+=	CT_DOCDIR=${CT_DOCDIR:Q} CT_EGDIR=${CT_EGDIR:Q} \
 		CT_WEBDIR=${CT_WEBDIR:Q}
 PRINT_PLIST_AWK+=	/^${CT_WEBDIR:S|/|\\/|g}/ \
 			{ gsub(/${CT_WEBDIR:S|/|\\/|g}/, "$${CT_WEBDIR}"); \
 			print; next; }
 PRINT_PLIST_AWK+=	/^${CT_DOCDIR:S|/|\\/|g}/ \

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile.example,v 1.3 2011/12/30 15:12:21 taca Exp $
+# $NetBSD: Makefile.example,v 1.4 2011/12/30 23:21:00 taca Exp $
+#
 # used by www/contao29-example/Makefile
+#
 DISTNAME=	contao-${CT_VERSION}
 PKGNAME=	contao${CT_VER}-example-${CT_PKGVER}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=contao/}
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.contao.org/
 COMMENT=	Sample site data for Contao Open Source CMS
 @@ -16,26 +16,26 @@ DEPENDS+=	contao${CT_VER}>=${CT_PKGVER}:
 DISTINFO_FILE=	${.CURDIR}/../../www/contao${CT_VER}/distinfo
 USE_TOOLS=	pax
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
 PKG_DESTDIR_SUPPORT=	user-destdir
 WWW_EG_FILES?=	tl_files/music_academy
 WWW_FILE?=	templates/music_academy.sql
 .for f in ${WWW_EG_FILES} ${WWW_FILE}
-EXTRACT_ELEMENTS+=	${CT_WRKSRC}/${f}
+EXTRACT_ELEMENTS+=	${DISTNAME}/${f}
 .endfor
 PKG_GROUPS_VARS+=	APACHE_GROUP
 PKG_USERS_VARS+=	APACHE_USER
 INSTALLATION_DIRS+=	${CT_WEBDIR}/templates
 do-install:
 	cd ${WRKSRC}; \
 		pax -rw -pm ${WWW_EG_FILES} ${DESTDIR}${PREFIX}/${CT_EGDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} ${WWW_FILE} \
 		${DESTDIR}${PREFIX}/${CT_WEBDIR}/templates

 @@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.7 2011/12/30 15:12:22 taca Exp $
+# $NetBSD: Makefile,v 1.8 2011/12/30 23:21:00 taca Exp $
+#
 DISTNAME=	contao-${CT_VERSION}
 PKGNAME=	contao${CT_VER}-${CT_PKGVER}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=contao/}
 DIST_SUBDIR=	${CT_DIST_SUBDIR}
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.contao.org/
 COMMENT=	Contao Open Source CMS
 LICENSE=	gnu-lgpl-v3
 DEPENDS+=	${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-{mysql,mysqli}>=5.2.0:../../databases/php-mysqli
 DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt
 DEPENDS+=	${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap
 @@ -75,26 +76,29 @@ SUBST_STAGE.conf=	post-configure
 WWW_FILES=	CHANGELOG.txt GPL.txt LGPL.txt README.md \
 		contao cron.php index.php plugins share.php templates \
 		typolight
 WWW_SYSFILES=	config/.htaccess constants.php contao.css drivers \
 		functions.php html initialize.php interface.php libraries \
 		logs/.htaccess mbstring.php modules themes tmp/.htaccess \
 		utf8_lookup.php
 INSTALLATION_DIRS+=	${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config
 PKG_GROUPS_VARS+=	APACHE_GROUP
 PKG_USERS_VARS+=	APACHE_USER
 pre-patch:
 	${FIND} ${WRKSRC} -name '._*' -exec ${RM} '{}' \;
 pre-configure:
 	${CP} ${FILESDIR}/contao.conf ${WRKDIR}
 pre-install:
 	cd ${WRKSRC}; ${RM} -rf music_academy.css \
 		templates/music_academy.sql tl_files/music_academy
 	${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;
 do-install:
 	cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR}
 	cd ${WRKSRC}/system; \
 		pax -rw ${WWW_SYSFILES} \
 			${DESTDIR}${PREFIX}/${CT_WEBDIR}/system; \

 @@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2011/12/30 15:12:22 taca Exp $
+$NetBSD: distinfo,v 1.7 2011/12/30 23:21:00 taca Exp $
-SHA1 (contao-2.10.4.tar.gz) = 77ad786ab2edb8128170ce35e79df7b0d6d2d948
+SHA1 (201112300/contao-2.10.4.tar.gz) = 4b8703dc4be711b99cb96d4115ac523831683686
-RMD160 (contao-2.10.4.tar.gz) = 3648900d86a25b209418926a50cadcc8b8cb080c
+RMD160 (201112300/contao-2.10.4.tar.gz) = e292350bbbb2062928074b71a3e3caa7218d6c55
-Size (contao-2.10.4.tar.gz) = 4880196 bytes
+Size (201112300/contao-2.10.4.tar.gz) = 4948440 bytes

 @@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/08/12 13:09:03 taca Exp $
+# $NetBSD: Makefile,v 1.2 2011/12/30 23:21:00 taca Exp $
+#
 DIST_SUBDIR=	${CT_DIST_SUBDIR}
 LICENSE=	gnu-lgpl-v3
 CT_VERS=	210
 pre-patch:
 	${FIND} ${WRKSRC} -name '._*' -exec ${RM} '{}' \;
 .include "../../www/contao/Makefile.example"
 .include "../../www/contao/Makefile.common"
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"