- Update to 1.7.0.2

- Harden installation by making only required files/directories writable.
- Update pkg-message to say Magento and not Moodle. Also reference
app/etc/local.xml where config.php is said.
- Update pkg-message with a note about app/etc being writeable for installer.
- Add required dependency php5-ctype.
- Fix installation issue with PHP >= 5.4 (backwards compatible)
- Backport a fix for MySQL 5.6 engine check now that have_innodb is removed.
- Update COMMENT and WWW
- Pass maintainership to submitter

PR:		179023
Submitted by:	Melvyn Sopacua <melvyn@magemana.nl>

3 files changed, 34 insertions, 18 deletions

diff --git a/www/magento/Makefile b/www/magento/Makefile
index 3be99c288de0..2249f9bc282c 100644
--- a/www/magento/Makefile
+++ b/www/magento/Makefile
@@ -1,27 +1,35 @@
-# New ports collection makefile for:	magento
-# Date created:				1st March, 2010
-# Whom:					Wen Heping <wen@FreeBSD.org>
-#
+# Created by: Wen Heping <wen@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	magento
-PORTVERSION=	1.7.0.0
+PORTVERSION=	1.7.0.2
 CATEGORIES=	www finance
-MASTER_SITES=	http://www.magentocommerce.com/downloads/assets/1.7.0.0/
+MASTER_SITES=	http://www.magentocommerce.com/downloads/assets/${PORTVERSION}/
 
-MAINTAINER=	wen@FreeBSD.org
-COMMENT=	A feature-rich eCommerce platform
+MAINTAINER=	mel@magemana.nl
+COMMENT=	Feature-rich eCommerce platform
 
-USE_PHP=	pdo_mysql hash gd iconv curl dom soap simplexml mcrypt mysql
+USE_PHP=	pdo_mysql hash gd iconv curl dom soap simplexml mcrypt mysql \
+		ctype
 WRKSRC=		${WRKDIR}/magento
 
+OPTIONS_DEFINE=	MYSQL56
+MYSQL56_DESC=	Add installer patch for MySQL 5.6 server
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMYSQL56}
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-app__code__core__Mage__Install__Model__Installer__Db__Mysql4.php
+.endif
+
 .include <bsd.port.pre.mk>
 
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist
 SUB_FILES=	pkg-message
 SUB_LIST=	MAGENTODIR=${MAGENTODIR}
+WRITABLE=	var media app/etc/modules
+EXECUTABLE=	cron.sh mage
 
 MAGENTODIR?=	www/magento
 
@@ -32,12 +40,20 @@ pre-install:
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${PREFIX}/${MAGENTODIR}
-
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MAGENTODIR}
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MAGENTODIR}' \
+.for _dir in ${WRITABLE}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MAGENTODIR}/${_dir}
+	@${FIND} ${PREFIX}/${MAGENTODIR}/${_dir} -exec ${CHMOD} u+w {} +
+	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MAGENTODIR}/${_dir}' \
+		>> ${TMPPLIST}
+	@${ECHO_CMD} '@exec ${FIND} ${PREFIX}/${MAGENTODIR}/${_dir} -exec ${CHMOD} u+w {} +' \
 		>> ${TMPPLIST}
-	${CHMOD} -R 755 ${PREFIX}/${MAGENTODIR}
-	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${PREFIX}/${MAGENTODIR}' >> ${TMPPLIST}
+.endfor
+.for _prog in ${EXECUTABLE}
+	@${CHMOD} 555 ${PREFIX}/${MAGENTODIR}/${_prog}
+	@${ECHO_CMD} '@exec ${CHMOD} 555 ${PREFIX}/${MAGENTODIR}/${_prog}' >> ${PLIST}
+.endfor
+	@${CHMOD} 777 ${PREFIX}/${MAGENTODIR}/app/etc
+	@${ECHO_CMD} '@exec ${CMMOD} 777 ${PREFIX}/${MAGENTODIR}/${_prog}' >> ${PLIST}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/magento/distinfo b/www/magento/distinfo
index ef0add1c81d9..c5e00821052b 100644
--- a/www/magento/distinfo
+++ b/www/magento/distinfo
@@ -1,2 +1,2 @@
-SHA256 (magento-1.7.0.0.tar.gz) = f56a55ce2801c454cff8ab18258d89c7a84fd52d397c60816c76de59e9bad3e4
-SIZE (magento-1.7.0.0.tar.gz) = 17839115
+SHA256 (magento-1.7.0.2.tar.gz) = d1cc07bc1ed59b3f33240e38d1fe3c60d03a03162c8fcb932700cf16a137e0b9
+SIZE (magento-1.7.0.2.tar.gz) = 17891797
diff --git a/www/magento/pkg-descr b/www/magento/pkg-descr
index c7334131c1fb..04a37c5d9985 100644
--- a/www/magento/pkg-descr
+++ b/www/magento/pkg-descr
@@ -5,4 +5,4 @@ intuitive administration interface features powerful marketing, search engine
 optimization and catalog-management tools to give merchants the power to create
 sites that are tailored to their unique business needs.
 
-WWW:	http://www.magentocommerce.com/
+WWW: http://www.magentocommerce.com/