From svysh@pn.sinp.msu.ru  Mon Jul 16 15:27:11 2007
Return-Path: <svysh@pn.sinp.msu.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 81EB616A405
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 16 Jul 2007 15:27:11 +0000 (UTC)
	(envelope-from svysh@pn.sinp.msu.ru)
Received: from ox.pn.sinp.msu.ru (ox.pn.sinp.msu.ru [213.131.11.253])
	by mx1.freebsd.org (Postfix) with ESMTP id 1575413C4A6
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 16 Jul 2007 15:27:10 +0000 (UTC)
	(envelope-from svysh@pn.sinp.msu.ru)
Received: from ox.pn.sinp.msu.ru (localhost [127.0.0.1])
	by ox.pn.sinp.msu.ru (8.14.1/8.14.1) with ESMTP id l6GFGS9s087447
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 16 Jul 2007 19:16:28 +0400 (MSD)
	(envelope-from svysh@ox.pn.sinp.msu.ru)
Received: (from svysh@localhost)
	by ox.pn.sinp.msu.ru (8.14.1/8.14.1/Submit) id l6GFGSmw087446;
	Mon, 16 Jul 2007 19:16:28 +0400 (MSD)
	(envelope-from svysh)
Message-Id: <200707161516.l6GFGSmw087446@ox.pn.sinp.msu.ru>
Date: Mon, 16 Jul 2007 19:16:28 +0400 (MSD)
From: Sergei Vyshenski <svysh@pn.sinp.msu.ru>
Reply-To: Sergei Vyshenski <svysh@pn.sinp.msu.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: maintainer update: www/b2evolution
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         114634
>Category:       ports
>Synopsis:       maintainer update: www/b2evolution
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 16 15:30:02 GMT 2007
>Closed-Date:    Tue Aug 28 22:03:25 GMT 2007
>Last-Modified:  Tue Aug 28 22:03:25 GMT 2007
>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@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@localhost 
-	 IDENTIFIED BY 'b2evopassword';
-  mysql> FLUSH PRIVILEGES;
-  mysql> QUIT;
-
-3. Please add the following to your apache config, and restart.
-    [1;32m#
-    # Directives to allow use of b2evolution
-    #
-    Alias /%%B2EVO_URL%% "%%TARGETDIR%%/%%B2EVO_DIR%%/"[m
-
-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@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:

From: Sergei Vyshenski <svysh@pn.sinp.msu.ru>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/114634: maintainer update: www/b2evolution
Date: Mon, 06 Aug 2007 15:35:11 +0400

 Please disregard this PR in favor of a new 
 PR ports/115243,
 which respects recent (Aug 4) commit of gabor,
 changing DESTDIR into PREFIX.
 
 FreeBSD-gnats-submit@FreeBSD.org wrote:
 > Thank you very much for your problem report.
 > It has the internal identification `ports/114634'.
 > The individual assigned to look at your
 > report is: freebsd-ports-bugs. 
 > 
 > You can access the state of your problem report at any time
 > via this link:
 > 
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=114634
 > 
 >> Category:       ports
 >> Responsible:    freebsd-ports-bugs
 >> Synopsis:       maintainer update: www/b2evolution
 >> Arrival-Date:   Mon Jul 16 15:30:02 GMT 2007
 
State-Changed-From-To: open->closed 
State-Changed-By: okazaki 
State-Changed-When: Tue Aug 28 22:01:26 UTC 2007 
State-Changed-Why:  
Superseded by ports/115243 

http://www.freebsd.org/cgi/query-pr.cgi?pr=114634 
>Unformatted:
