[50848] trunk/dports/www/firefox-x11-devel/Portfile
jeremyhu at macports.org
jeremyhu at macports.org
Sun May 10 23:13:13 PDT 2009
Revision: 50848
http://trac.macports.org/changeset/50848
Author: jeremyhu at macports.org
Date: 2009-05-10 23:13:13 -0700 (Sun, 10 May 2009)
Log Message:
-----------
firefox-x11-devel: Use xulrunner-devel by default. Since xulrunner and xulrunner-devel are mutually exclusive, I added a internal_dependencies variant for those who wish to maintain the old behavior to allow both versions of firefox on the system at the same time..
Modified Paths:
--------------
trunk/dports/www/firefox-x11-devel/Portfile
Modified: trunk/dports/www/firefox-x11-devel/Portfile
===================================================================
--- trunk/dports/www/firefox-x11-devel/Portfile 2009-05-11 05:53:14 UTC (rev 50847)
+++ trunk/dports/www/firefox-x11-devel/Portfile 2009-05-11 06:13:13 UTC (rev 50848)
@@ -6,7 +6,7 @@
name firefox-x11-devel
categories www x11
version 3.5b4
-revision 0
+revision 1
platforms darwin
maintainers jeremyhu openmaintainer
description Mozilla.org's popular stand-alone web browser, Beta and Release Candidates
@@ -40,16 +40,17 @@
port:autoconf213
depends_lib \
- port:heimdal \
- port:lcms \
- port:gconf \
- port:esound \
- port:libcanberra
-# port:xulrunner-devel
+ port:xulrunner-devel
use_autoconf yes
autoconf.cmd autoconf213
+if {[variant_isset internal_dependencies]} {
+ set pkg_name ${name}-standalone
+} else {
+ set pkg_name firefox-x11
+}
+
configure.args \
--with-xulrunner-stub-name=xulrunner-stub \
--disable-static \
@@ -60,13 +61,18 @@
--enable-default-toolkit=cairo-gtk2 \
--x-includes=${prefix}/include \
--x-libraries=${prefix}/lib \
+ --with-system-nspr \
+ --with-nspr-prefix=${prefix} \
+ --with-system-nss \
+ --with-nss-prefix=${prefix} \
+ --with-libxul-sdk=${prefix}/lib/xulrunner \
--with-system-bzip2=${prefix} \
--with-system-jpeg=${prefix} \
--with-system-zlib=${prefix} \
--enable-system-lcms \
--enable-system-cairo \
--enable-system-sqlite \
- --with-default-mozilla-five-home=${prefix}/lib/${name} \
+ --with-default-mozilla-five-home=${prefix}/lib/${pkg_name} \
--enable-oji \
--enable-plugins \
--enable-mathml \
@@ -98,15 +104,8 @@
--disable-updater \
--disable-pedantic \
--disable-tests \
- --disable-mochitest \
- --enable-libxul
+ --disable-mochitest
-# --with-system-nspr \
-# --with-nspr-prefix=${prefix} \
-# --with-system-nss \
-# --with-nss-prefix=${prefix} \
-# --with-libxul-sdk=${prefix}/lib/xulrunner-devel
-
variant debug description {build with debugging symbols} {
configure.args-delete --disable-debug \
--disable-mochitest \
@@ -143,6 +142,31 @@
--enable-official-branding
}
+variant internal_dependencies description {Use internal versions of nspr, nss, and xulrunner} {
+ configure.args-delete \
+ --with-system-nspr \
+ --with-nspr-prefix=${prefix} \
+ --with-system-nss \
+ --with-nss-prefix=${prefix} \
+ --with-libxul-sdk=${prefix}/lib/xulrunner
+
+ configure.args-append \
+ --enable-libxul
+
+ depends_lib-delete \
+ port:xulrunner-devel
+
+ depends_lib-append \
+ port:heimdal \
+ port:lcms \
+ port:gconf \
+ port:esound \
+ port:libcanberra \
+ port:findutils \
+ port:gtk2 \
+ port:xorg-libXt
+}
+
post-extract {
# https://bugzilla.mozilla.org/show_bug.cgi?id=484353
move ${worksrcpath}/modules/libjar/nsWildCard.cpp ${worksrcpath}/modules/libjar/nsWildCard_jar.cpp
@@ -181,12 +205,12 @@
}
# 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
- reinplace "s:@executable_path:${prefix}/lib/${name}:g" ${worksrcpath}/nsprpub/configure.in
- reinplace "s:@executable_path:${prefix}/lib/${name}:g" ${worksrcpath}/nsprpub/configure
- reinplace "s:@executable_path:${prefix}/lib/${name}:g" ${worksrcpath}/security/coreconf/Darwin.mk
- reinplace "s:@executable_path:${prefix}/lib/${name}:g" ${worksrcpath}/security/nss/lib/freebl/config.mk
+ reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/config/rules.mk
+ reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/config/config.mk
+ reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/nsprpub/configure.in
+ reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/nsprpub/configure
+ reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/security/coreconf/Darwin.mk
+ reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/security/nss/lib/freebl/config.mk
# Fix the correct library filenames for loading at runtime
reinplace "s:libatk-1.0.so.0:${prefix}/lib/libatk-1.0.dylib:" ${worksrcpath}/accessible/src/atk/nsAppRootAccessible.cpp
@@ -222,19 +246,21 @@
configure.env \
MOZCONFIG="${worksrcpath}/browser/config/mozconfig" \
- MOZILLA_FIVE_HOME="${prefix}/lib/${name}"
+ MOZILLA_FIVE_HOME="${prefix}/lib/${pkg_name}"
build.args-append \
- includedir="${prefix}/include/${name}" \
- idldir="${prefix}/share/idl/${name}" \
- installdir="${prefix}/lib/${name}" \
- sdkdir="${prefix}/lib/${name}"
+ includedir="${prefix}/include/${pkg_name}" \
+ idldir="${prefix}/share/idl/${pkg_name}" \
+ installdir="${prefix}/lib/${pkg_name}" \
+ sdkdir="${prefix}/lib/${pkg_name}" \
+ SKIP_COPY_XULRUNNER=1
destroot.args-append \
- includedir="${prefix}/include/${name}" \
- idldir="${prefix}/share/idl/${name}" \
- installdir="${prefix}/lib/${name}" \
- sdkdir="${prefix}/lib/${name}"
+ includedir="${prefix}/include/${pkg_name}" \
+ idldir="${prefix}/share/idl/${pkg_name}" \
+ installdir="${prefix}/lib/${pkg_name}" \
+ sdkdir="${prefix}/lib/${pkg_name}" \
+ SKIP_COPY_XULRUNNER=1
post-destroot {
file mkdir ${destroot}${prefix}/share/applications
@@ -243,13 +269,16 @@
${filespath}/share-applications-firefox.desktop \
${destroot}${prefix}/share/applications/firefox-devel.desktop
- move ${destroot}${prefix}/bin/firefox ${destroot}${prefix}/bin/firefox-devel
+ move ${destroot}${prefix}/bin/firefox ${destroot}${prefix}/bin/${pkg_name}
+ if {![variant_isset internal_dependencies]} {
+ ln -s ${pkg_name} ${destroot}${prefix}/bin/firefox
+ }
## Workaround to get root certs loaded, so https:// works
- #ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${name}/libnssckbi.dylib
+ #ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${pkg_name}/libnssckbi.dylib
# https://bugzilla.mozilla.org/show_bug.cgi?id=486064
- system "cat ${worksrcpath}/dist/include/gfx/gfxtypes.h ${worksrcpath}/dist/include/thebes/gfxTypes.h > ${destroot}${prefix}/include/${name}/unstable/gfxtypes.h"
+ #system "cat ${worksrcpath}/dist/include/gfx/gfxtypes.h ${worksrcpath}/dist/include/thebes/gfxTypes.h > ${destroot}${prefix}/include/${pkg_name}/unstable/gfxtypes.h"
}
livecheck.check regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090510/5536f78f/attachment-0001.html>
More information about the macports-changes
mailing list