From 76d0de7083240f4d8f1ba86cb971fc5c13426fd1 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Fri, 3 Apr 2009 19:03:03 +0000
Subject: [PATCH] finally, update to 5.16, after fixing the modules.inc stuff
 to work with jquery_update....

sigh
---
 www/drupal5/core/Makefile                     |  6 ++---
 www/drupal5/core/distinfo                     | 10 +++----
 .../core/patches/patch-includes_common_inc    | 26 +++++++++++--------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/www/drupal5/core/Makefile b/www/drupal5/core/Makefile
index 8461e8de2f9..834d328130f 100644
--- a/www/drupal5/core/Makefile
+++ b/www/drupal5/core/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2009/04/03 12:55:08 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2009/04/03 19:03:03 espie Exp $
 
 COMMENT =	powerful content management system
  
-DISTNAME =	drupal-5.12
-PKGNAME=	${DISTNAME}p0
+DISTNAME =	drupal-5.16
+PKGNAME=	${DISTNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 RUN_DEPENDS = 	::www/php5/core \
diff --git a/www/drupal5/core/distinfo b/www/drupal5/core/distinfo
index 08c53f1ae30..1b45df35e24 100644
--- a/www/drupal5/core/distinfo
+++ b/www/drupal5/core/distinfo
@@ -1,5 +1,5 @@
-MD5 (drupal5/drupal-5.12.tar.gz) = wHGB5CiU3BRDhZj3dy30NA==
-RMD160 (drupal5/drupal-5.12.tar.gz) = 9B4TFXNVo06af6cHd+X/ceUchjo=
-SHA1 (drupal5/drupal-5.12.tar.gz) = QhBXNun653lujTOKzML0igcOVn4=
-SHA256 (drupal5/drupal-5.12.tar.gz) = btLrXY8Xc5cPbajveHRMSz+TLrdePcOtM2Vap8wb9Mg=
-SIZE (drupal5/drupal-5.12.tar.gz) = 764327
+MD5 (drupal5/drupal-5.16.tar.gz) = uLYDpdv15/KA7W4VIcqbrg==
+RMD160 (drupal5/drupal-5.16.tar.gz) = 55qh+hX1gi3DJ5DT8Phu1Mn2qLA=
+SHA1 (drupal5/drupal-5.16.tar.gz) = PdlezpVw5aiJuYaaUGCHl7KXaxk=
+SHA256 (drupal5/drupal-5.16.tar.gz) = 1Xp95eh3sKVlWi7pCQ8xmlma4KhfSN1umJPiKLTGk/w=
+SIZE (drupal5/drupal-5.16.tar.gz) = 766247
diff --git a/www/drupal5/core/patches/patch-includes_common_inc b/www/drupal5/core/patches/patch-includes_common_inc
index c1b391a022f..42560bcab86 100644
--- a/www/drupal5/core/patches/patch-includes_common_inc
+++ b/www/drupal5/core/patches/patch-includes_common_inc
@@ -1,22 +1,26 @@
-$OpenBSD: patch-includes_common_inc,v 1.3 2008/10/25 14:20:34 espie Exp $
---- includes/common.inc.orig	Wed Jul  9 21:34:30 2008
-+++ includes/common.inc	Sat Oct 25 16:15:27 2008
-@@ -1618,8 +1618,17 @@ function drupal_clear_css_cache() {
+$OpenBSD: patch-includes_common_inc,v 1.4 2009/04/03 19:03:03 espie Exp $
+--- includes/common.inc.orig	Fri Jan 16 20:26:09 2009
++++ includes/common.inc	Fri Apr  3 20:58:49 2009
+@@ -1726,11 +1726,20 @@ function drupal_clear_css_cache() {
+  *   far for $scope is returned.
   */
  function drupal_add_js($data = NULL, $type = 'module', $scope = 'header', $defer = FALSE, $cache = TRUE) {
++  $path = drupal_get_path('module', 'jquery_update');
    if (!is_null($data)) {
 -    _drupal_add_js('misc/jquery.js', 'core', 'header', FALSE, $cache);
-+    if (module_exists('jquery_update')) {
-+      $path = drupal_get_path('module', 'jquery_update');
++    if (!is_null($path)) {
 +      _drupal_add_js($path .'/misc/jquery.js', 'core', 'header', FALSE, $cache);
 +    } else {
 +      _drupal_add_js('misc/jquery.js', 'core', 'header', FALSE, $cache);
 +    }
      _drupal_add_js('misc/drupal.js', 'core', 'header', FALSE, $cache);
-+    $altname = $path.'/'.$data;
-+    if (file_exists($altname)) {
-+      return _drupal_add_js($altname, $type, $scope, $defer, $cache);
-+    }
    }
-   return _drupal_add_js($data, $type, $scope, $defer, $cache);
+-  return _drupal_add_js($data, $type, $scope, $defer, $cache);
++  if (!is_null($path) && file_exists($path.'/'.$data)) {
++    return _drupal_add_js($path.'/'.$data, $type, $scope, $defer, $cache);
++  } else {
++    return _drupal_add_js($data, $type, $scope, $defer, $cache);
++  }
  }
+ 
+ /**