4 files changed, 15 insertions, 35 deletions
diff --git a/www/typo3_60/Makefile b/www/typo3_60/Makefile
index 75cdfedf451..6c3e07aa998 100644
--- a/www/typo3_60/Makefile
+++ b/www/typo3_60/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/09/06 14:16:46 taca Exp $
+# $NetBSD: Makefile,v 1.5 2013/09/13 11:35:58 taca Exp $
 #
 
 DISTNAME=	${TYPO3NAME}
@@ -16,7 +16,7 @@ DEPENDS+=	${PHP_PKG_PREFIX}-{mysql,pgsql}>=5.1.0:../../databases/php-mysql
 DEPENDS+=	${PHP_PKG_PREFIX}-zlib>=5.2.0:../../archivers/php-zlib/
 DEPENDS+=	${PHP_PKG_PREFIX}-json>=5.2.0:../../textproc/php-json
 
-VER=		6.0.9
+VER=		6.0.10
 NO_BUILD=	yes
 USE_TOOLS+=	bash:run pax
 
@@ -37,6 +37,7 @@ TYPO3DATADIRS=	fileadmin fileadmin/_temp_ fileadmin/user_upload \
 BUILD_DEFS+=	APACHE_GROUP
 
 FILES_SUBST+=	TYPO3DIR=${TYPO3DIR} SITEDIR=${SITEDIR}
+MESSAGE_SUBST+=	TYPO3DIR=${TYPO3DIR} SITEDIR=${SITEDIR}
 PLIST_SUBST+=	EGDIR=${EGDIR} SITEDIR=${SITEDIR} \
 		TYPO3DIR=${TYPO3DIR} TYPO3NAME=${TYPO3NAME:Q}
 
@@ -60,7 +61,6 @@ REPLACE.sh.new=		${TOOLS_PATH.bash}
 REPLACE_FILES.sh=	typo3/contrib/flowplayer/plugins/flowplayer.captions/example/flvtool2-cuepoints.sh
 
 SUBST_CLASSES+=		conf
-SUBST_FILES.conf+=	${WRKDIR}/README
 SUBST_FILES.conf+=	${WRKSRC}/t3lib/stddb/DefaultConfiguration.php
 SUBST_SED.conf+=	-e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.conf+=	-e 's|@TYPO3DIR@|${TYPO3DIR}|g'
@@ -81,17 +81,12 @@ PRINT_PLIST_AWK+=	/^${TYPO3DIR:S|/|\\/|g}\/${SITEDIR}/ \
 SITEDIR?=	www
 TYPO3DIR?=	share/typo3
 
-post-extract:
-	${CP} ${FILESDIR}/README ${WRKDIR}
-
-pre-install:
-	${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;
-
 do-install:
-	cd ${WRKSRC} && \
-	    pax -rw . ${DESTDIR}${PREFIX}/${TYPO3DIR}/${TYPO3NAME}
+	cd ${WRKSRC} && ${FIND} . ! -type d -a \! -name '*.orig' -print | \
+		pax -rw ${DESTDIR}${PREFIX}/${TYPO3DIR}/${TYPO3NAME}
 	cd ${WRKDIR}/${SITESRC} && \
-		pax -rw . ${DESTDIR}${PREFIX}/${TYPO3DIR}/${SITEDIR}
+		${FIND} . ! -type d -a \! -name '*.orig' -print | \
+		pax -rw ${DESTDIR}${PREFIX}/${TYPO3DIR}/${SITEDIR}
 	${RM} -f ${DESTDIR}${PREFIX}/${TYPO3DIR}/${SITEDIR}/typo3conf/LocalConfiguration.php
 	${INSTALL_DATA} ${WRKDIR}/${SITESRC}/typo3conf/LocalConfiguration.php \
 		${DESTDIR}${PREFIX}/${EGDIR}
diff --git a/www/typo3_60/PLIST b/www/typo3_60/PLIST
index 9f9aa0b5e86..5943720f32f 100644
--- a/www/typo3_60/PLIST
+++ b/www/typo3_60/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/09/06 14:16:46 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/09/13 11:35:58 taca Exp $
 ${EGDIR}/LocalConfiguration.php
 ${TYPO3DIR}/${TYPO3NAME}/ChangeLog
 ${TYPO3DIR}/${TYPO3NAME}/GPL.txt
@@ -3096,7 +3096,6 @@ ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTe
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/Service/FrontendContentAdapterServiceTest.php
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/Service/IndexerServiceTest.php
-${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/StorageRepositoryTest.php
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/TreeDataProviderFactoryTest.php
 ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/TypoScript/Fixtures/ext_typoscript_setup.txt
diff --git a/www/typo3_60/distinfo b/www/typo3_60/distinfo
index 1b2fca5890f..2d09e87fc07 100644
--- a/www/typo3_60/distinfo
+++ b/www/typo3_60/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2013/09/06 14:16:46 taca Exp $
+$NetBSD: distinfo,v 1.5 2013/09/13 11:35:58 taca Exp $
 
-SHA1 (dummy-6.0.9.tar.gz) = 93634fb36f4d37c3b9a66b547de6bf52f3ef71aa
-RMD160 (dummy-6.0.9.tar.gz) = 35aa176679b918bfdf6f1000930e6f44cbca0cd3
-Size (dummy-6.0.9.tar.gz) = 10196 bytes
-SHA1 (typo3_src-6.0.9.tar.gz) = dc0bd7612151038d56466c1cc637ac91c70eb789
-RMD160 (typo3_src-6.0.9.tar.gz) = 54f18406bbb35d164a7e7a54e45952a1cf18e9c0
-Size (typo3_src-6.0.9.tar.gz) = 22138574 bytes
+SHA1 (dummy-6.0.10.tar.gz) = c0d73dd69cec9b7fdd29f01cce9353da0f38e226
+RMD160 (dummy-6.0.10.tar.gz) = be0cda082241332158a9c6a808e920a6b1f0e7f3
+Size (dummy-6.0.10.tar.gz) = 10322 bytes
+SHA1 (typo3_src-6.0.10.tar.gz) = 6a90c93042f60d8484e1c425c2fd211885dd30ff
+RMD160 (typo3_src-6.0.10.tar.gz) = 683646777d5fc0e8d8512db3b354ac061ae23e40
+Size (typo3_src-6.0.10.tar.gz) = 22286661 bytes
 SHA1 (patch-t3lib_stddb_DefaultConfiguration.php) = ab5f670ed50d6f7b30564d275f0b95d1c33193d3
diff --git a/www/typo3_60/files/README b/www/typo3_60/files/README
deleted file mode 100644
index 2e1dd36ec0b..00000000000
--- a/www/typo3_60/files/README
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: README,v 1.1 2013/05/16 16:30:46 taca Exp $
-
-1. Set up typo3; Add below line in your httpd.conf.
-
-	Alias	/typo3	@PREFIX@/@TYPO3DIR@/@SITEDIR@
-
-   Or set DocumentRoot to @PREFIX@/@TYPO3DIR@/@SITEDIR@.
-
-2. First, enable TYPO3 installer.
-
-    	# cp /dev/null @PREFIX@/@TYPO3DIR@/@SITEDIR@/typo3conf/ENABLE_INSTALL_TOOL
-
-3. Access typo3 site.  You will be redirected to installer.
-