svn commit: r378531 - head/www/typo3

[John Marino]

Author: marino
Date: Fri Feb  6 12:37:39 2015
New Revision: 378531
URL: https://svnweb.freebsd.org/changeset/ports/378531
QAT: https://qat.redports.org/buildarchive/r378531/

Log:
  www/typo3: Upgrade version 6.1.9 => 7.0.2
  
  While here, convert large static pkg-plist (> 9000 lines) to be
  dynamically generated.
  
  PR:		196028
  Submitted by:	maintainer (freebsd-ports - charlieroot.de)

Deleted:
  head/www/typo3/pkg-plist
Modified:
  head/www/typo3/Makefile
  head/www/typo3/distinfo
  head/www/typo3/pkg-descr

Modified: head/www/typo3/Makefile
==============================================================================
--- head/www/typo3/Makefile	Fri Feb  6 12:21:12 2015	(r378530)
+++ head/www/typo3/Makefile	Fri Feb  6 12:37:39 2015	(r378531)
@@ -2,37 +2,31 @@
 # $FreeBSD$
 
 PORTNAME=	typo3
-PORTVERSION=	6.1.9
+PORTVERSION=	7.0.2
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/TYPO3%20Source%20and%20Dummy/TYPO3%20${PORTVERSION}
 
 MAINTAINER=	freebsd-ports at charlieroot.de
-COMMENT=	The typo3 content management system
+COMMENT=	Typo3 content management system
 
 LICENSE=	GPLv2
 
-PORTSCOUT=	limit:^6\.1\.
+PORTSCOUT=	limit:^7\.0\.
 
 NO_BUILD=	yes
-USE_PHP=	ctype filter json mysqli pcre session xml
+USE_PHP=	ctype fileinfo filter hash json mysqli openssl pcre session soap xml
 WANT_PHP_WEB=	yes
 
 TYPO3WWW=	www
-TYPO3RELEASE=
-TYPO3SITE=	${TYPO3WWW}/${PORTNAME}
-TYPO3PKG=	${PORTNAME}-${PORTVERSION}
 TYPO3SRC=	${PORTNAME}_src-${PORTVERSION}
-TYPO3DUMMY=	dummy-${PORTVERSION}
+TYPO3DIR=	${PORTNAME}
 
 USERS=		${WWWOWN}
 GROUPS=		${WWWGRP}
 
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}" \
-		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+DISTFILES+=	${TYPO3SRC}${EXTRACT_SUFX}
 
-DISTFILES+=	${TYPO3SRC}${EXTRACT_SUFX} ${TYPO3DUMMY}${EXTRACT_SUFX}
-
-OPTIONS_DEFINE=	APC CURL GD IMAGICK MBSTRING MYSQL ZLIB
+OPTIONS_DEFINE=	APC CURL GD GMP IMAGICK MBSTRING MYSQL ZLIB
 APC_DESC=	Alternative PHP Cache
 GD_DESC=	GDlib/freetype support
 IMAGICK_DESC=	${IMAGEMAGICK_DESC}
@@ -42,6 +36,7 @@ MYSQL_DESC=	Install MySQL Server
 APC_USE=	PHP=apc
 CURL_USE=	PHP=curl
 GD_USE=		PHP=gd
+GMP_USE=	PHP=gmp
 MBSTRING_USE=	PHP=mbstring
 MYSQL_USE=	MYSQL=server
 ZLIB_USE=	PHP=zlib
@@ -56,16 +51,25 @@ RUN_DEPENDS+=	convert:${PORTSDIR}/graphi
 .endif
 .endif
 
-pre-install:
-	@if [ -f ${WRKDIR}/${TYPO3DUMMY}/typo3conf/LocalConfiguration.php ]; then \
-		${MV} ${WRKDIR}/${TYPO3DUMMY}/typo3conf/LocalConfiguration.php \
-			${WRKDIR}/${TYPO3DUMMY}/typo3conf/LocalConfiguration.php.dist; \
-	fi
-
 do-install:
-	${CP} -R ${WRKDIR}/${TYPO3DUMMY}/ ${STAGEDIR}${PREFIX}/${TYPO3SITE}
-	${CP} -R ${WRKDIR}/${TYPO3SRC} ${STAGEDIR}${PREFIX}/${TYPO3WWW}
-	${RM} ${STAGEDIR}${PREFIX}/${TYPO3SITE}/typo3_src && \
-		${LN} -s ../${TYPO3SRC} ${STAGEDIR}${PREFIX}/${TYPO3SITE}/typo3_src
+	${MKDIR} ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}
+	${CP} -R ${WRKDIR}/${TYPO3SRC} ${STAGEDIR}${PREFIX}/${TYPO3WWW}/
+	${LN} -fs ../${TYPO3SRC} ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}/typo3_src
+	${LN} -fs typo3_src/index.php ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}/index.php
+	${LN} -fs typo3_src/typo3 ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}/typo3
+	${CP} ${WRKDIR}/${TYPO3SRC}/_.htaccess ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}/.htaccess
+
+post-install:
+	@cd ${STAGEDIR}${PREFIX}; \
+		${FIND} * \( -type f -or -type l \) -path "${TYPO3WWW}/${TYPO3DIR}/*" | \
+		${SORT} >> ${TMPPLIST}
+	@cd ${STAGEDIR}${PREFIX}; \
+		${FIND} * \( -type f -or -type l \) \( -path "${TYPO3WWW}/${TYPO3SRC}/*" -and \
+		-not -path "${TYPO3WWW}/${TYPO3SRC}/typo3/ext/*" \) | \
+		${SORT} >> ${TMPPLIST}
+	@cd ${STAGEDIR}${PREFIX}; \
+		${FIND} * \( -type f -or -type l \) -path "${TYPO3WWW}/${TYPO3SRC}/typo3/ext/*" | \
+		${SORT} | ${SED} -ne 's#^#@(${WWWOWN},${WWWGRP},) #p' >> ${TMPPLIST}
+	@${ECHO} "@dir(${WWWOWN},${WWWGRP},) ${TYPO3WWW}/${TYPO3SRC}/typo3/ext" >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/www/typo3/distinfo
==============================================================================
--- head/www/typo3/distinfo	Fri Feb  6 12:21:12 2015	(r378530)
+++ head/www/typo3/distinfo	Fri Feb  6 12:37:39 2015	(r378531)
@@ -1,4 +1,2 @@
-SHA256 (typo3_src-6.1.9.tar.gz) = 19195b9d470d12fe63e2461a99e00ef9621fc67a7a848b9cf6ab707f45b028bc
-SIZE (typo3_src-6.1.9.tar.gz) = 21108014
-SHA256 (dummy-6.1.9.tar.gz) = f269454dfe286b3cc6e4518c16bed1ce1f4c177dfae693deaf3012b17a87ddae
-SIZE (dummy-6.1.9.tar.gz) = 9814
+SHA256 (typo3_src-7.0.2.tar.gz) = 8a88d7758039714aa41bdb9dbfdfc37902aeaed6d1acb4ec53cd34cee4a3fbc8
+SIZE (typo3_src-7.0.2.tar.gz) = 21456771

Modified: head/www/typo3/pkg-descr
==============================================================================
--- head/www/typo3/pkg-descr	Fri Feb  6 12:21:12 2015	(r378530)
+++ head/www/typo3/pkg-descr	Fri Feb  6 12:37:39 2015	(r378531)
@@ -2,9 +2,10 @@ TYPO3 is a free Open Source content mana
 on the web and in intranets. It offers full flexibility and extendability while
 featuring an accomplished set of ready-made interfaces, functions and modules.
 
-The latest stable release (for new and existing projects)
-This version is the current stable release. It is recommended for existing
-projects and will get full support (bug fixes and security fixes) until October
-2013, but will get security fixes and important bugfixes until October 2014.
+The upcoming LTS release, which will be released in Fall 2015. It will get 3
+years of important and security fixes from the day of the release. Until the
+final release several sprint releases will be published (7.0, 7.1, 7.2, ...)
+in between. Adopters are encouraged to use each of those release on the way
+to TYPO3 CMS 7 LTS.
 
 WWW: http://typo3.org/