[60194] trunk/dports/devel/xulrunner
jeremyhu at macports.org
jeremyhu at macports.org
Wed Nov 4 16:00:03 PST 2009
Revision: 60194
http://trac.macports.org/changeset/60194
Author: jeremyhu at macports.org
Date: 2009-11-04 16:00:02 -0800 (Wed, 04 Nov 2009)
Log Message:
-----------
xulrunner: Bump to 1.9.1.3
Modified Paths:
--------------
trunk/dports/devel/xulrunner/Portfile
trunk/dports/devel/xulrunner/files/configure.patch
trunk/dports/devel/xulrunner/files/icon-Makefile.patch
trunk/dports/devel/xulrunner/files/make-install.patch
trunk/dports/devel/xulrunner/files/system-nss.patch
trunk/dports/devel/xulrunner/files/xpcom-Makefile.patch
trunk/dports/devel/xulrunner/files/xulrunner-app-Makefile.patch
Modified: trunk/dports/devel/xulrunner/Portfile
===================================================================
--- trunk/dports/devel/xulrunner/Portfile 2009-11-04 23:10:48 UTC (rev 60193)
+++ trunk/dports/devel/xulrunner/Portfile 2009-11-05 00:00:02 UTC (rev 60194)
@@ -1,43 +1,57 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
-PortSystem 1.0
+PortSystem 1.0
-name xulrunner
-version 1.9.0.15
-categories devel
-maintainers jeremyhu openmaintainer
-platforms darwin
+name xulrunner
+set component xulrunner
+categories devel
+version 1.9.1.3
+#set ff_version 3.5
+revision 0
+platforms darwin
+maintainers jeremyhu openmaintainer
description Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications
long_description ${description}
-homepage http://developer.mozilla.org/en/docs/XULRunner
-master_sites http://mozilla.isc.org/pub/mozilla.org/xulrunner/releases/${version}/source
+universal_variant no
-distname ${name}-${version}-source
-use_bzip2 yes
+homepage http://developer.mozilla.org/en/docs/XULRunner
+master_sites http://mozilla.isc.org/pub/mozilla.org/${component}/releases/${version}/source
+distname ${component}-${version}-source
-checksums md5 e28e30d74c1488c8a8e2ff8cd2c37439 \
- sha1 06d488f0aee8f9e60dc6526c1d292f3708da301f \
- rmd160 837881c51f206606c55f3aac64fc82fc2698428b
+#master_sites http://mozilla.isc.org/pub/mozilla.org/firefox/releases/${ff_version}/source
+#distname firefox-${ff_version}-source
-# nspr and nss aren't universal
-universal_variant no
+use_bzip2 yes
-worksrcdir mozilla
+checksums md5 ca167e69180ab1230aea0763da270a95 \
+ sha1 83b2625eb74e81b473ac40ac52505e5fc9a497eb \
+ rmd160 c2487c90b4a9490840817c7b00dcccd68a0c4422
-depends_lib \
- port:heimdal \
- port:lcms \
- port:gconf \
- port:esound \
- port:libcanberra \
+worksrcdir mozilla-1.9.1
+
+depends_build \
port:findutils \
- port:nss \
- port:nspr \
- port:gtk2 \
- port:xorg-libXt
+ port:pkgconfig \
+ port:autoconf213
+depends_lib \
+ port:heimdal \
+ port:lcms \
+ port:gconf \
+ port:esound \
+ port:libcanberra \
+ port:findutils \
+ port:nss \
+ port:nspr \
+ port:gtk2 \
+ port:xorg-libXt
+
+use_autoconf yes
+autoconf.cmd autoconf213
+
configure.args \
--with-xulrunner-stub-name=xulrunner-stub \
--disable-static \
@@ -56,7 +70,7 @@
--enable-system-lcms \
--enable-system-cairo \
--enable-system-sqlite \
- --with-default-mozilla-five-home=${prefix}/lib/${name} \
+ --with-default-mozilla-five-home=${prefix}/lib/${component} \
--enable-oji \
--enable-plugins \
--enable-mathml \
@@ -88,16 +102,17 @@
--disable-updater \
--disable-pedantic \
--disable-tests \
- --disable-mochitest
+ --disable-mochitest \
+ --enable-libxul
# Force 32-bit, inline-asm
if {$build_arch == "x86_64"} {
- configure.build_arch i386
+ configure.build_arch i386
} elseif {$build_arch == "ppc64"} {
configure.build_arch ppc
}
-variant debug description "build with debugging symbols" {
+variant debug description {build with debugging symbols} {
configure.args-delete --disable-debug \
--disable-mochitest \
--enable-optimize='-O2' \
@@ -131,17 +146,21 @@
}
# 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)
+# #499218 (nsOggDecoder.patch)
+# 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 nsOggDecoder.patch
post-patch {
# https://bugzilla.mozilla.org/show_bug.cgi?id=485857
@@ -159,12 +178,14 @@
}
# 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/${component}:g" ${worksrcpath}/config/rules.mk
+ reinplace "s:@executable_path:${prefix}/lib/${component}:g" ${worksrcpath}/config/config.mk
+ reinplace "s:@executable_path:${prefix}/lib/${component}:g" ${worksrcpath}/js/src/config/config.mk
+ reinplace "s:@executable_path:${prefix}/lib/${component}:g" ${worksrcpath}/js/src/config/rules.mk
+ reinplace "s:@executable_path:${prefix}/lib/${component}:g" ${worksrcpath}/nsprpub/configure.in
+ reinplace "s:@executable_path:${prefix}/lib/${component}:g" ${worksrcpath}/nsprpub/configure
+ reinplace "s:@executable_path:${prefix}/lib/${component}:g" ${worksrcpath}/security/coreconf/Darwin.mk
+ reinplace "s:@executable_path:${prefix}/lib/${component}: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
@@ -200,24 +221,24 @@
configure.env \
MOZCONFIG="${worksrcpath}/xulrunner/config/mozconfig" \
- MOZILLA_FIVE_HOME="${prefix}/lib/${name}"
+ MOZILLA_FIVE_HOME="${prefix}/lib/${component}"
build.args-append \
- includedir="${prefix}/include/${name}" \
- idldir="${prefix}/share/idl/${name}" \
- installdir="${prefix}/lib/${name}" \
- sdkdir="${prefix}/lib/${name}"
+ includedir="${prefix}/include/${component}" \
+ idldir="${prefix}/share/idl/${component}" \
+ installdir="${prefix}/lib/${component}" \
+ sdkdir="${prefix}/lib/${component}"
destroot.args-append \
- includedir="${prefix}/include/${name}" \
- idldir="${prefix}/share/idl/${name}" \
- installdir="${prefix}/lib/${name}" \
- sdkdir="${prefix}/lib/${name}"
+ includedir="${prefix}/include/${component}" \
+ idldir="${prefix}/share/idl/${component}" \
+ installdir="${prefix}/lib/${component}" \
+ sdkdir="${prefix}/lib/${component}"
-post-destroot {
- # Workaround to get root certs loaded, so https:// works
- ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${name}/libnssckbi.dylib
+post-destroot {
+ ## Workaround to get root certs loaded, so https:// works
+ #ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${component}/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/${component}/unstable/gfxtypes.h"
}
Modified: trunk/dports/devel/xulrunner/files/configure.patch
===================================================================
--- trunk/dports/devel/xulrunner/files/configure.patch 2009-11-04 23:10:48 UTC (rev 60193)
+++ trunk/dports/devel/xulrunner/files/configure.patch 2009-11-05 00:00:02 UTC (rev 60194)
@@ -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/devel/xulrunner/files/icon-Makefile.patch
===================================================================
--- trunk/dports/devel/xulrunner/files/icon-Makefile.patch 2009-11-04 23:10:48 UTC (rev 60193)
+++ trunk/dports/devel/xulrunner/files/icon-Makefile.patch 2009-11-05 00:00:02 UTC (rev 60194)
@@ -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/devel/xulrunner/files/make-install.patch
===================================================================
--- trunk/dports/devel/xulrunner/files/make-install.patch 2009-11-04 23:10:48 UTC (rev 60193)
+++ trunk/dports/devel/xulrunner/files/make-install.patch 2009-11-05 00:00:02 UTC (rev 60194)
@@ -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/devel/xulrunner/files/system-nss.patch
===================================================================
--- trunk/dports/devel/xulrunner/files/system-nss.patch 2009-11-04 23:10:48 UTC (rev 60193)
+++ trunk/dports/devel/xulrunner/files/system-nss.patch 2009-11-05 00:00:02 UTC (rev 60194)
@@ -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/devel/xulrunner/files/xpcom-Makefile.patch
===================================================================
--- trunk/dports/devel/xulrunner/files/xpcom-Makefile.patch 2009-11-04 23:10:48 UTC (rev 60193)
+++ trunk/dports/devel/xulrunner/files/xpcom-Makefile.patch 2009-11-05 00:00:02 UTC (rev 60194)
@@ -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/devel/xulrunner/files/xulrunner-app-Makefile.patch
===================================================================
--- trunk/dports/devel/xulrunner/files/xulrunner-app-Makefile.patch 2009-11-04 23:10:48 UTC (rev 60193)
+++ trunk/dports/devel/xulrunner/files/xulrunner-app-Makefile.patch 2009-11-05 00:00:02 UTC (rev 60194)
@@ -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/d47037aa/attachment-0001.html>
More information about the macports-changes
mailing list