Attachment 80036 Details for Bug 114894 – file.diff

[patch] file.diff

file.diff (text/plain), 2.07 KB, created by Geoff Glasson on 2007-07-25 14:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Geoff Glasson

Created: 2007-07-25 14:30:02 UTC

Size: 2.07 KB

patch

obsolete

>--- bsd.drupal.mk_orig	Wed Jul 25 20:51:35 2007
>+++ bsd.drupal.mk	Wed Jul 25 21:16:05 2007
>@@ -10,11 +10,20 @@
> .if defined(DRUPAL4_MODULE) || defined(DRUPAL5_MODULE)
> DRUPAL_MODULE?=	yes
> .else
>-.if defined(DRUPAL_MODULE)
>+.if defined(DRUPAL_MODULE) && !defined(DRUPAL?_THEME)
> DRUPAL4_MODULE=	yes
> .endif
> .endif
> 
>+# Make sure DRUPAL_THEME is defined.  If no DRUPAL*_theme defined, then define DRUPAL4_THEME
>+.if defined(DRUPAL4_THEME) || defined(DRUPAL5_THEME)
>+DRUPAL_THEME?= yes
>+.else
>+.if defined(DRUPAL_THEME)
>+DRUPAL4_THEME= yes
>+.endif
>+.endif
>+
> # Make sure DRUPAL_PORT is defined.  If no DRUPAL*_module defined, then define DRUPAL4_PORT
> .if defined(DRUPAL4_PORT) || defined(DRUPAL5_PORT)
> DRUPAL_PORT?=	yes
>@@ -24,11 +33,17 @@
> .endif
> .endif
> 
>-.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_PORT)
>+.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_PORT) || defined(DRUPAL5_THEME)
> DRUPAL_BASE?=	www/drupal5
> .else
> DRUPAL_BASE?=	www/drupal4
> .endif
>+.if defined(DRUPAL5_THEME) || defined(DRUPAL5_PORT) || defined(DRUPAL5_THEME)
>+DRUPAL_BASE?=   www/drupal5
>+.else
>+DRUPAL_BASE?=   www/drupal4
>+.endif
>+
> DRUPAL_DIR=	${PREFIX}/${DRUPAL_BASE}
> DRUPAL_DOCSDIR?=	${PREFIX}/${DRUPAL_BASE}/doc
> PLIST_SUB+=	DRUPAL_BASE=${DRUPAL_BASE}
>@@ -38,7 +53,7 @@
> DOCSDIR?=	${DRUPAL_DOCSDIR}
> .endif
> 
>-.if defined(DRUPAL_MODULE)
>+.if defined(DRUPAL_MODULE) || defined(DRUPAL_THEME)
> 
> .if defined(DRUPAL4_MODULE)
> PKGNAMEPREFIX=	drupal4-
>@@ -57,6 +72,26 @@
> DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/modules/${DRUPAL_MODSUBDIR}
> .else
> DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/modules/${PORTNAME}
>+.endif
>+.endif
>+
>+.if defined(DRUPAL4_THEME)
>+PKGNAMEPREFIX=  drupal4-
>+DRUPAL_VERSION?=        4.7.0
>+.if defined(DRUPAL_THEMESUBDIR)
>+DRUPAL_MODDIR?= ${DRUPAL_BASE}/themes/${DRUPAL_THEMESUBDIR}
>+.else
>+DRUPAL_MODDIR?= ${DRUPAL_BASE}/themes
>+.endif
>+.endif
>+
>+.if defined(DRUPAL5_THEME)
>+PKGNAMEPREFIX=  drupal5-
>+DRUPAL_VERSION?=        5.0
>+.if defined(DRUPAL_THEMESUBDIR)
>+DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/themes/${DRUPAL_THEMESUBDIR}
>+.else
>+DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/themes/${PORTNAME}
> .endif
> .endif

Actions: View | Diff

Attachments on bug 114894: 80036 | 80037