[49115] trunk/dports/www/firefox-x11

[jeremyhu at macports.org]

Revision: 49115
          http://trac.macports.org/changeset/49115
Author:   jeremyhu at macports.org
Date:     2009-04-03 22:08:33 -0700 (Fri, 03 Apr 2009)
Log Message:
-----------
firefox-x11: Hopefully the last change for a while (sigh) ... Load plugins with dylib suffixes as well as so.

Modified Paths:
--------------
    trunk/dports/www/firefox-x11/Portfile

Added Paths:
-----------
    trunk/dports/www/firefox-x11/files/plugins.patch

Modified: trunk/dports/www/firefox-x11/Portfile
===================================================================
--- trunk/dports/www/firefox-x11/Portfile	2009-04-04 05:04:49 UTC (rev 49114)
+++ trunk/dports/www/firefox-x11/Portfile	2009-04-04 05:08:33 UTC (rev 49115)
@@ -6,7 +6,7 @@
 name            firefox-x11
 categories      www x11
 version         3.0.8
-revision        4
+revision        5
 platforms       darwin
 maintainers     jeremyhu openmaintainer
 description     Mozilla.org's popular stand-alone web browser
@@ -150,8 +150,9 @@
 # #486036 (make-install)
 # #485863 (icon-Makefile)
 # NOTFILED (nsFilePicker)
+# NOTFILED (plugins)
 # Previous firefox-x11 port (patch-dylib_file.diff patch-pthread.diff)
-patchfiles configure.patch xpcom-Makefile.patch system-nss.patch make-install.patch patch-dylib_file.diff  patch-pthread.diff icon-Makefile.patch nsFilePicker.patch
+patchfiles configure.patch xpcom-Makefile.patch system-nss.patch make-install.patch patch-dylib_file.diff  patch-pthread.diff icon-Makefile.patch nsFilePicker.patch plugins.patch
 
 post-patch {
     # https://bugzilla.mozilla.org/show_bug.cgi?id=485857
@@ -164,6 +165,10 @@
     # find -xtype -> gfind -xtype
     reinplace "s:find:gfind:g" ${worksrcpath}/toolkit/mozapps/installer/packager.mk
 
+    if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} {
+        reinplace "s:/usr/X11R6:${prefix}:" ${worksrcpath}/modules/plugin/base/src/nsPluginsDirUnix.cpp
+    }
+
     # Set the right install_name on the libs
     reinplace "s:@executable_path:${prefix}/lib/${name}:g" ${worksrcpath}/config/rules.mk
     reinplace "s:@executable_path:${prefix}/lib/${name}:g" ${worksrcpath}/config/config.mk

Added: trunk/dports/www/firefox-x11/files/plugins.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/plugins.patch	                        (rev 0)
+++ trunk/dports/www/firefox-x11/files/plugins.patch	2009-04-04 05:08:33 UTC (rev 49115)
@@ -0,0 +1,25 @@
+diff --git a/modules/plugin/base/src/nsPluginsDirUnix.cpp b/modules/plugin/base/src/nsPluginsDirUnix.cpp
+--- modules/plugin/base/src/nsPluginsDirUnix.cpp
++++ modules/plugin/base/src/nsPluginsDirUnix.cpp
+@@ -74,16 +74,21 @@
+ #define LOCAL_PLUGIN_DLL_ALT_SUFFIX ".so"
+ #elif defined(_AIX)
+ #define DEFAULT_X11_PATH "/usr/lib"
+ #define LOCAL_PLUGIN_DLL_ALT_SUFFIX ".a"
+ #elif defined(SOLARIS)
+ #define DEFAULT_X11_PATH "/usr/openwin/lib/"
+ #elif defined(LINUX)
+ #define DEFAULT_X11_PATH "/usr/X11R6/lib/"
++#elif defined(__APPLE__)
++#define DEFAULT_X11_PATH "/usr/X11R6/lib"
++#undef LOCAL_PLUGIN_DLL_SUFFIX
++#define LOCAL_PLUGIN_DLL_SUFFIX ".dylib"
++#define LOCAL_PLUGIN_DLL_ALT_SUFFIX ".so"
+ #else
+ #define DEFAULT_X11_PATH ""
+ #endif
+ 
+ #if defined(MOZ_WIDGET_GTK2)
+ 
+ #define PLUGIN_MAX_LEN_OF_TMP_ARR 512
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090403/22a9a6a4/attachment.html>