summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/typo3_60/Makefile16
-rw-r--r--www/typo3_60/PLIST10
-rw-r--r--www/typo3_60/distinfo14
3 files changed, 22 insertions, 18 deletions
diff --git a/www/typo3_60/Makefile b/www/typo3_60/Makefile
index 6f012a47029..2940a663513 100644
--- a/www/typo3_60/Makefile
+++ b/www/typo3_60/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.2.1 2013/08/05 07:48:04 spz Exp $
+# $NetBSD: Makefile,v 1.2.2.2 2013/09/10 10:56:12 tron Exp $
#
DISTNAME= ${TYPO3NAME}
@@ -16,9 +16,9 @@ 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.8
+VER= 6.0.9
NO_BUILD= yes
-USE_TOOLS+= pax
+USE_TOOLS+= bash:run pax
TYPO3NAME= typo3_src-${VER}
SITESRC= dummy-${VER}
@@ -30,11 +30,6 @@ REPLACE.php.old= .*php[^ ]*
REPLACE.php.new= ${PREFIX}/bin/php
REPLACE_FILES.php= typo3/cli_dispatch.phpsh
-REPLACE_INTERPRETER+= sh
-REPLACE.sh.old= /bin/bash
-REPLACE.sh.new= /bin/sh
-REPLACE_FILES.sh= typo3/contrib/flowplayer/flowplayer.captions/example/flvtool2-cuepoints.sh
-
TYPO3DATADIRS= fileadmin fileadmin/_temp_ fileadmin/user_upload \
typo3conf typo3conf/ext typo3conf/l10n typo3temp uploads \
uploads/media uploads/pics uploads/tf
@@ -59,7 +54,10 @@ OWN_DIRS_PERMS+= ${TYPO3DIR}/${SITEDIR}/${d} ${REAL_ROOT_USER} \
CHECK_PERMS_SKIP+= ${TYPO3DIR}/${SITEDIR}/${d}
.endfor
-CHECK_INTERPRETER_SKIP = share/typo3/typo3_src-6.0.8/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/flvtool2-cuepoints.sh
+REPLACE_INTERPRETER+= sh
+REPLACE.sh.old= /bin/bash
+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
diff --git a/www/typo3_60/PLIST b/www/typo3_60/PLIST
index 43135292c67..5ce916c2a3d 100644
--- a/www/typo3_60/PLIST
+++ b/www/typo3_60/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2.2.1 2013/08/05 07:48:04 spz Exp $
+@comment $NetBSD: PLIST,v 1.2.2.2 2013/09/10 10:56:12 tron Exp $
${EGDIR}/LocalConfiguration.php
${TYPO3DIR}/${TYPO3NAME}/ChangeLog
${TYPO3DIR}/${TYPO3NAME}/GPL.txt
@@ -2897,6 +2897,7 @@ ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/Collection/AbstractF
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/Collection/FolderBasedFileCollection.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/Collection/StaticFileCollection.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
+${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/Driver/AbstractHierarchicalFilesystemDriver.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/Exception.php
@@ -2950,6 +2951,7 @@ ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/ResourceCompressor.p
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/ResourceFactory.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/ResourceInterface.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/ResourceStorage.php
+${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/Security/StoragePermissionsAspect.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/Service/FileProcessingService.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/Service/FrontendContentAdapterService.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Resource/Service/ImageProcessingService.php
@@ -2987,6 +2989,7 @@ ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Utility/MathUtility.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Utility/MonitorUtility.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Utility/PathUtility.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Utility/PhpOptionsUtility.php
+${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Utility/ResourceUtility.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Utility/RootlineUtility.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Utility/StringUtility.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php
@@ -3084,12 +3087,12 @@ ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/Driver/DriverRegi
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/Driver/Fixtures/Dummy.html
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/Driver/Fixtures/LocalDriverFilenameFilter.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
-${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/FactoryTest.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/FileReferenceTest.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/FileTest.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/ProcessedFileRepositoryTest.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/Repository/AbstractRepositoryTest.php
+${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
${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
@@ -3111,6 +3114,7 @@ ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Utility/HttpUtilityTest.ph
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Utility/MailUtilityTest.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Utility/MathUtilityTest.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Utility/PathUtilityTest.php
+${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Utility/ResourceUtilityTest.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/Unit/Utility/VersionNumberUtilityTest.php
@@ -3118,6 +3122,7 @@ ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/Tests/UnitTestCase.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/ext_autoload.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/ext_emconf.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/ext_icon.png
+${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/core/ext_localconf.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/cshmanual/Migrations/Code/ClassAliasMap.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/cshmanual/ext_emconf.php
@@ -4120,6 +4125,7 @@ ${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/fluid/Tests/Unit/ViewHelpers/GroupedForVie
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/fluid/Tests/Unit/ViewHelpers/IfViewHelperTest.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php
+${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/fluid/Tests/Unit/ViewHelpers/RenderChildrenViewHelperTest.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/fluid/Tests/Unit/ViewHelpers/RenderViewHelperTest.php
${TYPO3DIR}/${TYPO3NAME}/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Security/IfAuthenticatedViewHelperTest.php
diff --git a/www/typo3_60/distinfo b/www/typo3_60/distinfo
index 2ec9a3397f8..4a5671a5df2 100644
--- a/www/typo3_60/distinfo
+++ b/www/typo3_60/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2.2.1 2013/08/05 07:48:04 spz Exp $
+$NetBSD: distinfo,v 1.2.2.2 2013/09/10 10:56:12 tron Exp $
-SHA1 (dummy-6.0.8.tar.gz) = 5ef94e490c8097b5be664ccb9a77cd354eaf0ccc
-RMD160 (dummy-6.0.8.tar.gz) = 9623e632ba0256f8eba63ef2a873db663d41406c
-Size (dummy-6.0.8.tar.gz) = 10195 bytes
-SHA1 (typo3_src-6.0.8.tar.gz) = e6cc73d396c9f127f0362d84b24ec7818f497d7f
-RMD160 (typo3_src-6.0.8.tar.gz) = 04ff7d99028d1c2cc1799cb8fdf2f126eedeccfd
-Size (typo3_src-6.0.8.tar.gz) = 22246753 bytes
+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 (patch-t3lib_stddb_DefaultConfiguration.php) = ab5f670ed50d6f7b30564d275f0b95d1c33193d3