Date: Mon, 26 Mar 2007 16:28:18 +0100 (IST) From: Nick Hilliard <nick@foobar.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/110864: maintainer update: drupal5: fix for module installation problem Message-ID: <200703261528.l2QFSIkU085859@muffin.acquirer.com> Resent-Message-ID: <200703261620.l2QGKBJu097550@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703261528.l2QFSIkU085859>