3 files changed, 59 insertions, 19 deletions

diff --git a/www/b2evolution/Makefile b/www/b2evolution/Makefile
index 3ead38f1baea..5a5512c62d4d 100644
--- a/www/b2evolution/Makefile
+++ b/www/b2evolution/Makefile
@@ -7,22 +7,25 @@
 
 PORTNAME=	b2evolution
 PORTVERSION=	0.9.0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	evocms
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${B2EVO_DATE} \
-		xmlrpc_fix_111
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${B2EVO_DATE}${EXTRACT_SUFX} \
+		${PATCH_VER}
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-${B2EVO_DATE}
 
 # Maintainership available: drop me a line if interested :p
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	A multilingual, multiuser, multi-blog engine
 
+PATCH_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+
 USE_ZIP=	YES
 
+PATCH_VER=	xmlrpc_fix_112
 B2EVO_DATE?=	2005-05-06
-USE_PHP=	mysql pcre session xml
+USE_PHP=	mysql pcre session xml xmlrpc
 PHP4_PORT?=	www/mod_php4
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
@@ -30,28 +33,41 @@ WANT_PHP_WEB=	YES
 TMPDIR?=	${PORTNAME}
 WRKSRC=		${WRKDIR}/${TMPDIR}
 
-.if !defined(B2EVO_DIR)
+.if !defined(B2EVO_URL)
 pre-fetch:
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Define B2EVO_DIR to override default of '${B2EVO_DIR}'."
+	@${ECHO_MSG} "Define B2EVO_URL to override default of ${PREFIX}/${WWWDOCROOT}/'${B2EVO_URL}'."
 	@${ECHO_MSG} ""
 .endif
 
+# Get HOSTNAME
+.if exists(/sbin/sysctl)
+HOSTNAME!=	/sbin/sysctl -n kern.hostname
+.else
+HOSTNAME!=	/usr/sbin/sysctl -n kern.hostname
+.endif
+
 WWWDOCROOT?=	www/data
 B2EVO_URL?=	b2evo
 WWWOWN?=	www
 WWWGRP?=	www
 B2EVO_DIR?=	${WWWDOCROOT}/${B2EVO_URL}
+HTACCESS=	${WRKSRC}/blogs/sample.htaccess
 PLIST=		${WRKDIR}/pkg-plist
 
 .include <bsd.port.pre.mk>
 
 post-extract:
-	cd ${WRKSRC}/blogs/b2evocore \
-		&& ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/xmlrpc_fix_111${EXTRACT_SUFX}
+	@${TR} -d \\r < ${HTACCESS} > ${HTACCESS}.unix
+
+post-patch:
+	@cd ${WRKSRC} \
+		&& ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${PATCH_VER}${EXTRACT_SUFX}
+	@${MV} -f ${WRKSRC}/${PATCH_VER}/b2evocore/* ${WRKSRC}/blogs/b2evocore
+	@${RM} -rf ${WRKSRC}/${PATCH_VER}
 
 pre-install:
-	cd ${WRKSRC} && ${FIND} -s . -type f | \
+	@cd ${WRKSRC} && ${FIND} -s . -type f | \
 		${SED} -e 's|^./||;s|^|${B2EVO_DIR}/|' > ${PLIST} \
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm ${B2EVO_DIR}/|' >> ${PLIST} \
@@ -59,11 +75,13 @@ pre-install:
 
 do-install:
 	-${MKDIR} ${PREFIX}/${B2EVO_DIR}
-	@${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${B2EVO_DIR}
 	@${CHMOD} 755 ${PREFIX}/${B2EVO_DIR}
 	@${CP} -R ${WRKSRC}/ ${PREFIX}/${B2EVO_DIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${B2EVO_DIR}
+	@${CHMOD} 665 ${PREFIX}/${B2EVO_DIR}/blogs/conf/_config.php
 
 post-install:
-	@${SED} -e 's|%%B2EVO_URL%%|${B2EVO_URL}|' ${PKGMESSAGE}
+	@${SED} -e 's|%%HOSTNAME%%|${HOSTNAME}|; s|%%B2EVO_URL%%|${B2EVO_URL}|' \
+		${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/b2evolution/distinfo b/www/b2evolution/distinfo
index 00d76574d856..94e17b23ff85 100644
--- a/www/b2evolution/distinfo
+++ b/www/b2evolution/distinfo
@@ -1,4 +1,4 @@
-MD5 (b2evolution-0.9.0.12-2005-05-06) = 7f08250c3d08c2c55e75655fbffa2d98
-SIZE (b2evolution-0.9.0.12-2005-05-06) = 2857939
-MD5 (xmlrpc_fix_111.zip) = b57b76bc30d8cb4857fc66ea53f78344
-SIZE (xmlrpc_fix_111.zip) = 20432
+MD5 (b2evolution-0.9.0.12-2005-05-06.zip) = 7f08250c3d08c2c55e75655fbffa2d98
+SIZE (b2evolution-0.9.0.12-2005-05-06.zip) = 2857939
+MD5 (xmlrpc_fix_112.zip) = 3083b4118e72e1ef87a827c20522bda6
+SIZE (xmlrpc_fix_112.zip) = 22264
diff --git a/www/b2evolution/pkg-message b/www/b2evolution/pkg-message
index daba180ad1c7..c01774807342 100644
--- a/www/b2evolution/pkg-message
+++ b/www/b2evolution/pkg-message
@@ -1,7 +1,29 @@
+==================================================================
+b2evolution is now installed. If you intall it for the first time,
+you may have to follow this steps to make it work correctly.
 
-          **** NOTE ****
-For first use of b2evolution, remember to point your browser to
+1. Create the MySQL database:
 
-  http://localhost/%%B2EVO_URL%%/blogs/install/
+  # mysqladmin --user=root -p create b2evolution
 
-and follow the instructions. 
+2. Create a mysql user/password for b2evolution(database):
+  (change user and/or password if requered)
+
+  # mysql -u root -p
+  mysql> GRANT ALL ON b2evolution.* TO b2evouser@localhost 
+	 IDENTIFIED BY 'b2evopassword';
+  mysql> FLUSH PRIVILEGES;
+  mysql> QUIT;
+
+3.Open b2evo installation page in your web browser 
+  and login with b2evouser/b2evopassword
+
+  http://%%HOSTNAME%%/%%B2EVO_URL%%/blogs/install/
+
+  If you are doing a fresh install...
+  Note that password carefully! It is a random password that is given to you 
+  when you install b2evolution.
+  If you lose it, you will have to delete the database tables and reinstall.
+
+  Have fun!
+==================================================================