54 files changed, 108 insertions, 27 deletions

diff --git a/www/drupal5-adsense/Makefile b/www/drupal5-adsense/Makefile
index 74c4d8ff1748..2532fcba8580 100644
--- a/www/drupal5-adsense/Makefile
+++ b/www/drupal5-adsense/Makefile
@@ -13,6 +13,9 @@ CATEGORIES=	www
 MAINTAINER=	nick@foobar.org
 COMMENT=	Allows web site owners to display ads on their site using Google AdSense
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_FILES=	adsense.admin.inc adsense.info adsense.install \
 		adsense.module cse/help/adsense_cse.help.inc \
diff --git a/www/drupal5-bluebreeze/Makefile b/www/drupal5-bluebreeze/Makefile
index 484016f2695a..904822f53b44 100644
--- a/www/drupal5-bluebreeze/Makefile
+++ b/www/drupal5-bluebreeze/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	${MASTER_SITE_DRUPAL}
 MAINTAINER=	g_glasson@jimali.dyndns.org
 COMMENT=	The bluebreeze theme wants to combine style with good usability
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_THEME=	yes
 MODULE_DIRS=	bluebreeze-fixed images
 MODULE_FILES=	block.tpl.php box.tpl.php comment.tpl.php favicon.ico layout.css logo.png \
diff --git a/www/drupal5-bookreview/Makefile b/www/drupal5-bookreview/Makefile
index 33d29041b8e5..81bbf3db1580 100644
--- a/www/drupal5-bookreview/Makefile
+++ b/www/drupal5-bookreview/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	g_glasson@jimali.dyndns.org
 COMMENT=	The book review module allows a site to publish book reviews.
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_DIRS=	po
 MODULE_FILES=	bookreview.info bookreview.install bookreview.module bookreview.css \
diff --git a/www/drupal5-cck/Makefile b/www/drupal5-cck/Makefile
index 42fcebc8767f..3fe8284d6faf 100644
--- a/www/drupal5-cck/Makefile
+++ b/www/drupal5-cck/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	jeremy@algenta.com
 COMMENT=	Content Construction Kit (CCK) module for Drupal 5
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_DIRS=	po theme
 MODULE_FILES=	content.css content.info content.install content.module content_admin.css \
diff --git a/www/drupal5-disknode/Makefile b/www/drupal5-disknode/Makefile
index 65549448cc78..6b4994642f48 100644
--- a/www/drupal5-disknode/Makefile
+++ b/www/drupal5-disknode/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	${MASTER_SITE_DRUPAL}
 MAINTAINER=	g_glasson@jimali.dyndns.org
 COMMENT=	File download module
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_DIRS=	po
 MODULE_FILES=	po/disknode-module.pot disknode.browse.tpl.inc disknode.inc \
diff --git a/www/drupal5-google_analytics/Makefile b/www/drupal5-google_analytics/Makefile
index 7c6b3fb2ad2e..c4436e730727 100644
--- a/www/drupal5-google_analytics/Makefile
+++ b/www/drupal5-google_analytics/Makefile
@@ -13,6 +13,9 @@ CATEGORIES=	www
 MAINTAINER=	nick@foobar.org
 COMMENT=	Adds the Google Analytics web statistics tracking system to your website.
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_FILES=	googleanalytics.info googleanalytics.install googleanalytics.js \
 		googleanalytics.module po/ca.po po/de.po po/es.po po/fr.po \
diff --git a/www/drupal5-i18n/Makefile b/www/drupal5-i18n/Makefile
index ea3bb2c680ad..d5f93cf0080a 100644
--- a/www/drupal5-i18n/Makefile
+++ b/www/drupal5-i18n/Makefile
@@ -13,6 +13,9 @@ CATEGORIES=	www
 MAINTAINER=	nick@foobar.org
 COMMENT=	An internationalisation module for the Drupal CMS
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 
 MODULE_DIRS=	contrib/po contrib experimental flags i18nblocks/po \
diff --git a/www/drupal5-imagecache/Makefile b/www/drupal5-imagecache/Makefile
index 0fe572b336fd..bf7ca1cb7d2d 100644
--- a/www/drupal5-imagecache/Makefile
+++ b/www/drupal5-imagecache/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	jeremy@algenta.com
 COMMENT=	Imagecache module for Drupal 5
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_FILES=	imagecache.info imagecache.install imagecache.module
 DOC_FILES=	LICENSE.txt README.txt
diff --git a/www/drupal5-imagefield/Makefile b/www/drupal5-imagefield/Makefile
index 4016e7146aca..fa61c3bcd341 100644
--- a/www/drupal5-imagefield/Makefile
+++ b/www/drupal5-imagefield/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	jeremy@algenta.com
 COMMENT=	Image Field module for Drupal 5
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_FILES=	imagefield.css imagefield.info imagefield.install \
 		imagefield.module
diff --git a/www/drupal5-insert-view/Makefile b/www/drupal5-insert-view/Makefile
index cd0b8b6e7910..8ff8005acdf2 100644
--- a/www/drupal5-insert-view/Makefile
+++ b/www/drupal5-insert-view/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	g_glasson@jimali.dyndns.org
 COMMENT=	Embeds content lists generated by the Views module
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_FILES=	insert_view.info insert_view.module
 DOC_FILES=	LICENSE.txt README.txt
diff --git a/www/drupal5-nice_menus/Makefile b/www/drupal5-nice_menus/Makefile
index 1ef9e8203e21..4342f435f7ac 100644
--- a/www/drupal5-nice_menus/Makefile
+++ b/www/drupal5-nice_menus/Makefile
@@ -13,6 +13,9 @@ CATEGORIES=	www
 MAINTAINER=	nick@foobar.org
 COMMENT=	CSS / Javascript pull-down menus for Drupal
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 
 MODULE_FILES=	po/ja.po po/nice_menus.pot arrow-down.png arrow-left.png \
diff --git a/www/drupal5-nodewords/Makefile b/www/drupal5-nodewords/Makefile
index 4fedfc847dcd..3028a5a019cb 100644
--- a/www/drupal5-nodewords/Makefile
+++ b/www/drupal5-nodewords/Makefile
@@ -13,6 +13,9 @@ CATEGORIES=	www
 MAINTAINER=	nick@foobar.org
 COMMENT=	A drupal module which allows the end-user to set meta tags for nodes
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_DIRS=	metatags
 MODULE_FILES=	metatags/DC.Title.inc metatags/Revisit-After.inc \
diff --git a/www/drupal5-securepages/Makefile b/www/drupal5-securepages/Makefile
index ad493fc437dc..b80a19c104eb 100644
--- a/www/drupal5-securepages/Makefile
+++ b/www/drupal5-securepages/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Set which pages are always going to be used in secure mode (SSL)
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_DIRS=	po
 MODULE_FILES=	securepages.install securepages.module securepages.info
diff --git a/www/drupal5-simplenews/Makefile b/www/drupal5-simplenews/Makefile
index 84c0cb317a80..d5b9f3f5cf05 100644
--- a/www/drupal5-simplenews/Makefile
+++ b/www/drupal5-simplenews/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	g_glasson@jimali.dyndns.org
 COMMENT=	A simple newsletter module which allows both anonymous as well as registered users to subscribe to different newsletters.
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_DIRS=	po
 MODULE_FILES=	simplenews.info simplenews.install simplenews.module sn-cron.png sn-saved.png \
diff --git a/www/drupal5-tagadelic/Makefile b/www/drupal5-tagadelic/Makefile
index 34dadb5b9ac8..fc1e13692d11 100644
--- a/www/drupal5-tagadelic/Makefile
+++ b/www/drupal5-tagadelic/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Tagadelic module for Drupal 5
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_DIRS=	po
 MODULE_FILES=	tagadelic.info tagadelic.css tagadelic.module \
diff --git a/www/drupal5-tapir/Makefile b/www/drupal5-tapir/Makefile
index 39e249a537dc..e06a0673fdbb 100644
--- a/www/drupal5-tapir/Makefile
+++ b/www/drupal5-tapir/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	jeremy@algenta.com
 COMMENT=	Tables API (TAPIr) module for Drupal 5
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_FILES=	tapir.info tapir.module
 DOC_FILES=	LICENSE.txt
diff --git a/www/drupal5-taxonomy_access/Makefile b/www/drupal5-taxonomy_access/Makefile
index 45968cb2f783..978e19c1d300 100644
--- a/www/drupal5-taxonomy_access/Makefile
+++ b/www/drupal5-taxonomy_access/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.osuosl.org/pub/drupal/files/projects/
 MAINTAINER=	nick@foobar.org
 COMMENT=	Access control system for the Drupal based on Taxonomy classification
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_FILES=	admin.css taxonomy_access.info taxonomy_access.install \
 		taxonomy_access.module taxonomy_access_admin.inc
diff --git a/www/drupal5-taxonomy_ticker/Makefile b/www/drupal5-taxonomy_ticker/Makefile
index 36f4b4468584..3bf32913ce2e 100644
--- a/www/drupal5-taxonomy_ticker/Makefile
+++ b/www/drupal5-taxonomy_ticker/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.osuosl.org/pub/drupal/files/projects/
 MAINTAINER=	nick@foobar.org
 COMMENT=	Drupal module to provide scrolling ticker for content
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 
 MODULE_FILES=	taxonomy_ticker.css taxonomy_ticker.info \
diff --git a/www/drupal5-thickbox/Makefile b/www/drupal5-thickbox/Makefile
index 1f0822e4f4c6..1062771f8cdf 100644
--- a/www/drupal5-thickbox/Makefile
+++ b/www/drupal5-thickbox/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	jeremy@algenta.com
 COMMENT=	Thickbox module for Drupal 5
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_DIRS=	po
 MODULE_FILES=	loading_animation.gif thickbox_auto.js thickbox_login.js \
diff --git a/www/drupal5-tinymce/Makefile b/www/drupal5-tinymce/Makefile
index 23f0cc6472b0..1b1f00dbebef 100644
--- a/www/drupal5-tinymce/Makefile
+++ b/www/drupal5-tinymce/Makefile
@@ -12,6 +12,9 @@ CATEGORIES=	www
 MAINTAINER=	nick@foobar.org
 COMMENT=	A Drupal module which implements the TinyMCE WYSIWYG content editor
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 TINYMCEDIR=	www/tinymce
 TINYMCE_MODDIR=	${PORTNAME:C|^|${DRUPAL_MODDIR}/|}
 
diff --git a/www/drupal5-token/Makefile b/www/drupal5-token/Makefile
index f3444b54ec03..66601b85fbab 100644
--- a/www/drupal5-token/Makefile
+++ b/www/drupal5-token/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	jeremy@algenta.com
 COMMENT=	Token module for Drupal 5
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_FILES=	token_cck.inc token_comment.inc token_node.inc \
 		token_taxonomy.inc token_user.inc token.inc \
diff --git a/www/drupal5-ubercart/Makefile b/www/drupal5-ubercart/Makefile
index 192a7f801e62..e7f751091059 100644
--- a/www/drupal5-ubercart/Makefile
+++ b/www/drupal5-ubercart/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	jeremy@algenta.com
 COMMENT=	Ubercart modules for Drupal 5
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 RUN_DEPENDS=	${LOCALBASE}/${DRUPAL_BASE}/sites/all/modules/tapir:${PORTSDIR}/www/drupal5-tapir \
 		${LOCALBASE}/${DRUPAL_BASE}/sites/all/modules/ubrowser:${PORTSDIR}/www/drupal5-ubrowser \
 		${LOCALBASE}/${DRUPAL_BASE}/sites/all/modules/token:${PORTSDIR}/www/drupal5-token \
diff --git a/www/drupal5-ubrowser/Makefile b/www/drupal5-ubrowser/Makefile
index a06dd7d6e4e7..c334da6b53dc 100644
--- a/www/drupal5-ubrowser/Makefile
+++ b/www/drupal5-ubrowser/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	jeremy@algenta.com
 COMMENT=	uBrowser module for Drupal 5
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_FILES=	ubrowser.css ubrowser.info ubrowser.js ubrowser.module
 DOC_FILES=	LICENSE.txt readme.txt
diff --git a/www/drupal5-views/Makefile b/www/drupal5-views/Makefile
index b394578e18ac..f50544194f29 100644
--- a/www/drupal5-views/Makefile
+++ b/www/drupal5-views/Makefile
@@ -12,6 +12,9 @@ CATEGORIES=	www
 MAINTAINER=	g_glasson@jimali.dyndns.org
 COMMENT=	Controls how content lists are generated
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_DIRS=	po modules
 MODULE_FILES=	go-bottom.png go-down.png go-top.png go-up.png user-trash.png \
diff --git a/www/drupal5-workflow_ng/Makefile b/www/drupal5-workflow_ng/Makefile
index 488cbb933820..10740d7c595c 100644
--- a/www/drupal5-workflow_ng/Makefile
+++ b/www/drupal5-workflow_ng/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	jeremy@algenta.com
 COMMENT=	Workflow-ng module for Drupal 5
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 MODULE_DIRS=	cclinks states workflow_ng/icons workflow_ng/modules workflow_ng
 MODULE_FILES=	cclinks/cclinks.info cclinks/cclinks.install cclinks/cclinks.module \
diff --git a/www/drupal5-xmlsitemap/Makefile b/www/drupal5-xmlsitemap/Makefile
index c4129415ce20..9ee311f71b06 100644
--- a/www/drupal5-xmlsitemap/Makefile
+++ b/www/drupal5-xmlsitemap/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://ftp.drupal.org/files/projects/
 MAINTAINER=	nick@foobar.org
 COMMENT=	Produces sitemaps.org compliant XML WWW site maps
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 DRUPAL5_MODULE=	yes
 
 MODULE_DIRS=	xmlsitemap_user xmlsitemap_term xmlsitemap_engines \
diff --git a/www/drupal5/Makefile b/www/drupal5/Makefile
index 895f1a882fff..153d219e7980 100644
--- a/www/drupal5/Makefile
+++ b/www/drupal5/Makefile
@@ -17,6 +17,9 @@ COMMENT=	A database driven web content management system (CMS)
 
 DRUPAL5_PORT=	yes
 
+DEPRECATED=	Use drupal[67] instead
+EXPIRATION_DATE=2011-08-29
+
 USE_PHP=	gd pcre session xml mbstring
 WANT_PHP_WEB=	yes
 
diff --git a/www/drupal6-advanced_help/Makefile b/www/drupal6-advanced_help/Makefile
index 13b36fe0a799..62a23b13db8d 100644
--- a/www/drupal6-advanced_help/Makefile
+++ b/www/drupal6-advanced_help/Makefile
@@ -49,5 +49,5 @@ MODULE_FILES=	help/advanced_help.help.ini help/ini-file.html \
 DOC_FILES=	LICENSE.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-cck/Makefile b/www/drupal6-cck/Makefile
index 639e52a50d19..ed700409530b 100644
--- a/www/drupal6-cck/Makefile
+++ b/www/drupal6-cck/Makefile
@@ -250,5 +250,5 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-chaos/Makefile b/www/drupal6-chaos/Makefile
index 75c51093e463..4114729da2af 100644
--- a/www/drupal6-chaos/Makefile
+++ b/www/drupal6-chaos/Makefile
@@ -371,5 +371,5 @@ DOC_FILES=	ctools_plugin_example/README.txt LICENSE.txt \
 		CHANGELOG.txt API.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-ckeditor/Makefile b/www/drupal6-ckeditor/Makefile
index 9d888d8fb7a9..7cc92065b3d9 100644
--- a/www/drupal6-ckeditor/Makefile
+++ b/www/drupal6-ckeditor/Makefile
@@ -317,7 +317,7 @@ DOC_FILES=	ckeditor/LICENSE.html ckeditor/INSTALL.html \
 		LICENSE.txt CHANGELOG.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 
 post-extract:
 	@cd ${WRKSRC} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/ckeditor_3.3.tar.gz
diff --git a/www/drupal6-content_access/Makefile b/www/drupal6-content_access/Makefile
index 380981526ec3..582a77ab5d42 100644
--- a/www/drupal6-content_access/Makefile
+++ b/www/drupal6-content_access/Makefile
@@ -33,5 +33,5 @@ MODULE_FILES=	tests/content_access.test \
 DOC_FILES=	README.txt UPGRADE.txt LICENSE.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-geshifilter/Makefile b/www/drupal6-geshifilter/Makefile
index 2acf35c27a34..7670c5a175da 100644
--- a/www/drupal6-geshifilter/Makefile
+++ b/www/drupal6-geshifilter/Makefile
@@ -43,5 +43,5 @@ post-install:
 	@${ECHO}
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-google_analytics/Makefile b/www/drupal6-google_analytics/Makefile
index da11b08ff2dd..43e5a4e849bd 100644
--- a/www/drupal6-google_analytics/Makefile
+++ b/www/drupal6-google_analytics/Makefile
@@ -27,5 +27,5 @@ MODULE_DIRS=	tests translations
 DOC_FILES=	LICENSE.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-image/Makefile b/www/drupal6-image/Makefile
index 777800ee3e6b..e15b43cef774 100644
--- a/www/drupal6-image/Makefile
+++ b/www/drupal6-image/Makefile
@@ -152,5 +152,5 @@ MODULE_FILES=	contrib/image_attach/tests/image_attach.test \
 DOC_FILES=	LICENSE.txt CHANGELOG.txt INSTALL.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-imce/Makefile b/www/drupal6-imce/Makefile
index 520dd7e12647..62cbdb61bad5 100644
--- a/www/drupal6-imce/Makefile
+++ b/www/drupal6-imce/Makefile
@@ -57,5 +57,5 @@ MODULE_FILES=	translations/uk.po \
 DOC_FILES=	README.txt LICENSE.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-menu_block/Makefile b/www/drupal6-menu_block/Makefile
index ddb498c3e100..ef51e45c8bcc 100644
--- a/www/drupal6-menu_block/Makefile
+++ b/www/drupal6-menu_block/Makefile
@@ -24,5 +24,5 @@ MODULE_DIRS=	translations
 DOC_FILES=	CHANGELOG.txt README.txt LICENSE.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-mimedetect/Makefile b/www/drupal6-mimedetect/Makefile
index e5fb6cd31528..f6a62a80df88 100644
--- a/www/drupal6-mimedetect/Makefile
+++ b/www/drupal6-mimedetect/Makefile
@@ -20,5 +20,5 @@ MODULE_FILES=	magic magic.mgc magic.mime \
 DOC_FILES=	LICENSE.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-nice_menus/Makefile b/www/drupal6-nice_menus/Makefile
index e38e17cbe415..ddd0fc6e26c5 100644
--- a/www/drupal6-nice_menus/Makefile
+++ b/www/drupal6-nice_menus/Makefile
@@ -26,5 +26,5 @@ MODULE_FILES=	po/ja.po po/nice_menus.pot arrow-down.png arrow-left.png \
 DOC_FILES=	CHANGELOG.txt README.txt UPGRADE.txt LICENSE.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-nodewords/Makefile b/www/drupal6-nodewords/Makefile
index 5cda599f3490..027e5595907b 100644
--- a/www/drupal6-nodewords/Makefile
+++ b/www/drupal6-nodewords/Makefile
@@ -44,5 +44,5 @@ MODULE_FILES=	includes/forum.inc includes/image.inc includes/node.inc \
 DOC_FILES=	README.txt CHANGELOG.txt API.txt LICENSE.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-page_title/Makefile b/www/drupal6-page_title/Makefile
index 945dacda4565..5c20bdc014e5 100644
--- a/www/drupal6-page_title/Makefile
+++ b/www/drupal6-page_title/Makefile
@@ -24,5 +24,5 @@ MODULE_DIRS=	translations
 DOC_FILES=	CHANGELOG.txt README.txt LICENSE.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-panels/Makefile b/www/drupal6-panels/Makefile
index 4a1ed4e1b45c..e7c83f52949b 100644
--- a/www/drupal6-panels/Makefile
+++ b/www/drupal6-panels/Makefile
@@ -193,5 +193,5 @@ DOC_FILES=	README.txt LICENSE.txt \
 		D6UPDATE.txt CHANGELOG.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-path_redirect/Makefile b/www/drupal6-path_redirect/Makefile
index 8d1d859220a3..aadfd19dad24 100644
--- a/www/drupal6-path_redirect/Makefile
+++ b/www/drupal6-path_redirect/Makefile
@@ -26,5 +26,5 @@ MODULE_DIRS=	generate
 DOC_FILES=	LICENSE.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-pathauto/Makefile b/www/drupal6-pathauto/Makefile
index 394a0a22850b..38eaba6c8b13 100644
--- a/www/drupal6-pathauto/Makefile
+++ b/www/drupal6-pathauto/Makefile
@@ -32,5 +32,5 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-print/Makefile b/www/drupal6-print/Makefile
index d4b2fca7a329..f0d681d065d7 100644
--- a/www/drupal6-print/Makefile
+++ b/www/drupal6-print/Makefile
@@ -35,5 +35,5 @@ DOC_FILES=	CHANGELOG.txt CREDITS.txt INSTALL.txt \
 		LICENSE.txt MAINTAINERS.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-seo_checklist/Makefile b/www/drupal6-seo_checklist/Makefile
index cd0393941c32..8d306bcdac42 100644
--- a/www/drupal6-seo_checklist/Makefile
+++ b/www/drupal6-seo_checklist/Makefile
@@ -18,5 +18,5 @@ MODULE_FILES=	seochecklist.info seochecklist.install seochecklist.module
 DOC_FILES=	LICENSE.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-services/Makefile b/www/drupal6-services/Makefile
index 349c753c1e6e..00a1e7a00f5f 100644
--- a/www/drupal6-services/Makefile
+++ b/www/drupal6-services/Makefile
@@ -65,5 +65,5 @@ MODULE_FILES=	auth/services_keyauth/services_keyauth.admin.inc \
 DOC_FILES=	LICENSE.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-views/Makefile b/www/drupal6-views/Makefile
index a10b6e9b0653..7f2a6a37b027 100644
--- a/www/drupal6-views/Makefile
+++ b/www/drupal6-views/Makefile
@@ -407,5 +407,5 @@ module-files: patch
 	@cd ${WRKSRC}; ${FIND} -s . -type f -d | ${SED} -e's|^\./|		|;s|$$| \\|'
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-webform/Makefile b/www/drupal6-webform/Makefile
index 3a17e5910147..72c3d548cc7f 100644
--- a/www/drupal6-webform/Makefile
+++ b/www/drupal6-webform/Makefile
@@ -39,5 +39,5 @@ MODULE_DIRS=	components tests translations
 DOC_FILES=	CHANGELOG.txt INSTALL.txt README.txt THEMING.txt LICENSE.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-wysiwyg/Makefile b/www/drupal6-wysiwyg/Makefile
index 9b685dee21ae..3eb89238d5e8 100644
--- a/www/drupal6-wysiwyg/Makefile
+++ b/www/drupal6-wysiwyg/Makefile
@@ -74,5 +74,5 @@ post-install:
 	${LN} -s ${PREFIX}/${TINYMCEDIR} ${PREFIX}/${DRUPAL_MODDIR}
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal6-zeropoint/Makefile b/www/drupal6-zeropoint/Makefile
index 2ddae4fa8eee..eb1dfba784ac 100644
--- a/www/drupal6-zeropoint/Makefile
+++ b/www/drupal6-zeropoint/Makefile
@@ -145,6 +145,6 @@ MODULE_FILES=	_custom/custom-style.css _custom/headerimg/credits.txt \
 DOC_FILES=	CHANGELOG.txt LICENSE.txt README.txt
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
 
diff --git a/www/drupal6/Makefile b/www/drupal6/Makefile
index d324946a8392..05f354695f4d 100644
--- a/www/drupal6/Makefile
+++ b/www/drupal6/Makefile
@@ -81,5 +81,5 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal7-wysiwyg/Makefile b/www/drupal7-wysiwyg/Makefile
index 9b685dee21ae..3eb89238d5e8 100644
--- a/www/drupal7-wysiwyg/Makefile
+++ b/www/drupal7-wysiwyg/Makefile
@@ -74,5 +74,5 @@ post-install:
 	${LN} -s ${PREFIX}/${TINYMCEDIR} ${PREFIX}/${DRUPAL_MODDIR}
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>
diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile
index 3875b0bf6e4c..d19c32eaf47f 100644
--- a/www/drupal7/Makefile
+++ b/www/drupal7/Makefile
@@ -81,5 +81,5 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include "${.CURDIR}/../../www/drupal5/bsd.drupal.mk"
+.include "${PORTSDIR}/Mk/bsd.drupal.mk"
 .include <bsd.port.post.mk>