Update typo3_47 to 4.7.15.

pkgsrc change: change files/README to MESSAGE file.

2013-09-12  cbc67ce                  [RELEASE] Release of TYPO3 4.7.15 (TYPO3 Release Team)
2013-08-31  5fb0e4e  #50424          [BUGFIX] Backend Layout Grid Wizard not fully visible in Mac Firefox 22 (Philipp Gampe)
2013-08-28  c4116e6  #36244          [BUGFIX] Exclude empty passwords from password hashing check (Nicole Cordes)
2013-08-27  c20f9c0  #50760          [BUGFIX] Escape title tag of image links (Alexander Stehlik)
2013-08-27  7936270  #25327,#37026   [BUGFIX] Page tree filtering broken in IE7 & IE8 (Aske Ertmann)
2013-08-17  9f987b9  #30636          [BUGFIX] TCA: subtypes_addlist not processed (Ernesto Baschny)
2013-08-14  365c939  #46094          [BUGFIX] Avoid usage of subheader in mailform (Francois Suter)
2013-08-08  4cfafbe  #50868          [BUGFIX] number_format() expects parameter 1 to be double (Anja Leichsenring)
2013-08-04  d034738  #50466          [BUGFIX] MySQL: Use ENGINE (not TYPE) for storage-engine (Stefan Neufeind)
2013-08-04  3bee27a  #35274          [BUGFIX] Syntax error in class.tx_coreupdates_t3skin.php (Wouter Wolters)
2013-08-03  b7b400c  #46642          [BUGFIX] Fix fatal error in extension manager (Michael Stucki)
2013-08-01  2fd1c4d  #50645          [TASK] TagBuilders render() method PhpDoc return tag fixed (Daniel Hürtgen)
2013-07-31  38a59ea  #36031          [TASK] Provide information about import action in TCEmain to hooks (Stefan Galinski)
2013-07-31  11acd37  #43631          [BUGFIX] RTE wizard can't "save document and view page" (Stanislas Rolland)

3 files changed, 17 insertions, 36 deletions

diff --git a/www/typo3_47/Makefile b/www/typo3_47/Makefile
index c76b874c87b..d808edb3d8c 100644
--- a/www/typo3_47/Makefile
+++ b/www/typo3_47/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/08/04 16:24:59 taca Exp $
+# $NetBSD: Makefile,v 1.18 2013/09/13 11:33:50 taca 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=		4.7.14
+VER=		4.7.15
 NO_BUILD=	yes
-USE_TOOLS+=	pax
+USE_TOOLS+=	bash:run pax
 
 TYPO3NAME=	typo3_src-${VER}
 SITESRC=	dummy-${VER}
@@ -34,8 +34,8 @@ 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
+REPLACE.sh.new=		${TOOLS_PATH.bash}
+REPLACE_FILES.sh=	typo3/contrib/flowplayer/plugins/flowplayer.captions/example/flvtool2-cuepoints.sh
 
 TYPO3DATADIRS=	fileadmin fileadmin/_temp_ fileadmin/user_upload \
 		typo3conf typo3conf/ext typo3conf/l10n typo3temp uploads \
@@ -44,6 +44,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}
 
@@ -65,7 +66,6 @@ CHECK_INTERPRETER_SKIP = \
 	share/typo3/typo3_src-4.7.14/typo3/contrib/flowplayer/plugins/flowplayer.captions/example/flvtool2-cuepoints.sh
 
 SUBST_CLASSES+=		conf
-SUBST_FILES.conf+=	${WRKDIR}/README
 SUBST_FILES.conf+=	${WRKSRC}/t3lib/config_default.php
 SUBST_SED.conf+=	-e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.conf+=	-e 's|@TYPO3DIR@|${TYPO3DIR}|g'
@@ -86,17 +86,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/localconf.php
 	${INSTALL_DATA} ${WRKDIR}/${SITESRC}/typo3conf/localconf.php \
 		${DESTDIR}${PREFIX}/${EGDIR}
diff --git a/www/typo3_47/distinfo b/www/typo3_47/distinfo
index f30906fe8d3..21e2cf0c2ec 100644
--- a/www/typo3_47/distinfo
+++ b/www/typo3_47/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2013/08/04 16:24:59 taca Exp $
+$NetBSD: distinfo,v 1.13 2013/09/13 11:33:50 taca Exp $
 
-SHA1 (dummy-4.7.14.tar.gz) = bc2556cda2655646c5efe3505941471a6e54bdbd
-RMD160 (dummy-4.7.14.tar.gz) = d5e2e13500bc1c0a6d09e6d34c1dde031af9dbec
-Size (dummy-4.7.14.tar.gz) = 10155 bytes
-SHA1 (typo3_src-4.7.14.tar.gz) = 4fefc8e5ea741e7e4be3fc5b96e0966755b2d318
-RMD160 (typo3_src-4.7.14.tar.gz) = e966240e3014c9838a93117d30fc3b7eb7859c04
-Size (typo3_src-4.7.14.tar.gz) = 22597494 bytes
+SHA1 (dummy-4.7.15.tar.gz) = 26fc749368221c08bc5e0d2a4c08bd367fcf7361
+RMD160 (dummy-4.7.15.tar.gz) = 6ee67d1b25c9f004cd4af6ce6cd5db630298505e
+Size (dummy-4.7.15.tar.gz) = 10277 bytes
+SHA1 (typo3_src-4.7.15.tar.gz) = 07fd4dacfbbc064d3d8119b430331f72c1597a88
+RMD160 (typo3_src-4.7.15.tar.gz) = b27529174ad061065b25ecbd5a6a773032f071e8
+Size (typo3_src-4.7.15.tar.gz) = 22625165 bytes
 SHA1 (patch-t3lib_config__default.php) = 9a016a8510adac61abff93b87495c4657b9cc131
diff --git a/www/typo3_47/files/README b/www/typo3_47/files/README
deleted file mode 100644
index c2760fba42c..00000000000
--- a/www/typo3_47/files/README
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: README,v 1.1.1.1 2012/06/02 05:54:30 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.
-