From nick@muffin.acquirer.com  Mon Mar 26 16:14:42 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 118B016A407
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 26 Mar 2007 16:14:42 +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 6FC8513C45E
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 26 Mar 2007 16:14:38 +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 l2QFSJKZ071410
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 26 Mar 2007 16:28:19 +0100 (IST)
	(envelope-from nick@muffin.acquirer.com)
Received: (from root@localhost)
	by muffin.acquirer.com (8.13.6/8.13.6/Submit) id l2QFSIkU085859;
	Mon, 26 Mar 2007 16:28:18 +0100 (IST)
	(envelope-from nick)
Message-Id: <200703261528.l2QFSIkU085859@muffin.acquirer.com>
Date: Mon, 26 Mar 2007 16:28:18 +0100 (IST)
From: Nick Hilliard <nick@foobar.org>
Reply-To: Nick Hilliard <nick@foobar.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: maintainer update: drupal5: fix for module installation problem
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         110864
>Category:       ports
>Synopsis:       maintainer update: drupal5: fix for module installation problem
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 26 16:20:08 GMT 2007
>Closed-Date:    Tue Mar 27 13:39:15 GMT 2007
>Last-Modified:  Tue Mar 27 13:39:15 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:

Oops, bsd.drupal.mk was missing some code required by module installations.

Also, we can save a line of Makefile by doing the right thing for RUN_DEPENDS.

>How-To-Repeat:
>Fix:

diff -ur drupal5.old/bsd.drupal.mk drupal5/bsd.drupal.mk
--- drupal5.old/bsd.drupal.mk	Sun Mar 25 10:41:28 2007
+++ drupal5/bsd.drupal.mk	Mon Mar 26 16:25:21 2007
@@ -41,7 +41,6 @@
 .if defined(DRUPAL_MODULE)
 
 .if defined(DRUPAL4_MODULE)
-RUN_DEPENDS+=	${LOCALBASE}/${DRUPAL_BASE}/index.php:${PORTSDIR}/www/drupal4
 PKGNAMEPREFIX=	drupal4-
 DRUPAL_VERSION?=	4.7.0
 .if defined(DRUPAL_MODSUBDIR)
@@ -52,7 +51,6 @@
 .endif
 
 .if defined(DRUPAL5_MODULE)
-RUN_DEPENDS+=	${LOCALBASE}/${DRUPAL_BASE}/index.php:${PORTSDIR}/www/drupal5
 PKGNAMEPREFIX=	drupal5-
 DRUPAL_VERSION?=	5.0
 .if defined(DRUPAL_MODSUBDIR)
@@ -70,6 +68,7 @@
 NO_BUILD?=	yes
 
 WRKSRC?=	${WRKDIR}/${PORTNAME}
+RUN_DEPENDS+=	${LOCALBASE}/${DRUPAL_BASE}/index.php:${PORTSDIR}/${DRUPAL_BASE}
 
 .if defined(MODULE_CONF_FILES)
 SUB_FILES=	pkg-install
@@ -94,6 +93,10 @@
 .endif
 
 do-install:
+.if defined(DRUPAL5_MODULE)
+	@${MKDIR} ${DRUPAL_MODDIR:C|^|${PREFIX}/|}
+	@${CHOWN} ${WWWOWN}:${WWWGRP} ${DRUPAL_MODDIR:C|^|${PREFIX}/|}
+.endif
 .if defined(MODULE_CONF_DIRS)
 	@${MKDIR} ${MODULE_CONF_DIRS:C|^|${PREFIX}/${DRUPAL_MODDIR}/|}
 	@${CHOWN} ${WWWOWN}:${WWWGRP} ${MODULE_CONF_DIRS:C|^|${PREFIX}/${DRUPAL_MODDIR}/|}


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Mon Mar 26 17:00:34 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

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

From: Nick Hilliard <nick@foobar.org>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc: Nick Hilliard <nick@foobar.org>
Subject: Re: ports/110864: maintainer update: drupal5: fix for module installation problem
Date: Mon, 26 Mar 2007 22:59:10 +0100

 Slightly updated patch included.  This includes a fix for the extraneous
 dirctories noted by miwi@ in ports/110865, ports/110866 and ports/110867.
 
 Nick
 --
 
 diff -ur drupal5.orig/Makefile drupal5/Makefile
 --- drupal5.orig/Makefile	Sun Mar 25 10:42:17 2007
 +++ drupal5/Makefile	Mon Mar 26 22:27:17 2007
 @@ -62,6 +62,8 @@
  	@if [ ! -f ${DRUPAL_DIR}/sites/default/settings.php ]; then \
  		${CP} -p ${DRUPAL_DIR}/sites/default/settings.php-dist ${DRUPAL_DIR}/sites/default/settings.php ; \
  	fi
 +	${MKDIR} ${DRUPAL_DIR}/sites/all/modules
 +	${MKDIR} ${DRUPAL_DIR}/sites/all/themes
  	${CP} -R ${WRKSRC}/themes ${DRUPAL_DIR}
  	${CP} ${WRKSRC}/update.php ${DRUPAL_DIR}
  	${CP} ${WRKSRC}/xmlrpc.php ${DRUPAL_DIR}
 diff -ur drupal5.orig/bsd.drupal.mk drupal5/bsd.drupal.mk
 --- drupal5.orig/bsd.drupal.mk	Sun Mar 25 10:41:28 2007
 +++ drupal5/bsd.drupal.mk	Mon Mar 26 22:25:40 2007
 @@ -41,7 +41,6 @@
  .if defined(DRUPAL_MODULE)
  
  .if defined(DRUPAL4_MODULE)
 -RUN_DEPENDS+=	${LOCALBASE}/${DRUPAL_BASE}/index.php:${PORTSDIR}/www/drupal4
  PKGNAMEPREFIX=	drupal4-
  DRUPAL_VERSION?=	4.7.0
  .if defined(DRUPAL_MODSUBDIR)
 @@ -52,7 +51,6 @@
  .endif
  
  .if defined(DRUPAL5_MODULE)
 -RUN_DEPENDS+=	${LOCALBASE}/${DRUPAL_BASE}/index.php:${PORTSDIR}/www/drupal5
  PKGNAMEPREFIX=	drupal5-
  DRUPAL_VERSION?=	5.0
  .if defined(DRUPAL_MODSUBDIR)
 @@ -70,6 +68,7 @@
  NO_BUILD?=	yes
  
  WRKSRC?=	${WRKDIR}/${PORTNAME}
 +RUN_DEPENDS+=	${LOCALBASE}/${DRUPAL_BASE}/index.php:${PORTSDIR}/${DRUPAL_BASE}
  
  .if defined(MODULE_CONF_FILES)
  SUB_FILES=	pkg-install
 @@ -84,6 +83,9 @@
  PLIST_FILES+=	${MODULE_FILES:C|^|%%DRUPAL_MODDIR%%/|}
  PLIST_FILES+=	${MODULE_CONF_FILES:C|^|%%DRUPAL_MODDIR%%/|:C|$|-dist|}
  PLIST_DIRS+=	${MODULE_DIRS:C|^|%%DRUPAL_MODDIR%%/|}
 +.if defined(DRUPAL5_MODULE)
 +PLIST_DIRS+=	${DRUPAL_MODDIR}
 +.endif
  .if defined(DRUPAL_MODSUBDIR)
  PLIST_DIRS+=	${DRUPAL_MODDIR}
  .endif
 @@ -94,6 +96,10 @@
  .endif
  
  do-install:
 +.if defined(DRUPAL5_MODULE)
 +	@${MKDIR} ${DRUPAL_MODDIR:C|^|${PREFIX}/|}
 +	@${CHOWN} ${WWWOWN}:${WWWGRP} ${DRUPAL_MODDIR:C|^|${PREFIX}/|}
 +.endif
  .if defined(MODULE_CONF_DIRS)
  	@${MKDIR} ${MODULE_CONF_DIRS:C|^|${PREFIX}/${DRUPAL_MODDIR}/|}
  	@${CHOWN} ${WWWOWN}:${WWWGRP} ${MODULE_CONF_DIRS:C|^|${PREFIX}/${DRUPAL_MODDIR}/|}
 diff -ur drupal5.orig/pkg-plist drupal5/pkg-plist
 --- drupal5.orig/pkg-plist	Sun Mar 25 10:42:17 2007
 +++ drupal5/pkg-plist	Mon Mar 26 22:27:35 2007
 @@ -327,6 +327,8 @@
  @dirrm %%DRUPAL_BASE%%/themes/pushbutton
  @dirrm %%DRUPAL_BASE%%/themes
  @dirrmtry %%DRUPAL_BASE%%/files
 +@dirrmtry %%DRUPAL_BASE%%/sites/all/modules
 +@dirrmtry %%DRUPAL_BASE%%/sites/all/themes
  @dirrmtry %%DRUPAL_BASE%%/sites/all
  @dirrmtry %%DRUPAL_BASE%%/sites/default
  @dirrmtry %%DRUPAL_BASE%%/sites
 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Tue Mar 27 13:39:09 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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