New Ticket     Tickets     Wiki     Browse Source     Timeline     Roadmap     Ticket Reports     Search

Changeset 79528


Ignore:
Timestamp:
06/16/11 09:57:46 (4 years ago)
Author:
jeremyhu@…
Message:

firefox-x11: Bump to 4.0.1, remove +internal_dependencies variant (now forced on)

Location:
trunk/dports/www/firefox-x11
Files:
2 added
2 deleted
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/dports/www/firefox-x11/Portfile

    r77391 r79528  
    88set component   firefox 
    99categories      www x11 
    10 version         3.6.16 
     10version         4.0.1 
    1111platforms       darwin 
    1212maintainers     jeremyhu openmaintainer 
    13 description     Mozilla.org's popular stand-alone web browser 
     13description     Mozilla.org's popular stand-alone web browser, Beta and Release Candidates 
    1414 
    1515long_description \ 
    … …  
    2020 
    2121homepage        http://www.mozilla.com/${component}/ 
    22 master_sites    http://mozilla.isc.org/pub/mozilla.org/${component}/releases/${version}/source/ \ 
    23                 http://www.mirrorservice.org/sites/releases.mozilla.org/pub/mozilla.org/${component}/releases/${version}/source/ \ 
    24                 http://mirror.internode.on.net/pub/mozilla/${component}/releases/${version}/source/ \ 
    25                 http://kyoto-mz-dl.sinet.ad.jp/pub/mozilla.org/${component}/releases/${version}/source/ \ 
    26                 http://mirror.yandex.ru/mozilla/${component}/releases/${version}/source/ \ 
    27                 http://mozilla.c3sl.ufpr.br/releases/${component}/releases/${version}/source/ \ 
    28                 http://releases.mozilla.org/pub/mozilla.org/${component}/releases/${version}/source/ 
     22 
     23master_sites    http://releases.mozilla.org/pub/mozilla.org/${component}/releases/${version}/source/ 
    2924distname        ${component}-${version}.source 
     25dist_subdir     ${component} 
    3026 
    3127use_bzip2       yes 
    32 dist_subdir     ${component} 
    33  
    34 checksums           md5     232a3c0160cd1cbe3dcaaaf7e4ae51c2 \ 
    35                     sha1    38124597440b7d60aa568adeef23659575841e92 \ 
    36                     rmd160  fdb7b41f25a5b8ba6eb1c5672ecc668c962b0af8 
    37  
    38 worksrcdir      mozilla-1.9.2 
     28 
     29checksums           md5     9abda7d23151e97913c8555a64c13f34 \ 
     30                    sha1    c89bc5106266aa0097a7be15be84555bd2649f03 \ 
     31                    rmd160  63faaae78b56db407a34454986361212382c838e 
     32 
     33worksrcdir      mozilla-2.0 
    3934 
    4035depends_build \ 
    4136        port:findutils \ 
    4237        port:pkgconfig \ 
    43         port:autoconf213 
     38        port:autoconf213 \ 
     39        port:yasm 
    4440 
    4541depends_lib \ 
    46         port:xulrunner 
     42        port:heimdal \ 
     43        port:gconf \ 
     44        port:esound \ 
     45        port:libcanberra \ 
     46        port:findutils \ 
     47        port:gtk2 \ 
     48        port:mesa \ 
     49        port:xorg-libXt \ 
     50        port:libnotify 
     51 
     52archcheck.files \ 
     53        libexec/heimdal/lib/libkrb5.dylib \ 
     54        lib/libcanberra.dylib \ 
     55        lib/libgconf-2.dylib \ 
     56        lib/libgtk-x11-2.0.dylib \ 
     57        lib/libnotify.dylib \ 
     58        lib/libXt.dylib 
    4759 
    4860use_autoconf yes 
    4961autoconf.cmd autoconf213 
    5062 
    51 if {[variant_isset internal_dependencies]} { 
    52         set pkg_name ${name}-standalone 
    53 } else { 
    54         set pkg_name ${component}-x11 
    55 } 
     63set pkg_name ${name} 
    5664 
    5765configure.args \ 
    … …  
    6573        --x-includes=${prefix}/include \ 
    6674        --x-libraries=${prefix}/lib \ 
    67         --with-system-nspr \ 
    68         --with-nspr-prefix=${prefix} \ 
    69         --with-system-nss \ 
    70         --with-nss-prefix=${prefix} \ 
    71         --with-system-libxul \ 
    72         --with-libxul-sdk=${prefix}/lib/xulrunner \ 
    73         --with-system-bzip2=${prefix} \ 
    74         --with-system-jpeg=${prefix} \ 
    75         --with-system-zlib=${prefix} \ 
    76         --enable-system-lcms \ 
    77         --enable-system-cairo \ 
    78         --enable-system-sqlite \ 
     75        --enable-libxul \ 
     76        --disable-system-lcms \ 
     77        --disable-system-cairo \ 
     78        --disable-system-sqlite \ 
    7979        --with-default-mozilla-five-home=${prefix}/lib/${pkg_name} \ 
    8080        --enable-oji \ 
    … …  
    114114# xpctools and necko-wifi broke in 3.6b1 
    115115 
    116 # Force 32-bit, inline-asm 
    117 supported_archs i386 ppc 
     116# gcc-4.0 has issues, so force gcc-4.2 on Leopard 
     117if {${configure.compiler} == "gcc-4.0"} { 
     118    configure.compiler gcc-4.2  
     119} 
     120 
    118121# Yes, this is ugly... but the real fix is in the works 
    119122# https://bugzilla.mozilla.org/show_bug.cgi?id=529878 
    … …  
    157160} 
    158161 
    159 variant internal_dependencies description {Use internal versions of nspr, nss, and xulrunner} { 
    160     configure.args-delete \ 
    161         --with-system-nspr \ 
    162         --with-nspr-prefix=${prefix} \ 
    163         --with-system-nss \ 
    164         --with-nss-prefix=${prefix} \ 
    165         --with-system-libxul \ 
    166         --with-libxul-sdk=${prefix}/lib/xulrunner 
    167  
    168     configure.args-append \ 
    169         --enable-libxul 
    170  
    171     depends_lib-delete \ 
    172         port:xulrunner 
    173  
    174     depends_lib-append \ 
    175         port:heimdal \ 
    176         port:lcms \ 
    177         port:gconf \ 
    178         port:esound \ 
    179         port:libcanberra \ 
    180         port:findutils \ 
    181         port:gtk2 \ 
    182         port:xorg-libXt \ 
    183         port:libnotify 
    184  
    185     archcheck.files-append \ 
    186         libexec/heimdal/lib/libkrb5.dylib \ 
    187         lib/libcanberra.dylib \ 
    188         lib/libgconf-2.dylib \ 
    189         lib/libgtk-x11-2.0.dylib \ 
    190         lib/liblcms.dylib \ 
    191         lib/libnotify.dylib \ 
    192         lib/libXt.dylib 
    193 } 
    194  
    195 patchfiles patch-dylib_file.diff 527612.patch 549746.patch  
     162# plugin-instance-nococoa.patch : https://bugzilla.mozilla.org/show_bug.cgi?id=587370 
     163patchfiles patch-dylib_file.diff plugin-instance-nococoa.patch 
    196164 
    197165post-patch { 
    … …  
    199167    reinplace "s:XP_MACOSX:__APPLE__:g" ${worksrcpath}/xpcom/base/nsStackWalk.cpp  
    200168 
     169    # https://bugzilla.mozilla.org/show_bug.cgi?id=641755 
     170    reinplace "s:XP_MACOSX:__APPLE__:g" ${worksrcpath}/gfx/ycbcr/update.sh 
     171    reinplace "s:XP_MACOSX:__APPLE__:g" ${worksrcpath}/gfx/ycbcr/yuv_row_posix.cpp 
     172 
    201173    # https://bugzilla.mozilla.org/show_bug.cgi?id=486034 
    202174    # find -xtype -> gfind -xtype 
    203175    reinplace "s:find:gfind:g" ${worksrcpath}/toolkit/mozapps/installer/packager.mk 
    204176 
    205      # Don't use the system X11 
    206      reinplace "s:/usr/X11R6:${prefix}:" ${worksrcpath}/modules/plugin/base/src/nsPluginsDirUnix.cpp 
     177    # Don't use the system X11 
     178    reinplace "s:/usr/X11R6:${prefix}:" ${worksrcpath}/modules/plugin/base/src/nsPluginsDirUnix.cpp 
    207179 
    208180    # Set the right install_name on the libs 
    … …  
    211183    reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/js/src/config/config.mk 
    212184    reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/js/src/config/rules.mk 
    213     reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/config/config.mk 
    214185    reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/nsprpub/configure.in 
    215186    reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/nsprpub/configure 
    … …  
    218189 
    219190    # Fix the correct library filenames for loading at runtime 
    220     reinplace "s:libatk-1.0.so.0:${prefix}/lib/libatk-1.0.dylib:" ${worksrcpath}/accessible/src/atk/nsAppRootAccessible.cpp 
     191    reinplace "s:libatk-1.0.so.0:${prefix}/lib/libatk-1.0.dylib:" ${worksrcpath}/accessible/src/atk/nsApplicationAccessibleWrap.cpp 
    221192 
    222193    reinplace "s:libgssapi_krb5.so.2:${prefix}/libexec/heimdal/lib/libgssapi.2.dylib:" ${worksrcpath}/extensions/auth/nsAuthGSSAPI.cpp 
    … …  
    228199    reinplace "s:libgconf-2.so.4:${prefix}/lib/libgconf-2.dylib:" ${worksrcpath}/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp 
    229200 
    230     reinplace "s:libcups.so.2:/usr/lib/libcups.2.dylib:" ${worksrcpath}/gfx/src/psshared/nsCUPSShim.cpp 
     201    reinplace "s:libcups.so.2:/usr/lib/libcups.2.dylib:" ${worksrcpath}/widget/src/gtk2/nsCUPSShim.cpp 
    231202 
    232203    reinplace "s:libgnomeui-2.so.0:${prefix}/lib/libgnomeui-2.dylib:" ${worksrcpath}/toolkit/xre/nsNativeAppSupportUnix.cpp 
    233204    reinplace "s:libgnome-2.so.0:${prefix}/lib/libgnome-2.dylib:" ${worksrcpath}/toolkit/xre/nsNativeAppSupportUnix.cpp 
     205 
     206    reinplace "s:libgnomeui-2.so.0:${prefix}/lib/libgnomeui-2.dylib:" ${worksrcpath}/toolkit/crashreporter/client/crashreporter_linux.cpp 
     207    reinplace "s:libgnome-2.so.0:${prefix}/lib/libgnome-2.dylib:" ${worksrcpath}/toolkit/crashreporter/client/crashreporter_linux.cpp 
     208 
     209    reinplace "s:libgconf-2.so.4:${prefix}/lib/libgconf-2.dylib:" ${worksrcpath}/toolkit/crashreporter/client/crashreporter_gtk_common.cpp 
    234210 
    235211    reinplace "s:libgtk-x11-2.0.so.0:${prefix}/lib/libgtk-x11-2.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsBidiKeyboard.cpp 
    … …  
    238214    reinplace "s:libesd.so.0:${prefix}/lib/libesd.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsSound.cpp 
    239215    reinplace "s:libcanberra.so.0:${prefix}/lib/libcanberra.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsSound.cpp 
    240     reinplace "s:libgtk-x11-2.0.dylib:${prefix}/lib/libgtk-x11-2.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsFilePicker.cpp 
     216 
     217    reinplace "s:libgtk-x11-2.0.dylib:${prefix}/lib/libgtk-x11-2.0.dylib:" ${worksrcpath}/dom/plugins/PluginModuleChild.cpp 
    241218 
    242219    reinplace "s:libXss.so.1:${prefix}/lib/libXss.1.0.0.dylib:" ${worksrcpath}/widget/src/qt/nsIdleServiceQt.cpp 
    … …  
    278255 
    279256    move ${destroot}${prefix}/bin/${component} ${destroot}${prefix}/bin/${pkg_name} 
    280     if {![variant_isset internal_dependencies]} { 
    281         ln -s ${pkg_name} ${destroot}${prefix}/bin/${component} 
    282  
    283         # Workaround to get root certs loaded, so https:// works 
    284         ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${pkg_name}/libnssckbi.dylib 
    285     }  
    286257} 
    287258 
Note: See TracChangeset for help on using the changeset viewer.