- Keep modules and themes directory there

PR:		ports/111138
Submitted by:	Nick Hilliard <nick at foobar.org> (maintainer)

2 files changed, 5 insertions, 3 deletions

diff --git a/www/drupal5/Makefile b/www/drupal5/Makefile
index 6c0555ef14b4..b1ac113bf8e9 100644
--- a/www/drupal5/Makefile
+++ b/www/drupal5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drupal5
 PORTVERSION=	5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.osuosl.org/pub/drupal/files/projects/
 DISTNAME=	drupal-${PORTVERSION}
@@ -63,11 +63,11 @@ 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}
+	${MKDIR} ${DRUPAL_DIR}/sites/all/modules ${DRUPAL_DIR}/sites/all/themes
+	${TOUCH} ${DRUPAL_DIR}/sites/all/modules/.keepme ${DRUPAL_DIR}/sites/all/themes/.keepme
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${CP} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
diff --git a/www/drupal5/pkg-plist b/www/drupal5/pkg-plist
index 2f9aa7018da0..1c57c99121b5 100644
--- a/www/drupal5/pkg-plist
+++ b/www/drupal5/pkg-plist
@@ -180,6 +180,8 @@
 %%DRUPAL_BASE%%/scripts/cron-curl.sh
 %%DRUPAL_BASE%%/scripts/cron-lynx.sh
 %%DRUPAL_BASE%%/sites/all/README.txt
+%%DRUPAL_BASE%%/sites/all/modules/.keepme
+%%DRUPAL_BASE%%/sites/all/themes/.keepme
 %%DRUPAL_BASE%%/sites/default/settings.php
 %%DRUPAL_BASE%%/sites/default/settings.php-dist
 %%DRUPAL_BASE%%/themes/bluemarine/block.tpl.php