Date: Mon, 26 Mar 2007 22:59:10 +0100 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 Message-ID: <20070326215910.GA36622@muffin.acquirer.com> In-Reply-To: <200703261620.l2QGK81p097519@freefall.freebsd.org> References: <200703261528.l2QFSIkU085859@muffin.acquirer.com> <200703261620.l2QGK81p097519@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070326215910.GA36622>