View | Details | Raw Unified | Return to bug 114894 | Differences between
and this patch

Collapse All | Expand All

(-)bsd.drupal.mk (-10 / +33 lines)
Lines 15-20 Link Here
15
.endif
15
.endif
16
.endif
16
.endif
17
17
18
.if defined(DRUPAL_MODULE)
19
DRUPAL_MODTYPE=	modules
20
.endif
21
18
# Make sure DRUPAL_PORT is defined.  If no DRUPAL*_module defined, then define DRUPAL4_PORT
22
# Make sure DRUPAL_PORT is defined.  If no DRUPAL*_module defined, then define DRUPAL4_PORT
19
.if defined(DRUPAL4_PORT) || defined(DRUPAL5_PORT)
23
.if defined(DRUPAL4_PORT) || defined(DRUPAL5_PORT)
20
DRUPAL_PORT?=	yes
24
DRUPAL_PORT?=	yes
Lines 24-30 Link Here
24
.endif
28
.endif
25
.endif
29
.endif
26
30
27
.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_PORT)
31
# Make sure DRUPAL_THEME is defined
32
.if defined(DRUPAL5_THEME)
33
DRUPAL_THEME?=	yes
34
DRUPAL_MODTYPE=	themes
35
.endif
36
37
.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_PORT) || defined(DRUPAL5_THEME)
28
DRUPAL_BASE?=	www/drupal5
38
DRUPAL_BASE?=	www/drupal5
29
.else
39
.else
30
DRUPAL_BASE?=	www/drupal4
40
DRUPAL_BASE?=	www/drupal4
Lines 38-68 Link Here
38
DOCSDIR?=	${DRUPAL_DOCSDIR}
48
DOCSDIR?=	${DRUPAL_DOCSDIR}
39
.endif
49
.endif
40
50
41
.if defined(DRUPAL_MODULE)
51
.if defined(DRUPAL_MODULE) || defined (DRUPAL_THEME)
42
52
43
.if defined(DRUPAL4_MODULE)
53
.if defined(DRUPAL4_MODULE)
44
PKGNAMEPREFIX=	drupal4-
54
PKGNAMEPREFIX=	drupal4-
45
DRUPAL_VERSION?=	4.7.0
55
DRUPAL_VERSION?=	4.7.0
46
.if defined(DRUPAL_MODSUBDIR)
56
.if defined(DRUPAL_MODSUBDIR)
47
DRUPAL_MODDIR?= ${DRUPAL_BASE}/modules/${DRUPAL_MODSUBDIR}
57
DRUPAL_MODDIR?= ${DRUPAL_BASE}/${DRUPAL_MODTYPE}/${DRUPAL_MODSUBDIR}
48
.else 
58
.else 
49
DRUPAL_MODDIR?= ${DRUPAL_BASE}/modules
59
DRUPAL_MODDIR?= ${DRUPAL_BASE}/${DRUPAL_MODTYPE}
50
.endif
60
.endif
51
.endif
61
.endif
52
62
53
.if defined(DRUPAL5_MODULE)
63
.if defined(DRUPAL5_MODULE) || defined (DRUPAL5_THEME)
54
PKGNAMEPREFIX=	drupal5-
64
PKGNAMEPREFIX=	drupal5-
55
DRUPAL_VERSION?=	5.0
65
DRUPAL_VERSION?=	5.0
56
.if defined(DRUPAL_MODSUBDIR)
66
.if defined(DRUPAL_MODSUBDIR)
57
DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/modules/${DRUPAL_MODSUBDIR}
67
DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/${DRUPAL_MODTYPE}/${DRUPAL_MODSUBDIR}
58
.else
68
.else
59
DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/modules/${PORTNAME}
69
DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/${DRUPAL_MODTYPE}/${PORTNAME}
60
.endif
70
.endif
61
.endif
71
.endif
62
72
63
DOCSDIR?=	${DRUPAL_DOCSDIR}/${PORTNAME}
73
DOCSDIR?=	${DRUPAL_DOCSDIR}/${PORTNAME}
64
74
65
MASTER_SITES?=	http://ftp.osuosl.org/pub/drupal/files/projects/
75
.if defined(DRUPAL_MOD_SNAPSHOT)
76
MASTER_SITE_DRUPAL+= \
77
	${MASTER_SITE_LOCAL}
78
MASTER_SITE_DRUPAL_SUBDIR=	pav/drupal
79
.else
80
MASTER_SITE_DRUPAL+= \
81
	http://ftp.drupal.org/files/projects/ \
82
	http://ftp.osuosl.org/pub/drupal/files/projects/
83
MASTER_SITE_DRUPAL_SUBDIR=
84
.endif
85
86
MASTER_SITES?=	${MASTER_SITE_DRUPAL}
87
MASTER_SITE_SUBDIR?=	${MASTER_SITE_DRUPAL_SUBDIR}
88
66
DIST_SUBDIR=	drupal
89
DIST_SUBDIR=	drupal
67
90
68
NO_BUILD?=	yes
91
NO_BUILD?=	yes
Lines 83-89 Link Here
83
PLIST_FILES+=	${MODULE_FILES:C|^|%%DRUPAL_MODDIR%%/|}
106
PLIST_FILES+=	${MODULE_FILES:C|^|%%DRUPAL_MODDIR%%/|}
84
PLIST_FILES+=	${MODULE_CONF_FILES:C|^|%%DRUPAL_MODDIR%%/|:C|$|-dist|}
107
PLIST_FILES+=	${MODULE_CONF_FILES:C|^|%%DRUPAL_MODDIR%%/|:C|$|-dist|}
85
PLIST_DIRS+=	${MODULE_DIRS:C|^|%%DRUPAL_MODDIR%%/|}
108
PLIST_DIRS+=	${MODULE_DIRS:C|^|%%DRUPAL_MODDIR%%/|}
86
.if defined(DRUPAL5_MODULE)
109
.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_THEME)
87
PLIST_DIRS+=	${DRUPAL_MODDIR}
110
PLIST_DIRS+=	${DRUPAL_MODDIR}
88
.endif
111
.endif
89
.if defined(DRUPAL_MODSUBDIR)
112
.if defined(DRUPAL_MODSUBDIR)
Lines 96-102 Link Here
96
.endif
119
.endif
97
120
98
do-install:
121
do-install:
99
.if defined(DRUPAL5_MODULE)
122
.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_THEME)
100
	@${MKDIR} ${DRUPAL_MODDIR:C|^|${PREFIX}/|}
123
	@${MKDIR} ${DRUPAL_MODDIR:C|^|${PREFIX}/|}
101
	@${CHOWN} ${WWWOWN}:${WWWGRP} ${DRUPAL_MODDIR:C|^|${PREFIX}/|}
124
	@${CHOWN} ${WWWOWN}:${WWWGRP} ${DRUPAL_MODDIR:C|^|${PREFIX}/|}
102
.endif
125
.endif

Return to bug 114894