ports/114634: maintainer update: www/b2evolution

[Sergei Vyshenski]

>Number:         114634
>Category:       ports
>Synopsis:       maintainer update: www/b2evolution
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 16 15:30:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Sergei Vyshenski
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD ox.pn.sinp.msu.ru 6.2-STABLE FreeBSD 6.2-STABLE #0: Fri Jun 29 19:24:03 MSD 2007 root at ox.pn.sinp.msu.ru:/usr/obj/usr/src/sys/OX i386


	
>Description:
	added missing conditional dependency on appropriate version of MySQL server
>How-To-Repeat:
	
>Fix:

	


diff -ur www/b2evolution/Makefile www/b2evolution.new/Makefile
--- www/b2evolution/Makefile	Fri Jun 15 16:52:11 2007
+++ www/b2evolution.new/Makefile	Mon Jul 16 18:55:05 2007
@@ -7,6 +7,7 @@
 
 PORTNAME=	b2evolution
 PORTVERSION=	1.10.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	evocms
@@ -27,12 +28,18 @@
 
 TMPDIR?=	${PORTNAME}
 WRKSRC=		${WRKDIR}/${TMPDIR}
-
 B2EVO_URL?=	b2evo
 B2EVO_DIR?=	www/${B2EVO_URL}
 PLIST=		${WRKDIR}/pkg-plist
 
+OPTIONS=	LOCAL_DB_SERVER "Want to use local MySQL server?" on
+
 .include <bsd.port.pre.mk>
+
+.if defined(WITH_LOCAL_DB_SERVER)
+USE_MYSQL=	YES
+RUN_DEPENDS+=	mysql-server>=0:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
+.endif
 
 pre-install:
 	@cd ${WRKSRC} && ${FIND} -s . -type f | \
Only in www/b2evolution.new: b2evolution
diff -ur www/b2evolution/pkg-message www/b2evolution.new/pkg-message
--- www/b2evolution/pkg-message	Fri Jun 15 16:52:11 2007
+++ www/b2evolution.new/pkg-message	Mon Jul 16 19:12:32 2007
@@ -2,34 +2,38 @@
 b2evolution is now installed. If you install it for the first time,
 you may need to perform the following steps.
 
-1. Create the MySQL database:
+1. Make sure your mysql-server is running.
 
-  # mysqladmin --user=root -p create b2evolution
+2. Create the MySQL database:
 
-2. Create a mysql user/password for the b2evolution database:
+   # mysqladmin --user=root -p create b2evolution
+
+   (in mysql root's password is empty unless you have set it in advance).
+
+3. Create a mysql user/password for the b2evolution database:
   (change user and/or password if required)
 
-  # mysql -u root -p
-  mysql> GRANT ALL ON b2evolution.* TO b2evouser at localhost 
-	 IDENTIFIED BY 'b2evopassword';
-  mysql> FLUSH PRIVILEGES;
-  mysql> QUIT;
-
-3. Please add the following to your apache config, and restart.
-    #
-    # Directives to allow use of b2evolution
-    #
-    Alias /%%B2EVO_URL%% "%%TARGETDIR%%/%%B2EVO_DIR%%/"
-
-4.Open b2evo installation page in your web browser 
-  and login with b2evouser/b2evopassword
-
-  http://www.your.host/%%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.
+   # mysql -u root -p
+   mysql> GRANT ALL ON b2evolution.* TO b2evouser at localhost 
+ 	  IDENTIFIED BY 'b2evopassword';
+   mysql> FLUSH PRIVILEGES;
+   mysql> QUIT;
+
+4. Add the following to your apache config, and restart.
+   #
+   # Directives to allow use of b2evolution
+   #
+   Alias /%%B2EVO_URL%% "%%TARGETDIR%%/%%B2EVO_DIR%%/"
+   #
+
+5. Open b2evo installation page in your web browser 
+   and login with b2evouser/b2evopassword
+
+   http://www.your.host/%%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!
 ==================================================================
>Release-Note:
>Audit-Trail:
>Unformatted: