aboutsummaryrefslogtreecommitdiffstats
path: root/www/drupal7
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2007-03-27 21:38:47 +0800
committermiwi <miwi@FreeBSD.org>2007-03-27 21:38:47 +0800
commit957bca0f1b317c2a7e67b83aded2438f793e0830 (patch)
tree9e902baf72ef4195b69d71fe7608ba49085b9c36 /www/drupal7
parent6ceeeafc02f8067730b502ad625ae5292ad7a2cf (diff)
downloadfreebsd-ports-gnome-957bca0f1b317c2a7e67b83aded2438f793e0830.tar.gz
freebsd-ports-gnome-957bca0f1b317c2a7e67b83aded2438f793e0830.tar.zst
freebsd-ports-gnome-957bca0f1b317c2a7e67b83aded2438f793e0830.zip
- Fix build with drupal modules
- Bump PORTREVISION PR 110864 Submitted by: Nick Hilliard <nick@foobar.org> (maintainer)
Diffstat (limited to 'www/drupal7')
-rw-r--r--www/drupal7/Makefile3
-rw-r--r--www/drupal7/bsd.drupal.mk10
-rw-r--r--www/drupal7/pkg-plist2
3 files changed, 13 insertions, 2 deletions
diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile
index 566658442145..6c0555ef14b4 100644
--- a/www/drupal7/Makefile
+++ b/www/drupal7/Makefile
@@ -7,6 +7,7 @@
PORTNAME= drupal5
PORTVERSION= 5.1
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://ftp.osuosl.org/pub/drupal/files/projects/
DISTNAME= drupal-${PORTVERSION}
@@ -62,6 +63,8 @@ do-install:
@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 --git a/www/drupal7/bsd.drupal.mk b/www/drupal7/bsd.drupal.mk
index 1c7f2d067ea4..7b21447ce184 100644
--- a/www/drupal7/bsd.drupal.mk
+++ b/www/drupal7/bsd.drupal.mk
@@ -41,7 +41,6 @@ DOCSDIR?= ${DRUPAL_DOCSDIR}
.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 @@ DRUPAL_MODDIR?= ${DRUPAL_BASE}/modules
.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 @@ DIST_SUBDIR= drupal
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_SUB+= DRUPAL_MODDIR=${DRUPAL_MODDIR}
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 @@ PLIST_DIRS+= %%DOCSDIR%%
.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 --git a/www/drupal7/pkg-plist b/www/drupal7/pkg-plist
index 5d36107e4d1b..2f9aa7018da0 100644
--- a/www/drupal7/pkg-plist
+++ b/www/drupal7/pkg-plist
@@ -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