Date: Sat, 17 Mar 2007 00:59:29 GMT From: Nick Hilliard <nick@foobar.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/110412: maintainer update: drupal-4.7.6 -> drupal-4.7.6,1 Message-ID: <200703170059.l2H0xTIg018312@muffin.acquirer.com> Resent-Message-ID: <200703170100.l2H10BHt039901@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110412 >Category: ports >Synopsis: maintainer update: drupal-4.7.6 -> drupal-4.7.6,1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Mar 17 01:00:11 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Nick Hilliard >Release: FreeBSD 6.1-RELEASE i386 >Organization: Network Ability Ltd >Environment: System: FreeBSD xx 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Wed May 17 11:38:53 IST 2006 nick@xxx:/data/src/usr.src/src-6.1/src/sys/i386/compile/xxx i386 >Description: drupal update to: 1. change bsd.drupal.mk to support drupal5 2. fix SUB_LIST quoting in bsd.drupal.mk (thanks to brooks@ for this) 3. fix minor bug in taxonomy.module which caused problems with add-on ticker module >How-To-Repeat: >Fix: diff -bNur drupal.old/Makefile drupal/Makefile --- drupal.old/Makefile Tue Mar 6 06:51:50 2007 +++ drupal/Makefile Sat Mar 17 00:56:49 2007 @@ -7,6 +7,7 @@ PORTNAME= drupal PORTVERSION= 4.7.6 +PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://ftp.osuosl.org/pub/drupal/files/projects/ DIST_SUBDIR= drupal diff -bNur drupal.old/bsd.drupal.mk drupal/bsd.drupal.mk --- drupal.old/bsd.drupal.mk Tue Jan 9 03:15:19 2007 +++ drupal/bsd.drupal.mk Sat Mar 17 00:19:22 2007 @@ -1,7 +1,11 @@ # $FreeBSD: ports/www/drupal/bsd.drupal.mk,v 1.3 2007/01/09 03:15:19 brooks Exp $ # +.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_PORT) +DRUPAL_BASE?= www/drupal5 +.else DRUPAL_BASE?= www/drupal +.endif DRUPAL_DIR= ${PREFIX}/${DRUPAL_BASE} DRUPAL_DOCSDIR?= ${PREFIX}/${DRUPAL_BASE}/doc PLIST_SUB+= DRUPAL_BASE=${DRUPAL_BASE} @@ -11,6 +15,8 @@ DOCSDIR?= ${DRUPAL_DOCSDIR} .endif +.if defined(DRUPAL_MODULE) || defined(DRUPAL5_MODULE) + .if defined(DRUPAL_MODULE) DRUPAL_VERSION?= 4.7.0 .if defined(DRUPAL_MODSUBDIR) @@ -18,6 +24,17 @@ .else DRUPAL_MODDIR?= ${DRUPAL_BASE}/modules .endif +.else +.if defined(DRUPAL5_MODULE) +DRUPAL_VERSION?= 5.0 +.if defined(DRUPAL_MODSUBDIR) +DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/modules/${DRUPAL_MODSUBDIR} +.else +DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/modules/${PORTNAME} +.endif +.endif +.endif + DOCSDIR?= ${DRUPAL_DOCSDIR}/${PORTNAME} MASTER_SITES?= http://ftp.osuosl.org/pub/drupal/files/projects/ @@ -32,8 +49,8 @@ .if defined(MODULE_CONF_FILES) SUB_FILES= pkg-install -SUB_LIST+= CONF_FILES=${MODULE_CONF_FILES:C|^|${DRUPAL_MODDIR}/|} \ - CONF_DIRS=${MODULE_CONF_DIRS:C|^|${DRUPAL_MODDIR}/|} +SUB_LIST+= CONF_FILES="${MODULE_CONF_FILES:C|^|${DRUPAL_MODDIR}/|}" \ + CONF_DIRS="${MODULE_CONF_DIRS:C|^|${DRUPAL_MODDIR}/|}" # XXX: where? PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${PKGINSTALL} diff -bNur drupal.old/files/patch-modules::taxonomy.module drupal/files/patch-modules::taxonomy.module --- drupal.old/files/patch-modules::taxonomy.module Thu Jan 1 01:00:00 1970 +++ drupal/files/patch-modules::taxonomy.module Sat Mar 17 00:25:13 2007 @@ -0,0 +1,11 @@ +--- modules/taxonomy.module~ Fri Feb 23 22:48:32 2007 ++++ modules/taxonomy.module Fri Feb 23 22:48:32 2007 +@@ -557,7 +557,7 @@ + foreach ($vocabularies as $vid => $vocabulary) { + if ($vocabulary->tags && !$free_tags) { continue; } + $tree = taxonomy_get_tree($vid); +- if ($tree && (count($tree) > 1)) { ++ if ($tree && (count($tree) >= 1)) { + $options[$vocabulary->name] = array(); + foreach ($tree as $term) { + $options[$vocabulary->name][$term->tid] = _taxonomy_depth($term->depth, '-') . $term->name; >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703170059.l2H0xTIg018312>