diff options
| -rw-r--r-- | Mk/bsd.drupal.mk | 8 | ||||
| -rw-r--r-- | www/drupal6-tagadelic/Makefile | 2 | ||||
| -rw-r--r-- | www/drupal6-token/Makefile | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/Mk/bsd.drupal.mk b/Mk/bsd.drupal.mk index 92b320d3edf4..6ed93612c52b 100644 --- a/Mk/bsd.drupal.mk +++ b/Mk/bsd.drupal.mk @@ -20,11 +20,6 @@ BROKEN= cannot define a combination of DRUPAL5_MODULE and DRUPAL6_MODULE BROKEN= cannot define a combination of DRUPAL5_THEME and DRUPAL6_THEME .endif -# Make sure DRUPAL_VERSION is defined for old module versions -.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_PORT) || defined(DRUPAL5_THEME) -DRUPAL_VERSION?= 5 -.endif - .if defined(DRUPAL6_MODULE) || defined(DRUPAL6_PORT) || defined(DRUPAL6_THEME) DRUPAL_VERSION?= 6 .endif @@ -57,9 +52,6 @@ DRUPAL_MODTYPE= themes DRUPAL_BASE?= www/drupal7 .elif ${DRUPAL_VERSION} == "6" DRUPAL_BASE?= www/drupal6 -.elif ${DRUPAL_VERSION} == "5" -DRUPAL_BASE?= www/drupal5 -.else BROKEN= Unknown DRUPAL_VERSION (${DRUPAL_VERSION}) .endif diff --git a/www/drupal6-tagadelic/Makefile b/www/drupal6-tagadelic/Makefile index 2068013d67f2..f75bc00f8348 100644 --- a/www/drupal6-tagadelic/Makefile +++ b/www/drupal6-tagadelic/Makefile @@ -27,5 +27,5 @@ MODULE_FILES= tagadelic.css tagadelic.info tagadelic.install \ DOC_FILES= LICENSE.txt README.txt .include <bsd.port.pre.mk> -.include "${PORTSDIR}/www/drupal5/bsd.drupal.mk" +.include "${PORTSDIR}/Mk/bsd.drupal.mk" .include <bsd.port.post.mk> diff --git a/www/drupal6-token/Makefile b/www/drupal6-token/Makefile index 8e717877d591..f05ee27df64a 100644 --- a/www/drupal6-token/Makefile +++ b/www/drupal6-token/Makefile @@ -27,5 +27,5 @@ MODULE_DIRS= translations DOC_FILES= API.txt LICENSE.txt README.txt .include <bsd.port.pre.mk> -.include "${PORTSDIR}/www/drupal5/bsd.drupal.mk" +.include "${PORTSDIR}/Mk/bsd.drupal.mk" .include <bsd.port.post.mk> |