From nick@muffin.acquirer.com  Sat Mar 17 00:59:32 2007
Return-Path: <nick@muffin.acquirer.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7E2CB16A403
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Mar 2007 00:59:32 +0000 (UTC)
	(envelope-from nick@muffin.acquirer.com)
Received: from mail.acquirer.com (87-198-142-10.ptr.magnet.ie [87.198.142.10])
	by mx1.freebsd.org (Postfix) with ESMTP id 021E113C46A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Mar 2007 00:59:31 +0000 (UTC)
	(envelope-from nick@muffin.acquirer.com)
Received: from muffin.acquirer.com (localhost [127.0.0.1])
	by mail.acquirer.com (8.13.6/8.13.6) with ESMTP id l2H0xTJ2020154
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Mar 2007 00:59:29 GMT
	(envelope-from nick@muffin.acquirer.com)
Received: (from nick@localhost)
	by muffin.acquirer.com (8.13.6/8.13.6/Submit) id l2H0xTIg018312;
	Sat, 17 Mar 2007 00:59:29 GMT
	(envelope-from nick)
Message-Id: <200703170059.l2H0xTIg018312@muffin.acquirer.com>
Date: Sat, 17 Mar 2007 00:59:29 GMT
From: Nick Hilliard <nick@foobar.org>
Reply-To: Nick Hilliard <nick@foobar.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: maintainer update: drupal-4.7.6 -> drupal-4.7.6,1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         110412
>Category:       ports
>Synopsis:       maintainer update: drupal-4.7.6 -> drupal-4.7.6,1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 17 01:00:11 GMT 2007
>Closed-Date:    Sun Mar 25 10:03:09 GMT 2007
>Last-Modified:  Sun Mar 25 10:03:09 GMT 2007
>Originator:     Nick Hilliard
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
Network Ability Ltd
>Environment:
System: FreeBSD xx 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Wed May 17 11:38:53 IST 2006 nick@xxx:/data/src/usr.src/src-6.1/src/sys/i386/compile/xxx i386

>Description:

drupal update to:

	1. change bsd.drupal.mk to support drupal5
	2. fix SUB_LIST quoting in bsd.drupal.mk (thanks to brooks@ for this)
	3. fix minor bug in taxonomy.module which caused problems with add-on ticker module

>How-To-Repeat:
>Fix:

diff -bNur drupal.old/Makefile drupal/Makefile
--- drupal.old/Makefile	Tue Mar  6 06:51:50 2007
+++ drupal/Makefile	Sat Mar 17 00:56:49 2007
@@ -7,6 +7,7 @@
 
 PORTNAME=	drupal
 PORTVERSION=	4.7.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.osuosl.org/pub/drupal/files/projects/
 DIST_SUBDIR=	drupal
diff -bNur drupal.old/bsd.drupal.mk drupal/bsd.drupal.mk
--- drupal.old/bsd.drupal.mk	Tue Jan  9 03:15:19 2007
+++ drupal/bsd.drupal.mk	Sat Mar 17 00:19:22 2007
@@ -1,7 +1,11 @@
 # $FreeBSD: ports/www/drupal/bsd.drupal.mk,v 1.3 2007/01/09 03:15:19 brooks Exp $
 #
 
+.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_PORT)
+DRUPAL_BASE?=	www/drupal5
+.else
 DRUPAL_BASE?=	www/drupal
+.endif
 DRUPAL_DIR=	${PREFIX}/${DRUPAL_BASE}
 DRUPAL_DOCSDIR?=	${PREFIX}/${DRUPAL_BASE}/doc
 PLIST_SUB+=	DRUPAL_BASE=${DRUPAL_BASE}
@@ -11,6 +15,8 @@
 DOCSDIR?=	${DRUPAL_DOCSDIR}
 .endif
 
+.if defined(DRUPAL_MODULE) || defined(DRUPAL5_MODULE)
+
 .if defined(DRUPAL_MODULE)
 DRUPAL_VERSION?=	4.7.0
 .if defined(DRUPAL_MODSUBDIR)
@@ -18,6 +24,17 @@
 .else 
 DRUPAL_MODDIR?= ${DRUPAL_BASE}/modules
 .endif
+.else 
+.if defined(DRUPAL5_MODULE)
+DRUPAL_VERSION?=	5.0
+.if defined(DRUPAL_MODSUBDIR)
+DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/modules/${DRUPAL_MODSUBDIR}
+.else
+DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/modules/${PORTNAME}
+.endif
+.endif
+.endif
+
 DOCSDIR?=	${DRUPAL_DOCSDIR}/${PORTNAME}
 
 MASTER_SITES?=	http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -32,8 +49,8 @@
 
 .if defined(MODULE_CONF_FILES)
 SUB_FILES=	pkg-install
-SUB_LIST+=	CONF_FILES=${MODULE_CONF_FILES:C|^|${DRUPAL_MODDIR}/|} \
-		CONF_DIRS=${MODULE_CONF_DIRS:C|^|${DRUPAL_MODDIR}/|}
+SUB_LIST+=	CONF_FILES="${MODULE_CONF_FILES:C|^|${DRUPAL_MODDIR}/|}" \
+		CONF_DIRS="${MODULE_CONF_DIRS:C|^|${DRUPAL_MODDIR}/|}"
 # XXX: where?
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${PKGINSTALL}
diff -bNur drupal.old/files/patch-modules::taxonomy.module drupal/files/patch-modules::taxonomy.module
--- drupal.old/files/patch-modules::taxonomy.module	Thu Jan  1 01:00:00 1970
+++ drupal/files/patch-modules::taxonomy.module	Sat Mar 17 00:25:13 2007
@@ -0,0 +1,11 @@
+--- modules/taxonomy.module~	Fri Feb 23 22:48:32 2007
++++ modules/taxonomy.module	Fri Feb 23 22:48:32 2007
+@@ -557,7 +557,7 @@
+   foreach ($vocabularies as $vid => $vocabulary) {
+     if ($vocabulary->tags && !$free_tags) { continue; }
+     $tree = taxonomy_get_tree($vid);
+-    if ($tree && (count($tree) > 1)) {
++    if ($tree && (count($tree) >= 1)) {
+       $options[$vocabulary->name] = array();
+       foreach ($tree as $term) {
+         $options[$vocabulary->name][$term->tid] = _taxonomy_depth($term->depth, '-') . $term->name;
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Sat Mar 17 12:59:59 UTC 2007 
State-Changed-Why:  
Are you sure you ment PORTEPOCH here? Looks more like PORTREVISION thing to me. 


Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Sat Mar 17 12:59:59 UTC 2007 
Responsible-Changed-Why:  
Are you sure you ment PORTEPOCH here? Looks more like PORTREVISION thing to me. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110412 
State-Changed-From-To: feedback->open 
State-Changed-By: pav 
State-Changed-When: Sat Mar 17 15:49:01 UTC 2007 
State-Changed-Why:  
Submitter is OK with PORTREVISION, patch edited in place 


Responsible-Changed-From-To: pav->freebsd-ports-bugs 
Responsible-Changed-By: pav 
Responsible-Changed-When: Sat Mar 17 15:49:01 UTC 2007 
Responsible-Changed-Why:  
Submitter is OK with PORTREVISION, patch edited in place 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110412 
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Sun Mar 18 05:49:52 UTC 2007 
Responsible-Changed-Why:  
Eat. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110412: commit references a PR
Date: Sun, 25 Mar 2007 09:41:35 +0000 (UTC)

 rafan       2007-03-25 09:41:28 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/drupal5          bsd.drupal.mk 
   Log:
   - Add drupal5 support
   - Fix SUB_LIST quoting
   - Reflect drupal -> drupal4 rename
   
   PR:             ports/110412
   Submitted by:   Nick Hilliard <nick at foobar.org> (maintainer)
   
   Revision  Changes    Path
   1.5       +47 -6     ports/www/drupal5/bsd.drupal.mk
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110412: commit references a PR
Date: Sun, 25 Mar 2007 09:44:58 +0000 (UTC)

 rafan       2007-03-25 09:44:55 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/drupal4          Makefile 
   Added files:
     www/drupal4/files    patch-modules-taxonomy-taxonomy.module 
   Log:
   - Fixing taxonomy module for add-on ticker module
   - Switch to drupal5/bsd.drupal.mk
   - Rename to drupal4-
   
   PR:             ports/110412
   Submitted by:   Nick Hilliard <nick at foobar.org> (maintainer)
   
   Revision  Changes    Path
   1.36      +8 -2      ports/www/drupal4/Makefile
   1.1       +11 -0     ports/www/drupal4/files/patch-modules-taxonomy-taxonomy.module (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Sun Mar 25 10:03:07 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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