From wxs@syn.csh.rit.edu  Sun Oct  2 15:22:47 2005
Return-Path: <wxs@syn.csh.rit.edu>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1636F16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  2 Oct 2005 15:22:47 +0000 (GMT)
	(envelope-from wxs@syn.csh.rit.edu)
Received: from syn.csh.rit.edu (syn.csh.rit.edu [129.21.60.158])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AA29D43D46
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  2 Oct 2005 15:22:46 +0000 (GMT)
	(envelope-from wxs@syn.csh.rit.edu)
Received: from syn.csh.rit.edu (localhost [127.0.0.1])
	by syn.csh.rit.edu (8.13.3/8.13.1) with ESMTP id j92GQOt1053607;
	Sun, 2 Oct 2005 11:26:24 -0500 (EST)
	(envelope-from wxs@syn.csh.rit.edu)
Received: (from wxs@localhost)
	by syn.csh.rit.edu (8.13.3/8.13.1/Submit) id j92GQOUD053606;
	Sun, 2 Oct 2005 11:26:24 -0500 (EST)
	(envelope-from wxs)
Message-Id: <200510021626.j92GQOUD053606@syn.csh.rit.edu>
Date: Sun, 2 Oct 2005 11:26:24 -0500 (EST)
From: Wesley Shields <wxs@csh.rit.edu>
Reply-To: Wesley Shields <wxs@csh.rit.edu>
To: FreeBSD-gnats-submit@freebsd.org
Cc: esn@x123.info
Subject: [PATCH]: Add DRUPDIR to www/drupal
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         86834
>Category:       ports
>Synopsis:       [PATCH]: Add DRUPDIR to www/drupal
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    vsevolod
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 02 15:30:18 GMT 2005
>Closed-Date:    Thu Nov 03 13:50:00 GMT 2005
>Last-Modified:  Thu Nov 03 13:50:00 GMT 2005
>Originator:     Wesley Shields
>Release:        FreeBSD 5.4-RELEASE-p7 i386
>Organization:
>Environment:
System: FreeBSD syn 5.4-RELEASE-p7 FreeBSD 5.4-RELEASE-p7 #3: Wed Sep 7 12:05:17 EST 2005 root@syn:/usr/obj/usr/src/sys/GENERIC i386

>Description:
Add a DRUPDIR knob to www/drupal.  This is just like GALLERYDIR in www/gallery.

I have CC'ed the maintainer on this.

>How-To-Repeat:
N/A

>Fix:

diff -ruN www/drupal.orig/Makefile www/drupal/Makefile
--- www/drupal.orig/Makefile	Fri Sep 16 09:03:50 2005
+++ www/drupal/Makefile	Fri Sep 16 09:02:37 2005
@@ -20,8 +20,18 @@
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 .endif
 
+pre-fetch:
+.if !defined(DRUPDIR)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Define DRUPDIR to override default of 'www/data/drupal'."
+	@${ECHO_MSG} ""
+.endif
+
+DRUPDIR?=	www/data/drupal
+WWWOWN?=	www
+WWWGRP?=	www
+
 NO_BUILD=	yes
-DRUPDIR=	www/data/drupal
 DOCS=		CHANGELOG.txt INSTALL.txt LICENSE.txt MAINTAINERS.txt
 PLIST_SUB+=	DRUPDIR=${DRUPDIR}
 
@@ -64,7 +74,7 @@
 	@${ECHO_MSG} "    GRANT ALL PRIVILEGES ON drupal.* TO nobody@localhost IDENTIFIED BY 'password';"
 	@${ECHO_MSG} "    mysql -u nobody -p drupal <  ${PREFIX}/${DRUPDIR}/database/database.mysql"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} " Then edit the ${PREFIX}/${DRUPDIR}/includes/conf.php to your needs."
+	@${ECHO_MSG} " Then edit the ${PREFIX}/${DRUPDIR}/sites/default/settings.php to your needs."
 	@${ECHO_MSG} " Once you have done that"
 	@${ECHO_MSG} " GoTo: http://<your_website>/drupal"
 	@${ECHO_MSG} ""
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->vsevolod 
Responsible-Changed-By: vsevolod 
Responsible-Changed-When: Sun Oct 2 21:06:55 GMT 2005 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86834 
State-Changed-From-To: open->feedback 
State-Changed-By: vsevolod 
State-Changed-When: Sun Oct 2 21:08:48 GMT 2005 
State-Changed-Why:  
Asked for maintainer approval. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86834 

From: Vsevolod Stakhov <vsevolod@FreeBSD.org>
To: bug-followup@FreeBSD.org, esn@x123.info,
	Wesley Shields <wxs@csh.rit.edu>
Cc:  
Subject: Re: ports/86834: [PATCH]: Add DRUPDIR to www/drupal
Date: Mon, 3 Oct 2005 01:08:42 +0400

 Dear maintainer of www/drupal, do you approve this patch:
 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/86834
State-Changed-From-To: feedback->closed 
State-Changed-By: vsevolod 
State-Changed-When: Thu Nov 3 13:49:53 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

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