Deal with some distfile change.

5 files changed, 20 insertions, 15 deletions

diff --git a/www/contao/Makefile.common b/www/contao/Makefile.common
index e6502ff4c8d..4ce9a731f16 100644
--- a/www/contao/Makefile.common
+++ b/www/contao/Makefile.common
@@ -1,4 +1,4 @@
-# $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
@@ -15,17 +15,14 @@ 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_WRKSRC=     contao-core-ef27969
+CT_VERSION=	${CT210_VERSION}
+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/}
 
diff --git a/www/contao/Makefile.example b/www/contao/Makefile.example
index 14c54ee8746..181a2b2b722 100644
--- a/www/contao/Makefile.example
+++ b/www/contao/Makefile.example
@@ -1,4 +1,4 @@
-# $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
 #
@@ -26,7 +26,7 @@ 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
diff --git a/www/contao210-example/Makefile b/www/contao210-example/Makefile
index 2f3fe74f453..fedbeffdbba 100644
--- a/www/contao210-example/Makefile
+++ b/www/contao210-example/Makefile
@@ -1,10 +1,14 @@
-# $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"
diff --git a/www/contao210/Makefile b/www/contao210/Makefile
index f987a3447ad..58131e1bac9 100644
--- a/www/contao210/Makefile
+++ b/www/contao210/Makefile
@@ -1,10 +1,11 @@
-# $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/
@@ -85,6 +86,9 @@ 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}
 
diff --git a/www/contao210/distinfo b/www/contao210/distinfo
index e8b5743c82c..7a9c660e124 100644
--- a/www/contao210/distinfo
+++ b/www/contao210/distinfo
@@ -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
-RMD160 (contao-2.10.4.tar.gz) = 3648900d86a25b209418926a50cadcc8b8cb080c
-Size (contao-2.10.4.tar.gz) = 4880196 bytes
+SHA1 (201112300/contao-2.10.4.tar.gz) = 4b8703dc4be711b99cb96d4115ac523831683686
+RMD160 (201112300/contao-2.10.4.tar.gz) = e292350bbbb2062928074b71a3e3caa7218d6c55
+Size (201112300/contao-2.10.4.tar.gz) = 4948440 bytes