[60195] trunk/dports/www/firefox-x11
jeremyhu at macports.org
jeremyhu at macports.org
Wed Nov 4 16:00:18 PST 2009
Revision: 60195
http://trac.macports.org/changeset/60195
Author: jeremyhu at macports.org
Date: 2009-11-04 16:00:18 -0800 (Wed, 04 Nov 2009)
Log Message:
-----------
firefox: Bump to 3.5.4
Modified Paths:
--------------
trunk/dports/www/firefox-x11/Portfile
trunk/dports/www/firefox-x11/files/configure.patch
trunk/dports/www/firefox-x11/files/icon-Makefile.patch
trunk/dports/www/firefox-x11/files/make-install.patch
trunk/dports/www/firefox-x11/files/patch-dylib_file.diff
trunk/dports/www/firefox-x11/files/system-nss.patch
trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch
trunk/dports/www/firefox-x11/files/xulrunner-app-Makefile.patch
Removed Paths:
-------------
trunk/dports/www/firefox-x11/files/patch-pthread.diff
Modified: trunk/dports/www/firefox-x11/Portfile
===================================================================
--- trunk/dports/www/firefox-x11/Portfile 2009-11-05 00:00:02 UTC (rev 60194)
+++ trunk/dports/www/firefox-x11/Portfile 2009-11-05 00:00:18 UTC (rev 60195)
@@ -4,11 +4,13 @@
PortSystem 1.0
name firefox-x11
+set component firefox
categories www x11
-version 3.0.15
+version 3.5.4
+revision 0
platforms darwin
maintainers jeremyhu openmaintainer
-description Mozilla.org's popular stand-alone web browser
+description Mozilla.org's popular stand-alone web browser, Beta and Release Candidates
long_description \
Firefox empowers you to browse faster, more safely and more \
@@ -16,34 +18,38 @@
universal_variant no
-homepage http://www.mozilla.com/firefox/
-master_sites http://mozilla.isc.org/pub/mozilla.org/firefox/releases/${version}/source/ \
- http://www.mirrorservice.org/sites/releases.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/ \
- http://mirror.internode.on.net/pub/mozilla/firefox/releases/${version}/source/ \
- http://kyoto-mz-dl.sinet.ad.jp/pub/mozilla.org/firefox/releases/${version}/source/ \
- http://mirror.yandex.ru/mozilla/firefox/releases/${version}/source/ \
- http://mozilla.c3sl.ufpr.br/releases/firefox/releases/${version}/source/ \
- http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/
-distname firefox-${version}-source
+homepage http://www.mozilla.com/${component}/
+master_sites http://mozilla.isc.org/pub/mozilla.org/${component}/releases/${version}/source/ \
+ http://www.mirrorservice.org/sites/releases.mozilla.org/pub/mozilla.org/${component}/releases/${version}/source/ \
+ http://mirror.internode.on.net/pub/mozilla/${component}/releases/${version}/source/ \
+ http://kyoto-mz-dl.sinet.ad.jp/pub/mozilla.org/${component}/releases/${version}/source/ \
+ http://mirror.yandex.ru/mozilla/${component}/releases/${version}/source/ \
+ http://mozilla.c3sl.ufpr.br/releases/${component}/releases/${version}/source/ \
+ http://releases.mozilla.org/pub/mozilla.org/${component}/releases/${version}/source/
+distname ${component}-${version}.source
use_bzip2 yes
-checksums md5 e28e30d74c1488c8a8e2ff8cd2c37439 \
- sha1 06d488f0aee8f9e60dc6526c1d292f3708da301f \
- rmd160 837881c51f206606c55f3aac64fc82fc2698428b
+checksums md5 0b6ccb1e50d96b7127a18a69399fcf05 \
+ sha1 ce250208371326d03e72a02d223bc136cd376e5d \
+ rmd160 e89ff54fef6d036538c9779176f5086a8eaa721e
-worksrcdir mozilla
+worksrcdir mozilla-1.9.1
depends_build \
port:findutils \
- port:pkgconfig
+ port:pkgconfig \
+ port:autoconf213
depends_lib \
port:xulrunner
+use_autoconf yes
+autoconf.cmd autoconf213
+
if {[variant_isset internal_dependencies]} {
set pkg_name ${name}-standalone
} else {
- set pkg_name firefox-x11
+ set pkg_name ${component}-x11
}
configure.args \
@@ -60,6 +66,8 @@
--with-nspr-prefix=${prefix} \
--with-system-nss \
--with-nss-prefix=${prefix} \
+ --with-system-libxul \
+ --with-libxul-sdk=${prefix}/lib/xulrunner \
--with-system-bzip2=${prefix} \
--with-system-jpeg=${prefix} \
--with-system-zlib=${prefix} \
@@ -98,9 +106,15 @@
--disable-updater \
--disable-pedantic \
--disable-tests \
- --disable-mochitest \
- --with-libxul-sdk=${prefix}/lib/xulrunner
+ --disable-mochitest
+# Force 32-bit, inline-asm
+if {$build_arch == "x86_64"} {
+ configure.build_arch i386
+} elseif {$build_arch == "ppc64"} {
+ configure.build_arch ppc
+}
+
variant debug description {build with debugging symbols} {
configure.args-delete --disable-debug \
--disable-mochitest \
@@ -115,15 +129,6 @@
--disable-install-strip
}
-# Force 32-bit, inline-asm
-if {$build_arch == "x86_64"} {
- configure.build_arch i386
-} elseif {$build_arch == "ppc64"} {
- configure.build_arch ppc
-}
-
-configure.cc "${configure.cc} -arch ${configure.build_arch}"
-
variant gnome description {use gnome libraries where appropriate} {
depends_lib-append \
port:gnome-vfs \
@@ -152,13 +157,14 @@
--with-nspr-prefix=${prefix} \
--with-system-nss \
--with-nss-prefix=${prefix} \
+ --with-system-libxul \
--with-libxul-sdk=${prefix}/lib/xulrunner
configure.args-append \
--enable-libxul
depends_lib-delete \
- port:xulrunner
+ port:xulrunner-devel
depends_lib-append \
port:heimdal \
@@ -177,17 +183,20 @@
}
# Upstream bugs (http://bugzilla.mozilla.org)
-# #485827 (xpcom-Makefile)
-# #485856 (configure)
-# #485862 (system-nss)
-# #486036 (make-install)
-# #485863 (icon-Makefile)
-# NOTFILED (nsFilePicker)
-# #486892 (plugins)
-# #487367 (browser-xulrunner-stub)
-# #487371 (xulrunner-app-Makefile)
-# 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 plugins.patch browser-xulrunner-stub.patch xulrunner-app-Makefile.patch
+# #485827 (xpcom-Makefile, in mozilla-1.9.2)
+# #486782 (configure, in mozilla-1.9.2)
+# #485862 (system-nss, in mozilla-1.9.2)
+# #486036 (make-install, in mozilla-1.9.2)
+# #485863 (icon-Makefile, in mozilla-1.9.2)
+# #492119 (nsFilePicker)
+# #486892 (plugins, in mozilla-1.9.2)
+# #486890 (sydneyaudio, 3.1b3 and later, in mozilla-1.9.2)
+# #487367 (browser-xulrunner-stub, in mozilla-1.9.2)
+# #484457 (gdk-Status, in mozilla-1.9.2)
+# #487371 (xulrunner-app-Makefile, in mozilla-1.9.2)
+# #492138 #490995 (netwerk-wifi-src-Makefile, in mozilla-1.9.2)
+# Previous firefox-x11 port, not sure if still needed, but safe to keep: patch-dylib_file.diff
+patchfiles configure.patch xpcom-Makefile.patch system-nss.patch make-install.patch patch-dylib_file.diff icon-Makefile.patch nsFilePicker.patch plugins.patch sydneyaudio.patch browser-xulrunner-stub.patch gdk-Status.patch xulrunner-app-Makefile.patch netwerk-wifi-src-Makefile.patch
post-patch {
# https://bugzilla.mozilla.org/show_bug.cgi?id=485857
@@ -206,6 +215,8 @@
# Set the right install_name on the libs
reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/config/rules.mk
+ reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/js/src/config/config.mk
+ reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/js/src/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
@@ -266,15 +277,15 @@
file mkdir ${destroot}${prefix}/share/applications
copy \
- ${filespath}/share-applications-firefox.desktop \
- ${destroot}${prefix}/share/applications/firefox.desktop
+ ${filespath}/share-applications-${component}.desktop \
+ ${destroot}${prefix}/share/applications/${name}.desktop
- move ${destroot}${prefix}/bin/firefox ${destroot}${prefix}/bin/${pkg_name}
+ move ${destroot}${prefix}/bin/${component} ${destroot}${prefix}/bin/${pkg_name}
if {![variant_isset internal_dependencies]} {
- ln -s ${pkg_name} ${destroot}${prefix}/bin/firefox
+ ln -s ${pkg_name} ${destroot}${prefix}/bin/${component}
# Workaround to get root certs loaded, so https:// works
- ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${pkg_name}/libnssckbi.dylib
+ ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${pkg_name}/libnssckbi.dylib
} else {
# 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/${pkg_name}/unstable/gfxtypes.h"
@@ -282,6 +293,5 @@
}
livecheck.type regex
-livecheck.url http://releases.mozilla.org/pub/mozilla.org/firefox/releases
+livecheck.url http://releases.mozilla.org/pub/mozilla.org/${component}/releases
livecheck.regex ">(\\d+(?:\\.\\d+)*).<"
-
Modified: trunk/dports/www/firefox-x11/files/configure.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/configure.patch 2009-11-05 00:00:02 UTC (rev 60194)
+++ trunk/dports/www/firefox-x11/files/configure.patch 2009-11-05 00:00:18 UTC (rev 60195)
@@ -1,16 +1,140 @@
---- configure.orig 2009-03-19 21:02:35.000000000 -0700
-+++ configure 2009-03-19 21:03:53.000000000 -0700
-@@ -5807,11 +5807,10 @@ case "$host" in
+diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
+--- config/autoconf.mk.in
++++ config/autoconf.mk.in
+@@ -76,16 +76,18 @@ LIBXUL_DIST = @LIBXUL_DIST@
+ XULRUNNER_STUB_NAME = @XULRUNNER_STUB_NAME@
+
+ MOZ_CHROME_FILE_FORMAT = @MOZ_CHROME_FILE_FORMAT@
+
+ MOZ_WIDGET_TOOLKIT = @MOZ_WIDGET_TOOLKIT@
+ MOZ_GFX_TOOLKIT = @MOZ_GFX_TOOLKIT@
+ MOZ_GFX_OPTIMIZE_MOBILE = @MOZ_GFX_OPTIMIZE_MOBILE@
+
++MOZ_FS_LAYOUT = @MOZ_FS_LAYOUT@
++
+ MOZ_DFB = @MOZ_DFB@
+ MOZ_X11 = @MOZ_X11@
+
+ MOZ_PANGO = @MOZ_PANGO@
+
+ MOZ_JS_LIBS = @MOZ_JS_LIBS@
+
+ MOZ_DEBUG = @MOZ_DEBUG@
+diff --git a/configure.in b/configure.in
+--- configure.in
++++ configure.in
+@@ -1562,17 +1562,16 @@ case "$host" in
+ esac
;;
*-darwin*)
-- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
-- HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
-+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX"
-+ HOST_CXXFLAGS="$HOST_CXXFLAGS -DXP_UNIX -DXP_MACOSX"
+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
+ HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
;;
*-linux*|*-kfreebsd*-gnu)
+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
+ HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
+ ;;
+
+@@ -1704,25 +1703,24 @@ case "$target" in
+ esac
+ ;;
+
+ *-darwin*)
+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+ MOZ_OPTIMIZE_FLAGS="-O2"
+ _PEDANTIC=
+- CFLAGS="$CFLAGS -fpascal-strings -fno-common"
+- CXXFLAGS="$CXXFLAGS -fpascal-strings -fno-common"
++ CFLAGS="$CFLAGS -fpascal-strings -fno-common -I${MACOS_SDK_DIR}/Developer/Headers/FlatCarbon"
++ CXXFLAGS="$CXXFLAGS -fpascal-strings -fno-common -I${MACOS_SDK_DIR}/Developer/Headers/FlatCarbon"
+ DLL_SUFFIX=".dylib"
+ DSO_LDOPTS=''
+ STRIP="$STRIP -x -S"
+ _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
+ MOZ_ENABLE_POSTSCRIPT=
+ TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
+- LDFLAGS="$LDFLAGS -framework Cocoa"
+ # The ExceptionHandling framework is needed for Objective-C exception
+ # logging code in nsObjCExceptions.h. Currently we only use that in debug
+ # builds.
+ MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling"
+ # set MACOSX to generate lib/mac/MoreFiles/Makefile
+ MACOSX=1
+
+ dnl DTrace and -dead_strip don't interact well. See bug 403132.
+@@ -4678,16 +4676,18 @@ MOZ_ARG_HEADER(Toolkit Options)
+ fi
+
+ AC_DEFINE_UNQUOTED(MOZ_DEFAULT_TOOLKIT,"$MOZ_WIDGET_TOOLKIT")
+
+ dnl ========================================================
+ dnl = Enable the toolkit as needed =
+ dnl ========================================================
+
++MOZ_FS_LAYOUT="unix"
++
+ case "$MOZ_WIDGET_TOOLKIT" in
+ photon)
+ MOZ_ENABLE_PHOTON=1
+ AC_DEFINE(MOZ_WIDGET_PHOTON)
+ ;;
+
+ cairo-windows)
+ MOZ_WIDGET_TOOLKIT=windows
+@@ -4754,28 +4754,30 @@ cairo-os2)
+ TK_LIBS='$(MOZ_CAIRO_LIBS)'
+ ;;
+
+ cairo-mac|cairo-cocoa)
+ if test "$MOZ_WIDGET_TOOLKIT" = "cairo-cocoa"; then
+ MOZ_WIDGET_TOOLKIT=cocoa
+ AC_DEFINE(MOZ_WIDGET_COCOA)
+ MOZ_ENABLE_COCOA=1
++ LDFLAGS="$LDFLAGS -framework Cocoa"
+ else
+ MOZ_WIDGET_TOOLKIT=mac
+ fi
++ MOZ_FS_LAYOUT="bundle"
+ MOZ_GFX_TOOLKIT=cairo
+ MOZ_USER_DIR="Mozilla"
+ AC_DEFINE(XP_MACOSX)
+ AC_DEFINE(TARGET_CARBON)
+ AC_DEFINE(TARGET_API_MAC_CARBON)
+ TK_LIBS='-framework Carbon -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework AddressBook'
+- TK_CFLAGS="-I${MACOS_SDK_DIR}/Developer/Headers/FlatCarbon"
+ CFLAGS="$CFLAGS $TK_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
++ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
+ ;;
+ esac
+
+ if test "$MOZ_ENABLE_XREMOTE"; then
+ AC_DEFINE(MOZ_ENABLE_XREMOTE)
+ fi
+
+ if test "$COMPILE_ENVIRONMENT"; then
+@@ -4788,16 +4790,17 @@ if test "$COMPILE_ENVIRONMENT"; then
+ fi
+
+ PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES)
+ fi
+
+ fi # COMPILE_ENVIRONMENT
+
+ AC_SUBST(MOZ_DEFAULT_TOOLKIT)
++AC_SUBST(MOZ_FS_LAYOUT)
+
+ dnl ========================================================
+ dnl = startup-notification support module
+ dnl ========================================================
+
+ if test "$MOZ_ENABLE_GTK2"
+ then
+ MOZ_ENABLE_STARTUP_NOTIFICATION=
Modified: trunk/dports/www/firefox-x11/files/icon-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/icon-Makefile.patch 2009-11-05 00:00:02 UTC (rev 60194)
+++ trunk/dports/www/firefox-x11/files/icon-Makefile.patch 2009-11-05 00:00:18 UTC (rev 60195)
@@ -5,7 +5,7 @@
endif
-ifeq ($(OS_ARCH),Darwin)
-+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
++ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
PLATFORM = mac
endif
Modified: trunk/dports/www/firefox-x11/files/make-install.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/make-install.patch 2009-11-05 00:00:02 UTC (rev 60194)
+++ trunk/dports/www/firefox-x11/files/make-install.patch 2009-11-05 00:00:18 UTC (rev 60195)
@@ -8,7 +8,7 @@
+ifneq (,$(filter WINNT,$(OS_ARCH)))
+ $(error "make install" is not supported on this platform. Use "make package" instead.)
+endif
-+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
++ifeq (bundle,$(MOZ_FS_LAYOUT))
$(error "make install" is not supported on this platform. Use "make package" instead.)
endif
$(NSINSTALL) -D $(DESTDIR)$(installdir)
Modified: trunk/dports/www/firefox-x11/files/patch-dylib_file.diff
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-dylib_file.diff 2009-11-05 00:00:02 UTC (rev 60194)
+++ trunk/dports/www/firefox-x11/files/patch-dylib_file.diff 2009-11-05 00:00:18 UTC (rev 60195)
@@ -1,6 +1,6 @@
---- config/config.mk 2006-01-06 16:01:22.000000000 -0500
-+++ config/config.mk 2007-08-21 13:51:05.000000000 -0400
-@@ -697,6 +697,10 @@
+--- config/config.mk.orig 2008-08-14 03:00:34.000000000 -0700
++++ config/config.mk 2009-05-25 20:11:09.000000000 -0700
+@@ -704,6 +704,12 @@
else
XCODE_PRODUCT_DIR = build
endif # HAS_XCODE_2_1=1
@@ -8,6 +8,8 @@
+ifneq (,$(findstring -lplds4,$(EXTRA_DSO_LDOPTS)))
+EXTRA_DSO_LDOPTS += $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSPR_LIBS))), -dylib_file @executable_path/$(library):$(DIST)/bin/$(library))
+endif
++EXTRA_DSO_LDOPTS += -dylib_file @executable_path/libxul.dylib:$(DIST)/bin/libxul.dylib
++EXTRA_DSO_LDOPTS += -dylib_file @executable_path/libmozjs.dylib:$(DIST)/bin/libmozjs.dylib
endif # OS_ARCH=Darwin
Deleted: trunk/dports/www/firefox-x11/files/patch-pthread.diff
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-pthread.diff 2009-11-05 00:00:02 UTC (rev 60194)
+++ trunk/dports/www/firefox-x11/files/patch-pthread.diff 2009-11-05 00:00:18 UTC (rev 60195)
@@ -1,11 +0,0 @@
---- nsprpub/pr/include/md/_pth.h.orig 2005-07-21 20:22:53.000000000 +0200
-+++ nsprpub/pr/include/md/_pth.h 2007-11-05 09:01:53.000000000 +0100
-@@ -98,7 +98,7 @@
- #else
- #define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m)))
- #endif
--#if defined(DARWIN)
-+#if defined(DARWIN) && !defined(__DARWIN_UNIX03)
- #define _PT_PTHREAD_CONDATTR_INIT(x) 0
- #else
- #define _PT_PTHREAD_CONDATTR_INIT pthread_condattr_init
Modified: trunk/dports/www/firefox-x11/files/system-nss.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/system-nss.patch 2009-11-05 00:00:02 UTC (rev 60194)
+++ trunk/dports/www/firefox-x11/files/system-nss.patch 2009-11-05 00:00:18 UTC (rev 60195)
@@ -1,13 +1,11 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=485862
-
---- config/autoconf.mk.in.orig 2009-03-29 22:07:24.000000000 -0700
-+++ config/autoconf.mk.in 2009-03-29 22:07:54.000000000 -0700
-@@ -278,7 +278,7 @@ OS_LDFLAGS = @LDFLAGS@
+--- config/autoconf.mk.in.orig 2009-05-08 15:28:11.000000000 -0700
++++ config/autoconf.mk.in 2009-05-08 15:31:04.000000000 -0700
+@@ -282,7 +282,7 @@ OS_LDFLAGS = @LDFLAGS@
OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
--OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS)
-+OS_INCLUDES = $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS)
+-OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
++OS_INCLUDES = $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
OS_LIBS = @LIBS@
ACDEFINES = @MOZ_DEFINES@
Modified: trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch 2009-11-05 00:00:02 UTC (rev 60194)
+++ trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch 2009-11-05 00:00:18 UTC (rev 60195)
@@ -5,7 +5,7 @@
endif
-ifeq (Darwin,$(OS_ARCH))
-+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
++ifeq (bundle,$(MOZ_FS_LAYOUT))
EXTRA_DSO_LDOPTS += $(DIST)/bin/XUL
DEPENDENT_LIBS_LIST += XUL
else
Modified: trunk/dports/www/firefox-x11/files/xulrunner-app-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/xulrunner-app-Makefile.patch 2009-11-05 00:00:02 UTC (rev 60194)
+++ trunk/dports/www/firefox-x11/files/xulrunner-app-Makefile.patch 2009-11-05 00:00:18 UTC (rev 60195)
@@ -1,7 +1,7 @@
---- xulrunner/app/Makefile.in.orig 2009-04-07 22:17:16.000000000 -0700
-+++ xulrunner/app/Makefile.in 2009-04-07 22:22:16.000000000 -0700
+--- xulrunner/app/Makefile.in.orig 2009-04-23 18:47:13.000000000 -0700
++++ xulrunner/app/Makefile.in 2009-05-08 15:41:22.000000000 -0700
@@ -87,12 +87,16 @@ CPPSRCS = nsXULRunnerApp.cpp
- ifeq ($(OS_ARCH),WINNT)
+ ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
CPPSRCS += nsRegisterGREWin.cpp
else
-ifneq (,$(filter OS2 Darwin,$(OS_ARCH)))
@@ -23,22 +23,22 @@
ifndef MOZ_ENABLE_LIBXUL
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
++ifeq (bundle,$(MOZ_FS_LAYOUT))
LIBS += $(DIST)/bin/XUL
else
EXTRA_DSO_LIBS += xul
-@@ -202,8 +206,8 @@ LDFLAGS += /HEAP:0x40000
+@@ -206,8 +210,8 @@ LDFLAGS += /HEAP:0x40000
endif
endif
--ifneq (,$(filter-out OS2 WINNT Darwin BeOS,$(OS_ARCH)))
+-ifneq (,$(filter-out OS2 WINCE WINNT Darwin BeOS,$(OS_ARCH)))
-
-+ifneq (,$(filter-out OS2 WINNT BeOS,$(OS_ARCH)))
-+ifneq (cocoa, $(MOZ_WIDGET_TOOLKIT))
- xulrunner:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
- cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
++ifneq (,$(filter-out OS2 WINCE WINNT BeOS,$(OS_ARCH)))
++ifeq (unix, $(MOZ_FS_LAYOUT))
+ xulrunner:: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
+ cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
-e "s|%MOZ_USER_DIR%|.mozilla/xulrunner|" \
-@@ -218,6 +222,7 @@ install:: xulrunner
+@@ -222,6 +226,7 @@ install:: xulrunner
GARBAGE += xulrunner
endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091104/c7d900d8/attachment.html>
More information about the macports-changes
mailing list