- Update to 3.2.0

- Fix path of php executable in test files
- Allow staging

www/joomla31/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	joomla
-PORTVERSION=	3.1.1
+PORTVERSION=	3.2.0
 CATEGORIES=	www
 PKGNAMESUFFIX=	3
 
@@ -13,11 +13,16 @@ LICENSE=	GPLv2
 
 GH_ACCOUNT=	${PORTNAME}
 GH_PROJECT=	${PORTNAME}-cms
-GH_COMMIT=	9bafaf2
+GH_COMMIT=	acb7a63
 
 NO_BUILD=	yes
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
+PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+php_OLD_CMD=	C:\\\xampp\\\php\\\.\\\php.exe
+
+REINPLACE_ARGS=	-i '' -E -e 's,(${php_OLD_CMD})|(/usr/bin/php),${LOCALBASE}/bin/php,g'
+REINPLACE_FILES=	build/indexmaker.php tests/system/phpunit.php \
+			tests/system/webdriver/tests/phpunit.php
 
 SUB_FILES=	pkg-message
 
@@ -26,21 +31,19 @@ USE_MYSQL=	yes
 USE_PHP=	gd json mbstring mysql mysqli pcre pdf session simplexml xml zip zlib
 
 WANT_PHP_WEB=	yes
-WWWDIR=	${PREFIX}/www/joomla31
+WWWDIR=	${PREFIX}/www/${PORTNAME}${PORTVERSION:R:R}
+
+pre-patch:
+	@(cd ${WRKSRC} && ${REINPLACE_CMD} ${REINPLACE_FILES})
 
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${WWWDIR}
-	@cd ${WRKSRC} && \
-		${FIND} . -type d -exec ${MKDIR} ${WWWDIR}/{} \; \
-			-exec ${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/{} \;
-	@cd ${WRKSRC} && \
-		${FIND} . \! -type d -and \! \
-			\( -name .gitignore -or -name LICENSE.txt -or -name README.md \) \
-			-exec ${INSTALL_DATA} {} ${WWWDIR}/{} \; \
-			-exec ${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/{} \;
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
+	@(cd ${WRKSRC} && \
+		${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${WWWDIR}/{} \;)
+	@(cd ${WRKSRC} && \
+		${FIND} . \! -type d -and \! \( -name .gitignore -or -name .travis.yml \
+			-or -name travisci-phpunit.xml -or -name LICENSE.txt \
+			-or -name README.md \) \
+			-exec ${INSTALL_DATA} {} ${STAGEDIR}${WWWDIR}/{} \;)
 
 .include <bsd.port.mk>

www/joomla31/distinfo

@@ -1,2 +1,2 @@
-SHA256 (joomla-3.1.1.tar.gz) = 074ad7cf57c6aad0e84c8329f52232268c2ef987aad2df3d23b690e3be6e1cdd
-SIZE (joomla-3.1.1.tar.gz) = 6719086
+SHA256 (joomla-3.2.0.tar.gz) = 3d49d2b0c9ad7e0dae12675d9ab3aabb11bb05f5b260a22722d33533651fe50f
+SIZE (joomla-3.2.0.tar.gz) = 9549592