13 files changed, 14 insertions, 14 deletions

diff --git a/www/drupal4-attachment/Makefile b/www/drupal4-attachment/Makefile
index 0c05e2f3428d..eb5fcf69a216 100644
--- a/www/drupal4-attachment/Makefile
+++ b/www/drupal4-attachment/Makefile
@@ -13,12 +13,12 @@ CATEGORIES=	www security
 MAINTAINER=	nick@foobar.org
 COMMENT=	An alternative to Drupal's included upload module
 
-RUN_DEPENDS+=	${LOCALBASE}/${DRUPAL_MODDIR}/filemanager.module:${PORTSDIR}/www/drupal-filemanager
+RUN_DEPENDS+=	${LOCALBASE}/${DRUPAL_MODDIR}/filemanager.module:${PORTSDIR}/www/drupal4-filemanager
 
 DRUPAL_MODULE=	yes
 MODULE_FILES=	attachment.install attachment.module
 DOC_FILES=	LICENSE.txt README.txt CREDITS INSTALL
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/drupal/bsd.drupal.mk"
+.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal4-filemanager/Makefile b/www/drupal4-filemanager/Makefile
index 147bbe42dda1..f20301fd2086 100644
--- a/www/drupal4-filemanager/Makefile
+++ b/www/drupal4-filemanager/Makefile
@@ -19,5 +19,5 @@ DOC_DIRS=	doc
 DOC_FILES=	LICENSE.txt README.txt CREDITS INSTALL doc/filemanager.php
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/drupal/bsd.drupal.mk"
+.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal4-gsitemap/Makefile b/www/drupal4-gsitemap/Makefile
index fcccc9e1c100..8a5dadfda11b 100644
--- a/www/drupal4-gsitemap/Makefile
+++ b/www/drupal4-gsitemap/Makefile
@@ -19,5 +19,5 @@ MODULE_FILES=	gsitemap.install gsitemap.module
 DOC_FILES=	INSTALL.txt LICENSE.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/drupal/bsd.drupal.mk"
+.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal4-i18n/Makefile b/www/drupal4-i18n/Makefile
index f9fa9ccc6bb6..f42c02523c68 100644
--- a/www/drupal4-i18n/Makefile
+++ b/www/drupal4-i18n/Makefile
@@ -29,5 +29,5 @@ MODULE_DIRS=	flags i18nprofile
 DOC_FILES=	CHANGELOG.txt CREDITS.txt HOWTO.txt INSTALL.txt LICENSE.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/drupal/bsd.drupal.mk"
+.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal4-nice_menus/Makefile b/www/drupal4-nice_menus/Makefile
index f02de2ee8a02..c3aef8d271d4 100644
--- a/www/drupal4-nice_menus/Makefile
+++ b/www/drupal4-nice_menus/Makefile
@@ -20,5 +20,5 @@ MODULE_FILES=	arrow-down.png arrow-left.png arrow-right.png \
 DOC_FILES=	LICENSE.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/drupal/bsd.drupal.mk"
+.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal4-taxonomy_access/Makefile b/www/drupal4-taxonomy_access/Makefile
index e9485c5b4864..08cea34c815c 100644
--- a/www/drupal4-taxonomy_access/Makefile
+++ b/www/drupal4-taxonomy_access/Makefile
@@ -20,5 +20,5 @@ MODULE_FILES=	taxonomy_access.install taxonomy_access.module taxonomy_access_adm
 DOC_FILES=	INSTALL.txt LICENSE.txt README.txt UPDATE.txt
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/drupal/bsd.drupal.mk"
+.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal4-textile/Makefile b/www/drupal4-textile/Makefile
index 75a0611f53fb..0cbaf64048b3 100644
--- a/www/drupal4-textile/Makefile
+++ b/www/drupal4-textile/Makefile
@@ -45,5 +45,5 @@ DOC_FILES=	CHANGELOG.txt CREDITS.txt INSTALL.txt LICENSE.txt README.txt \
 		textilephp/TODO
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/drupal/bsd.drupal.mk"
+.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal5-gsitemap/Makefile b/www/drupal5-gsitemap/Makefile
index fcccc9e1c100..8a5dadfda11b 100644
--- a/www/drupal5-gsitemap/Makefile
+++ b/www/drupal5-gsitemap/Makefile
@@ -19,5 +19,5 @@ MODULE_FILES=	gsitemap.install gsitemap.module
 DOC_FILES=	INSTALL.txt LICENSE.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/drupal/bsd.drupal.mk"
+.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal5-i18n/Makefile b/www/drupal5-i18n/Makefile
index f9fa9ccc6bb6..f42c02523c68 100644
--- a/www/drupal5-i18n/Makefile
+++ b/www/drupal5-i18n/Makefile
@@ -29,5 +29,5 @@ MODULE_DIRS=	flags i18nprofile
 DOC_FILES=	CHANGELOG.txt CREDITS.txt HOWTO.txt INSTALL.txt LICENSE.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/drupal/bsd.drupal.mk"
+.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal5-nice_menus/Makefile b/www/drupal5-nice_menus/Makefile
index f02de2ee8a02..c3aef8d271d4 100644
--- a/www/drupal5-nice_menus/Makefile
+++ b/www/drupal5-nice_menus/Makefile
@@ -20,5 +20,5 @@ MODULE_FILES=	arrow-down.png arrow-left.png arrow-right.png \
 DOC_FILES=	LICENSE.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/drupal/bsd.drupal.mk"
+.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal5-taxonomy_access/Makefile b/www/drupal5-taxonomy_access/Makefile
index e9485c5b4864..08cea34c815c 100644
--- a/www/drupal5-taxonomy_access/Makefile
+++ b/www/drupal5-taxonomy_access/Makefile
@@ -20,5 +20,5 @@ MODULE_FILES=	taxonomy_access.install taxonomy_access.module taxonomy_access_adm
 DOC_FILES=	INSTALL.txt LICENSE.txt README.txt UPDATE.txt
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/drupal/bsd.drupal.mk"
+.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal5-xmlsitemap/Makefile b/www/drupal5-xmlsitemap/Makefile
index fcccc9e1c100..8a5dadfda11b 100644
--- a/www/drupal5-xmlsitemap/Makefile
+++ b/www/drupal5-xmlsitemap/Makefile
@@ -19,5 +19,5 @@ MODULE_FILES=	gsitemap.install gsitemap.module
 DOC_FILES=	INSTALL.txt LICENSE.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/drupal/bsd.drupal.mk"
+.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-nice_menus/Makefile b/www/drupal6-nice_menus/Makefile
index f02de2ee8a02..c3aef8d271d4 100644
--- a/www/drupal6-nice_menus/Makefile
+++ b/www/drupal6-nice_menus/Makefile
@@ -20,5 +20,5 @@ MODULE_FILES=	arrow-down.png arrow-left.png arrow-right.png \
 DOC_FILES=	LICENSE.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/drupal/bsd.drupal.mk"
+.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
 .include <bsd.port.post.mk>