From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Mar 26 16:20:11 2007
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
X-Original-To: freebsd-ports-bugs@hub.freebsd.org
Delivered-To: freebsd-ports-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id B06A116A404
for <freebsd-ports-bugs@hub.freebsd.org>;
Mon, 26 Mar 2007 16:20:11 +0000 (UTC)
(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40])
by mx1.freebsd.org (Postfix) with ESMTP id 8F00713C43E
for <freebsd-ports-bugs@hub.freebsd.org>;
Mon, 26 Mar 2007 16:20:11 +0000 (UTC)
(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l2QGKBH9097551
for <freebsd-ports-bugs@freefall.freebsd.org>;
Mon, 26 Mar 2007 16:20:11 GMT
(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l2QGKBJu097550;
Mon, 26 Mar 2007 16:20:11 GMT (envelope-from gnats)
Resent-Date: Mon, 26 Mar 2007 16:20:11 GMT
Resent-Message-Id: <200703261620.l2QGKBJu097550@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-ports-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
Nick Hilliard <nick@foobar.org>
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>
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.113
Cc:
Subject: ports/110864: maintainer update: drupal5: fix for module
installation problem
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Nick Hilliard <nick@foobar.org>
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Mar 2007 16:20:11 -0000
>Number: 110864
>Category: ports
>Synopsis: maintainer update: drupal5: fix for module installation problem
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 26 16:20:08 GMT 2007
>Closed-Date:
>Last-Modified:
>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:
>Unformatted: