From 11aad89e42623c3afa784d44ddda53a117906909 Mon Sep 17 00:00:00 2001
From: Bartek Rutkowski <robak@FreeBSD.org>
Date: Sat, 7 Mar 2015 21:32:02 +0000
Subject: [PATCH] www/typo3-lts: Makefile fixes and cleanup

PR:		198363
Submitted by:	Helmut Ritter <freebsd-ports@charlieroot.de>
---
 www/typo3-lts/Makefile | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/www/typo3-lts/Makefile b/www/typo3-lts/Makefile
index 913ce82ed436..e736d3541e99 100644
--- a/www/typo3-lts/Makefile
+++ b/www/typo3-lts/Makefile
@@ -19,8 +19,8 @@ USE_PHP=	ctype fileinfo filter hash json mysqli openssl pcre session soap xml
 WANT_PHP_WEB=	yes
 
 TYPO3WWW=	www
-TYPO3RELEASE=	LTS
 TYPO3SRC=	${PORTNAME}_src-${PORTVERSION}
+TYPO3DIR=	${PORTNAME}-LTS
 
 USERS=		${WWWOWN}
 GROUPS=		${WWWGRP}
@@ -53,36 +53,24 @@ RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick-nox11
 .endif
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${PORTNAME}-${TYPO3RELEASE}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}
 	${CP} -R ${WRKDIR}/${TYPO3SRC} ${STAGEDIR}${PREFIX}/${TYPO3WWW}/
-	${LN} -fs ../${TYPO3SRC} ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${PORTNAME}-${TYPO3RELEASE}/typo3_src
-	${LN} -fs typo3_src/index.php ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${PORTNAME}-${TYPO3RELEASE}/index.php
-	${LN} -fs typo3_src/typo3 ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${PORTNAME}-${TYPO3RELEASE}/typo3
-	${CP} ${WRKDIR}/${TYPO3SRC}/_.htaccess ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${PORTNAME}-${TYPO3RELEASE}/.htaccess
+	${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}/${PORTNAME}-${TYPO3RELEASE}/*" | \
-		${SORT} | ${SED} -ne 's#^#@(root,wheel,) #p' >> ${TMPPLIST}
+		${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}
-	@cd ${STAGEDIR}${PREFIX}; \
-		${FIND} * \( -type f -or -type l \) \
-		-not \( -path "${TYPO3WWW}/${PORTNAME}-${TYPO3RELEASE}/*" -or \
-		-path "${TYPO3WWW}/${TYPO3SRC}/typo3/ext/*" \) | \
-		${SORT} | ${SED} -ne 's#^#@(root,wheel,) #p' >> ${TMPPLIST}
-	@cd ${STAGEDIR}${PREFIX}; \
-		${FIND} -d * -type d -regex "${TYPO3WWW}/${PORTNAME}-${TYPO3RELEASE}/*.*" | \
-		${SORT} | ${SED} -ne 's#^#@dir(root,wheel,) #p' >> ${TMPPLIST}
-	@cd ${STAGEDIR}${PREFIX}; \
-		${FIND} -d * -type d -regex "${TYPO3WWW}/${TYPO3SRC}/typo3/ext/*.*" | \
-		${SORT} | ${SED} -ne 's#^#@dir(${WWWOWN},${WWWGRP},) #p' >> ${TMPPLIST}
-	@cd ${STAGEDIR}${PREFIX}; \
-		${FIND} * -type d \
-		-path "${TYPO3WWW}/*" \
-		-not \( -regex "${TYPO3WWW}/${PORTNAME}-${TYPO3RELEASE}/*.*" -or \
-		-regex "${TYPO3WWW}/${TYPO3SRC}/typo3/ext/*.*" \) | \
-		${SORT} | ${SED} -ne 's#^#@dir(root,wheel,) #p' >> ${TMPPLIST}
+	@${ECHO} "@dir(${WWWOWN},${WWWGRP},) ${TYPO3WWW}/${TYPO3SRC}/typo3/ext" >> ${TMPPLIST}
 
 .include <bsd.port.mk>