[55736] trunk/dports/www/mediawiki

[blb at macports.org]

Revision: 55736
          http://trac.macports.org/changeset/55736
Author:   blb at macports.org
Date:     2009-08-17 19:29:24 -0700 (Mon, 17 Aug 2009)
Log Message:
-----------
www/mediawiki - add fix for old KHTML hack which affects WebKit; add postgresql84 variant

Modified Paths:
--------------
    trunk/dports/www/mediawiki/Portfile

Added Paths:
-----------
    trunk/dports/www/mediawiki/files/
    trunk/dports/www/mediawiki/files/patch-skins_common_wikibits.js.diff

Modified: trunk/dports/www/mediawiki/Portfile
===================================================================
--- trunk/dports/www/mediawiki/Portfile	2009-08-18 01:25:56 UTC (rev 55735)
+++ trunk/dports/www/mediawiki/Portfile	2009-08-18 02:29:24 UTC (rev 55736)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                mediawiki
 version             1.15.1
+revision            1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          www php
 maintainers         blb openmaintainer
@@ -29,6 +30,10 @@
 
 depends_lib         path:bin/php:php5 path:bin/mysql_config5:mysql5
 
+# Fix an outdated KHTML hack which affects newer WebKit
+# https://bugs.webkit.org/show_bug.cgi?id=28350
+patchfiles          patch-skins_common_wikibits.js.diff
+
 use_configure       no
 
 build               {}
@@ -60,13 +65,18 @@
    }
 }
 
-variant mysql4 conflicts postgresql83 description "use mysql4 instead of mysql5" {
+variant mysql4 conflicts postgresql83 postgresql84 description "use mysql4 instead of mysql5" {
    depends_lib-append   port:mysql4
    depends_lib-delete   path:bin/mysql_config5:mysql5
 }
 
-variant postgresql83 conflicts mysql4 description "Use postgreslq83 instead of mysql5" {
+variant postgresql83 conflicts mysql4 postgresql84 description "Use postgreslq83 instead of mysql5" {
    depends_lib-append   port:postgresql83
    depends_lib-delete   path:bin/mysql_config5:mysql5
 }
 
+variant postgresql84 conflicts mysql4 postgresql83 description "Use postgreslq84 instead of mysql5" {
+   depends_lib-append   port:postgresql84
+   depends_lib-delete   path:bin/mysql_config5:mysql5
+}
+

Added: trunk/dports/www/mediawiki/files/patch-skins_common_wikibits.js.diff
===================================================================
--- trunk/dports/www/mediawiki/files/patch-skins_common_wikibits.js.diff	                        (rev 0)
+++ trunk/dports/www/mediawiki/files/patch-skins_common_wikibits.js.diff	2009-08-18 02:29:24 UTC (rev 55736)
@@ -0,0 +1,20 @@
+--- skins/common/wikibits.js.orig	2009-02-21 21:22:46.000000000 -0700
++++ skins/common/wikibits.js	2009-08-17 20:17:37.000000000 -0600
+@@ -10,8 +10,6 @@
+ 	var is_safari_win = is_safari && clientPC.indexOf('windows') != -1;
+ 	var webkit_version = parseInt(webkit_match[1]);
+ }
+-var is_khtml = navigator.vendor == 'KDE' ||
+-	( document.childNodes && !document.all && !navigator.taintEnabled );
+ // For accesskeys; note that FF3+ is included here!
+ var is_ff2 = /firefox\/[2-9]|minefield\/3/.test( clientPC );
+ var is_ff2_ = /firefox\/2/.test( clientPC );
+@@ -94,8 +92,6 @@
+ 		importStylesheetURI(stylepath+'/'+skin+'/Opera7Fixes.css');
+ 	} else if (is_opera_95) {
+ 		importStylesheetURI(stylepath+'/'+skin+'/Opera9Fixes.css');
+-	} else if (is_khtml) {
+-		importStylesheetURI(stylepath+'/'+skin+'/KHTMLFixes.css');
+ 	} else if (is_ff2_) {
+ 		importStylesheetURI(stylepath+'/'+skin+'/FF2Fixes.css');
+ 	}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090817/e67c5401/attachment-0001.html>