1 files changed, 38 insertions, 24 deletions

diff --git a/Mk/bsd.drupal.mk b/Mk/bsd.drupal.mk
index c5cccd1aca3b..92b320d3edf4 100644
--- a/Mk/bsd.drupal.mk
+++ b/Mk/bsd.drupal.mk
@@ -1,5 +1,5 @@
 #-*- mode: makefile; tab-width: 4; -*-
-: ex:ts=4
+# ex:ts=4
 #
 # $FreeBSD$
 #
@@ -9,14 +9,31 @@
 # Please send all suggested changes to the maintainer instead of committing
 # them to CVS yourself.
 
-bsd_drupal_mk_MAINTAINER=	nick@foobar.org
+bsd_drupal_mk_MAINTAINER=       nick@foobar.org
 
 # Make sure we cannot define any combination of DRUPAL{5,6}
 .if (defined(DRUPAL5_MODULE) && defined(DRUPAL6_MODULE))
 BROKEN=		cannot define a combination of DRUPAL5_MODULE and DRUPAL6_MODULE
 .endif
 
-# Make sure DRUPAL_MODULE is defined.  If no DRUPAL*_module defined, then define DRUPAL4_MODULE
+.if (defined(DRUPAL5_THEME) && defined(DRUPAL6_THEME))
+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
+
+.if !defined(DRUPAL_VERSION)
+BROKEN=		must define DRUPAL_VERSION
+.endif
+
+# Make sure DRUPAL_MODULE is defined where necessary
 .if defined(DRUPAL5_MODULE) || defined(DRUPAL6_MODULE)
 DRUPAL_MODULE?=	yes
 .endif
@@ -25,23 +42,25 @@ DRUPAL_MODULE?=	yes
 DRUPAL_MODTYPE=	modules
 .endif
 
-# Make sure DRUPAL_PORT is defined.  If no DRUPAL*_module defined, then define DRUPAL4_PORT
+# Make sure DRUPAL_PORT is defined where necessary
 .if defined(DRUPAL5_PORT) || defined(DRUPAL6_PORT)
 DRUPAL_PORT?=	yes
 .endif
 
-# Make sure DRUPAL_THEME is defined
+# Make sure DRUPAL_THEME is defined where necessary
 .if defined(DRUPAL5_THEME) || defined(DRUPAL6_THEME)
 DRUPAL_THEME?=	yes
 DRUPAL_MODTYPE=	themes
 .endif
 
-.if defined(DRUPAL6_MODULE) || defined(DRUPAL6_PORT) || defined(DRUPAL6_THEME)
+.if ${DRUPAL_VERSION} == "7"
+DRUPAL_BASE?=   www/drupal7
+.elif ${DRUPAL_VERSION} == "6"
 DRUPAL_BASE?=   www/drupal6
-.else
-.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_PORT) || defined(DRUPAL5_THEME)
+.elif ${DRUPAL_VERSION} == "5"
 DRUPAL_BASE?=	www/drupal5
-.endif
+.else
+BROKEN=		Unknown DRUPAL_VERSION (${DRUPAL_VERSION})
 .endif
 
 DRUPAL_DIR=	${PREFIX}/${DRUPAL_BASE}
@@ -54,27 +73,22 @@ DOCSDIR?=	${DRUPAL_DOCSDIR}
 .endif
 
 .if defined(DRUPAL_MODULE) || defined (DRUPAL_THEME)
+PKGNAMEPREFIX=  drupal${DRUPAL_VERSION}-
 
-
-.if defined(DRUPAL5_MODULE) || defined (DRUPAL5_THEME)
-PKGNAMEPREFIX=	drupal5-
-DRUPAL_VERSION?=	5.0
-.if defined(DRUPAL_MODSUBDIR)
-DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/${DRUPAL_MODTYPE}/${DRUPAL_MODSUBDIR}
-.else
-DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/${DRUPAL_MODTYPE}/${PORTNAME}
-.endif
+# drupal contributions must be licensed under the GPLv2 or GPLv3.  This is
+# documented at: http://drupal.org/licensing/faq/
+.if !defined(LICENSE)
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
 .endif
 
-.if defined(DRUPAL6_MODULE) || defined (DRUPAL6_THEME)
-PKGNAMEPREFIX=	drupal6-
-DRUPAL_VERSION?=	6.0
 .if defined(DRUPAL_MODSUBDIR)
 DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/${DRUPAL_MODTYPE}/${DRUPAL_MODSUBDIR}
 .else
 DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/${DRUPAL_MODTYPE}/${PORTNAME}
 .endif
-.endif
+
+DRUPAL_MODLIB?=	${DRUPAL_BASE}/sites/all/libraries
 
 DOCSDIR?=	${DRUPAL_DOCSDIR}/${PORTNAME}
 
@@ -112,7 +126,7 @@ 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) || defined(DRUPAL5_THEME)  || defined(DRUPAL6_MODULE) || defined(DRUPAL6_THEME)
+.if defined(DRUPAL_MODULE) || defined(DRUPAL_THEME)
 PLIST_DIRS+=	${DRUPAL_MODDIR}
 .endif
 .if defined(DRUPAL_MODSUBDIR)
@@ -125,7 +139,7 @@ PLIST_DIRS+=	%%DOCSDIR%%
 .endif
 
 do-install:
-.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_THEME) || defined(DRUPAL6_MODULE) || defined(DRUPAL6_THEME)
+.if defined(DRUPAL_MODULE) || defined(DRUPAL_THEME)
 	@${MKDIR} ${DRUPAL_MODDIR:C|^|${PREFIX}/|}
 	@${CHOWN} ${WWWOWN}:${WWWGRP} ${DRUPAL_MODDIR:C|^|${PREFIX}/|}
 .endif