Attachment #76618 for bug #110412

View | Details | Raw Unified | Return to bug 110412
Collapse All | Expand All

Lines 7-12 Link Here

(-)drupal/Makefile (+1 lines)
7		7
8	PORTNAME= drupal	8	PORTNAME= drupal
9	PORTVERSION= 4.7.6	9	PORTVERSION= 4.7.6
		10	PORTREVISION= 1
10	CATEGORIES= www	11	CATEGORIES= www
11	MASTER_SITES= http://ftp.osuosl.org/pub/drupal/files/projects/	12	MASTER_SITES= http://ftp.osuosl.org/pub/drupal/files/projects/
12	DIST_SUBDIR= drupal	13	DIST_SUBDIR= drupal

Lines 1-7 Link Here

(-)drupal/bsd.drupal.mk (-2 / +19 lines)
1	# $FreeBSD: ports/www/drupal/bsd.drupal.mk,v 1.3 2007/01/09 03:15:19 brooks Exp $	1	# $FreeBSD: ports/www/drupal/bsd.drupal.mk,v 1.3 2007/01/09 03:15:19 brooks Exp $
2	#	2	#
3		3
		4	.if defined(DRUPAL5_MODULE) \|\| defined(DRUPAL5_PORT)
		5	DRUPAL_BASE?= www/drupal5
		6	.else
4	DRUPAL_BASE?= www/drupal	7	DRUPAL_BASE?= www/drupal
		8	.endif
5	DRUPAL_DIR= ${PREFIX}/${DRUPAL_BASE}	9	DRUPAL_DIR= ${PREFIX}/${DRUPAL_BASE}
6	DRUPAL_DOCSDIR?= ${PREFIX}/${DRUPAL_BASE}/doc	10	DRUPAL_DOCSDIR?= ${PREFIX}/${DRUPAL_BASE}/doc
7	PLIST_SUB+= DRUPAL_BASE=${DRUPAL_BASE}	11	PLIST_SUB+= DRUPAL_BASE=${DRUPAL_BASE}
Lines 11-16 Link Here
11	DOCSDIR?= ${DRUPAL_DOCSDIR}	15	DOCSDIR?= ${DRUPAL_DOCSDIR}
12	.endif	16	.endif
13		17
		18	.if defined(DRUPAL_MODULE) \|\| defined(DRUPAL5_MODULE)
		19
14	.if defined(DRUPAL_MODULE)	20	.if defined(DRUPAL_MODULE)
15	DRUPAL_VERSION?= 4.7.0	21	DRUPAL_VERSION?= 4.7.0
16	.if defined(DRUPAL_MODSUBDIR)	22	.if defined(DRUPAL_MODSUBDIR)
Lines 18-23 Link Here
18	.else	24	.else
19	DRUPAL_MODDIR?= ${DRUPAL_BASE}/modules	25	DRUPAL_MODDIR?= ${DRUPAL_BASE}/modules
20	.endif	26	.endif
		27	.else
		28	.if defined(DRUPAL5_MODULE)
		29	DRUPAL_VERSION?= 5.0
		30	.if defined(DRUPAL_MODSUBDIR)
		31	DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/modules/${DRUPAL_MODSUBDIR}
		32	.else
		33	DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/modules/${PORTNAME}
		34	.endif
		35	.endif
		36	.endif
		37
21	DOCSDIR?= ${DRUPAL_DOCSDIR}/${PORTNAME}	38	DOCSDIR?= ${DRUPAL_DOCSDIR}/${PORTNAME}
22		39
23	MASTER_SITES?= http://ftp.osuosl.org/pub/drupal/files/projects/	40	MASTER_SITES?= http://ftp.osuosl.org/pub/drupal/files/projects/
Lines 32-39 Link Here
32		49
33	.if defined(MODULE_CONF_FILES)	50	.if defined(MODULE_CONF_FILES)
34	SUB_FILES= pkg-install	51	SUB_FILES= pkg-install
35	SUB_LIST+= CONF_FILES=${MODULE_CONF_FILES:C\|^\|${DRUPAL_MODDIR}/\|} \	52	SUB_LIST+= CONF_FILES="${MODULE_CONF_FILES:C\|^\|${DRUPAL_MODDIR}/\|}" \
36	CONF_DIRS=${MODULE_CONF_DIRS:C\|^\|${DRUPAL_MODDIR}/\|}	53	CONF_DIRS="${MODULE_CONF_DIRS:C\|^\|${DRUPAL_MODDIR}/\|}"
37	# XXX: where?	54	# XXX: where?
38	PKGINSTALL= ${WRKDIR}/pkg-install	55	PKGINSTALL= ${WRKDIR}/pkg-install
39	PKGDEINSTALL= ${PKGINSTALL}	56	PKGDEINSTALL= ${PKGINSTALL}

Line 0 Link Here

(-)drupal/files/patch-modules::taxonomy.module (+11 lines)
	1	--- modules/taxonomy.module~ Fri Feb 23 22:48:32 2007
	2	+++ modules/taxonomy.module Fri Feb 23 22:48:32 2007
	3	@@ -557,7 +557,7 @@
	4	foreach ($vocabularies as $vid => $vocabulary) {
	5	if ($vocabulary->tags && !$free_tags) { continue; }
	6	$tree = taxonomy_get_tree($vid);
	7	- if ($tree && (count($tree) > 1)) {
	8	+ if ($tree && (count($tree) >= 1)) {
	9	$options[$vocabulary->name] = array();
	10	foreach ($tree as $term) {
	11	$options[$vocabulary->name][$term->tid] = _taxonomy_depth($term->depth, '-') . $term->name;

Return to bug 110412