From owner-freebsd-gecko@FreeBSD.ORG Sat Jul 23 00:58:16 2011 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC8AE106564A for ; Sat, 23 Jul 2011 00:58:16 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id F31F98FC08 for ; Sat, 23 Jul 2011 00:58:15 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id p6N0wEir002156 for ; Sat, 23 Jul 2011 00:58:14 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p6N0w9qY097277 for freebsd-gecko@freebsd.org; Sat, 23 Jul 2011 00:58:09 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 23 Jul 2011 00:58:09 GMT Message-Id: <201107230058.p6N0w9qY097277@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r593 - in branches/experimental/www: seamonkey seamonkey-i18n seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Jul 2011 00:58:16 -0000 Author: flo Date: Sat Jul 23 00:58:09 2011 New Revision: 593 Log: update to 2.2 Added: branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util.h branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_posix.cc branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_file_posix.cc branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_thread_posix.cc branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-build-build_config.h branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in branches/experimental/www/seamonkey/files/pkg-message.in Deleted: branches/experimental/www/seamonkey/files/mozconfig-generic.in branches/experimental/www/seamonkey/files/patch-bugzilla-449453 branches/experimental/www/seamonkey/files/patch-sysnss branches/experimental/www/seamonkey/files/patch-xptcall-alpha Modified: branches/experimental/www/seamonkey-i18n/Makefile branches/experimental/www/seamonkey-i18n/Makefile.lang branches/experimental/www/seamonkey-i18n/Makefile.option branches/experimental/www/seamonkey-i18n/distinfo branches/experimental/www/seamonkey/Makefile branches/experimental/www/seamonkey/distinfo branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Modified: branches/experimental/www/seamonkey-i18n/Makefile ============================================================================== --- branches/experimental/www/seamonkey-i18n/Makefile Fri Jul 22 21:46:03 2011 (r592) +++ branches/experimental/www/seamonkey-i18n/Makefile Sat Jul 23 00:58:09 2011 (r593) @@ -6,7 +6,7 @@ # PORTNAME= seamonkey-i18n -PORTVERSION= 2.1 +PORTVERSION= 2.2 CATEGORIES= www MASTER_SITE_SUBDIR= seamonkey/releases/${PORTVERSION}/langpack PKGNAMEPREFIX= @@ -14,7 +14,7 @@ DIST_SUBDIR= xpi/${DISTNAME} MAINTAINER= gecko@FreeBSD.org -COMMENT= Localized interface for SeaMonkey 2.1 +COMMENT= Localized interface for SeaMonkey 2.2 EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip Modified: branches/experimental/www/seamonkey-i18n/Makefile.lang ============================================================================== --- branches/experimental/www/seamonkey-i18n/Makefile.lang Fri Jul 22 21:46:03 2011 (r592) +++ branches/experimental/www/seamonkey-i18n/Makefile.lang Sat Jul 23 00:58:09 2011 (r593) @@ -6,16 +6,13 @@ # # Currently, the following 22 languages are supported. # -SEAMONKEY_I18N_ALL_= be ca cs de en-GB en-US es-AR es-ES \ - fi fr it ja-JP-mac ja lt nb-NO nl pl \ +SEAMONKEY_I18N_ALL_= ca cs de en-GB en-US es-AR es-ES \ + fi fr hu it ja-JP-mac ja lt nb-NO nl pl \ pt-PT ru sk sv-SE tr .if defined(SEAMONKEY_I18N_ALL) || (defined(PACKAGE_BUILDING) && !exists(${OPTIONSFILE})) || make(makesum) SEAMONKEY_I18N= ${SEAMONKEY_I18N_ALL_} .else -.ifndef WITHOUT_LANG_BE -SEAMONKEY_I18N+= be -.endif .ifndef WITHOUT_LANG_CA SEAMONKEY_I18N+= ca .endif @@ -43,6 +40,9 @@ .ifndef WITHOUT_LANG_FR SEAMONKEY_I18N+= fr .endif +.ifndef WITHOUT_LANG_HU +SEAMONKEY_I18N+= hu +.endif .ifndef WITHOUT_LANG_IT SEAMONKEY_I18N+= it .endif Modified: branches/experimental/www/seamonkey-i18n/Makefile.option ============================================================================== --- branches/experimental/www/seamonkey-i18n/Makefile.option Fri Jul 22 21:46:03 2011 (r592) +++ branches/experimental/www/seamonkey-i18n/Makefile.option Sat Jul 23 00:58:09 2011 (r593) @@ -5,8 +5,7 @@ # $FreeBSD$ # -OPTIONS= LANG_BE "Byelorussian" off \ - LANG_CA "Catalan" off \ +OPTIONS= LANG_CA "Catalan" off \ LANG_CS "Czech" off \ LANG_NL "Dutch" off \ LANG_DE "German" on \ @@ -14,6 +13,7 @@ LANG_US "English US" off \ LANG_FI "Finnish" off \ LANG_FR "French" on \ + LANG_HU "Hungarian" on \ LANG_IT "Italian" on \ LANG_JA "Japanese" off \ LANG_JP "Japanese (ja-JP-mac)" off \ Modified: branches/experimental/www/seamonkey-i18n/distinfo ============================================================================== --- branches/experimental/www/seamonkey-i18n/distinfo Fri Jul 22 21:46:03 2011 (r592) +++ branches/experimental/www/seamonkey-i18n/distinfo Sat Jul 23 00:58:09 2011 (r593) @@ -1,44 +1,44 @@ -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.be.langpack.xpi) = 87f5ab012318254ecf5e334e296f2e65695078b45db32aaac6b8ce871dbc6472 -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.be.langpack.xpi) = 795039 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.ca.langpack.xpi) = 0816f4417b0f8649d88fd901935e089aa3ba1321c303b7ab19060d7f071c404f -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.ca.langpack.xpi) = 814609 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.cs.langpack.xpi) = 000d71f5e81dba3c8b9303ba99f0acb6e8dd058d93d13d81dd8ff7ff68e53c4d -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.cs.langpack.xpi) = 817990 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.de.langpack.xpi) = 975c6d6a999e707bceaf451ae11e8d3e53651cbc4c13aa26a7f8ef52597be0a2 -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.de.langpack.xpi) = 860216 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.en-GB.langpack.xpi) = 4f00bd90704ff8d2a6dd2b789e97bb3a2f7ecc6c3659020aacc289fac7977c19 -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.en-GB.langpack.xpi) = 789980 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.en-US.langpack.xpi) = d24af54a3cd3c9963aa8afdb664bf02ca0aa81e4f437c77777585725019c134f -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.en-US.langpack.xpi) = 789807 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.es-AR.langpack.xpi) = dc6e7e1870a51e6dbdd0244b6ea54e5741499d61381d549ae0e4d7008af41af1 -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.es-AR.langpack.xpi) = 816080 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.es-ES.langpack.xpi) = 0ac88dad77a191997c2fcc64a5dc097e864beb926a94abec73cf0dde56dbc47a -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.es-ES.langpack.xpi) = 795743 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.fi.langpack.xpi) = d1ddd572ca63f706f683dc4d5fdd1aa7c80c10535593bcff632ce82927584e5f -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.fi.langpack.xpi) = 814960 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.fr.langpack.xpi) = 0fb181683f30c68f1bdf3f966baab1a0998b1860662765683b58b009621d3936 -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.fr.langpack.xpi) = 899043 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.it.langpack.xpi) = eb821ad2e8fc015dc9be9d1ff4f84aff1348da5e029030627d8a3066e47a708f -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.it.langpack.xpi) = 741721 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.ja-JP-mac.langpack.xpi) = 28897de94f6a95561adfe1a715071f41969d9934c8a5cc9119bd8e8f7a435c96 -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.ja-JP-mac.langpack.xpi) = 888931 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.ja.langpack.xpi) = 9ca92c7f2be842aa286b3e04263ac87025e5966601808860e0ef15dea4f8ffd2 -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.ja.langpack.xpi) = 864361 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.lt.langpack.xpi) = ae621feaf31d4ee44752950e7427c9c76b182d4b824581cbaffad004d631e247 -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.lt.langpack.xpi) = 962406 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.nb-NO.langpack.xpi) = 985b17cd8ce897a0a467d71d8c6e58b324c1dfc8f4876242cab55d96a91ecd09 -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.nb-NO.langpack.xpi) = 809401 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.nl.langpack.xpi) = 8fe7a4d7efcc17896eed3dec4085fa70f75c07e4b4b1fc610e3f3ecbbef8f06a -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.nl.langpack.xpi) = 807185 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.pl.langpack.xpi) = c4652efd647a13a880bac27f22afe74c2c127ca419f1a2d567dab17c70fbc051 -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.pl.langpack.xpi) = 828384 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.pt-PT.langpack.xpi) = 2fcd9eeb7ae41d21bd3ac8b893a890565a7fc9f8eee8feaddace82fae2419cec -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.pt-PT.langpack.xpi) = 845399 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.ru.langpack.xpi) = d79872afe9404b110cb76b27a329a22b4cc278c8cad0a8ff11f7b40864eab1d7 -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.ru.langpack.xpi) = 891790 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.sk.langpack.xpi) = 591043092fe38c8d468070c910cd42b82e82cc489d3e3de2169d42e781856238 -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.sk.langpack.xpi) = 843122 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.sv-SE.langpack.xpi) = eac3f84d9317bb966e97fed494319c63cb8f21c772d9fe4eb6eaf65903e5c2a2 -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.sv-SE.langpack.xpi) = 872350 -SHA256 (xpi/seamonkey-i18n-2.1/seamonkey-2.1.tr.langpack.xpi) = 7e9d6c436d67000b7ac66607a9b5cef3755c36d41eb1175b026d7ec1bdd518e4 -SIZE (xpi/seamonkey-i18n-2.1/seamonkey-2.1.tr.langpack.xpi) = 807997 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ca.langpack.xpi) = 433a6e1dea81a1dbe9fc5f0e360845affb71dec9e3c5a669cc355281f17d70d9 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ca.langpack.xpi) = 811514 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.cs.langpack.xpi) = 666d504cf2d216a7a8de8a13898719da89a42166e4ee1d4c2d2bfcb4c9e39b6e +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.cs.langpack.xpi) = 814944 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.de.langpack.xpi) = 13c3f08bcda947e5c20111a73bee995d5ac8bd97defd8ad235530b61d75de72a +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.de.langpack.xpi) = 857283 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-GB.langpack.xpi) = 8133dc83554f01712330682c2b269ccb2917ee3064ef7394ef9f82db26845932 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-GB.langpack.xpi) = 787529 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-US.langpack.xpi) = 8ac1ce65dc5044deabd9e1b49234f448cff3435b0660e42e091ddb611d219cda +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-US.langpack.xpi) = 786992 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-AR.langpack.xpi) = 4db1673c306b821dca7de124415b4b92c339a076bc7cd38892ae06927659c982 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-AR.langpack.xpi) = 813118 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-ES.langpack.xpi) = 08158721a1122ad6a74f688792e5f7e6e33ce078e1118dd8f13386da6eda6bd9 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-ES.langpack.xpi) = 785711 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fi.langpack.xpi) = a1350aa978c30a71f5ea2a7983bf2bb3f27ad46ad2572d355b565664ebe66804 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fi.langpack.xpi) = 807217 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fr.langpack.xpi) = fcac0a2c51cf193fa2c712670a6c73e94ed58588ddd8dc0ad3e708b777f81842 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fr.langpack.xpi) = 896104 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.hu.langpack.xpi) = 95a1e3f685b74a8d655bdeec7bdb7a8ce88699dff9432483b5cadab3bbe10982 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.hu.langpack.xpi) = 827308 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.it.langpack.xpi) = 28e7b90ff8d7596d7fca6c253d8fd2b1fc9464217cb7fe1a86a4ae9b832a1f8c +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.it.langpack.xpi) = 739672 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja-JP-mac.langpack.xpi) = a83857fdebb8df144e725ccbc399e68447dc887d3539c27be4c2e5dd8ed43796 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja-JP-mac.langpack.xpi) = 885812 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja.langpack.xpi) = ad3d03f42747427c3c862a6a30cb4b513a66fb21a8fee778cc56f3f3a013761e +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja.langpack.xpi) = 861377 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.lt.langpack.xpi) = d129bc0278ca8637df4fe377c29ffcc687d2d20b4de35b7144d83508bfeb6713 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.lt.langpack.xpi) = 959540 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nb-NO.langpack.xpi) = 15818961fa34bc4610fcce26f8bd8885495f030d2ddf5d3f05fa0ee69aafbf96 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nb-NO.langpack.xpi) = 805675 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nl.langpack.xpi) = 34385a5ae09d976b7124366cea2304ce6b4489119c337b175fb9340529324a76 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nl.langpack.xpi) = 804311 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pl.langpack.xpi) = 44e0e2883601f7a71c64e8fad1e5653904dab5f25834cc96b479f7d3efa73f01 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pl.langpack.xpi) = 825438 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pt-PT.langpack.xpi) = d733234dc5b11ea32b611d54efefea31eea331d21555db91712f9810d1f2493c +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pt-PT.langpack.xpi) = 842511 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ru.langpack.xpi) = 15700e56b4ead24fb08c8a65b615343a56f364dee311dc5e808f1055c9277c5a +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ru.langpack.xpi) = 889516 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sk.langpack.xpi) = a25e78e2c9e682910bd6fcdc7639ac7902d07f99ac9ccb85e567bb28606dcfcd +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sk.langpack.xpi) = 840212 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sv-SE.langpack.xpi) = 83b5e7572ed550e299b2813a0826d3760e18fd49b56a3e852f3be32cd133a1fc +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sv-SE.langpack.xpi) = 869508 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.tr.langpack.xpi) = 0bb342f7845493c35f743b3f8589e9fa0d7ed1c283f400eeb929617c13f26f56 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.tr.langpack.xpi) = 805151 Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Fri Jul 22 21:46:03 2011 (r592) +++ branches/experimental/www/seamonkey/Makefile Sat Jul 23 00:58:09 2011 (r593) @@ -6,7 +6,7 @@ # PORTNAME= seamonkey -DISTVERSION= 2.1 +DISTVERSION= 2.2 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -15,6 +15,10 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser +BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr +LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ + event-1.4:${PORTSDIR}/devel/libevent + CONFLICTS_BUILD= spidermonkey-1.[0-7]* CONFLICTS_INSTALL= seamonkey-2.0* USE_BZIP2= yes @@ -44,8 +48,9 @@ --enable-canvas \ --disable-necko-wifi \ --disable-updater \ - --disable-ipc -USE_MOZILLA= -png -dbm -jpeg -xft + --with-system-libevent=${LOCALBASE} + +USE_MOZILLA= -png -nss -dbm -jpeg -xft MOZ_TOOLKIT= cairo-gtk2 MOZILLA_PLIST_DIRS= bin lib MOZ_PKGCONFIG_FILES= @@ -56,16 +61,16 @@ COMPOSER "Enable the HTML Composer module" on \ LDAP "Enable LDAP support for Mailnews" on \ CHATZILLA "Enable the Chatzilla IRC module" on \ + LIGHTNING "Enable calendar extension" off \ DBUS "Enable D-BUS support" on \ SMB "Enable smb:// URI support using gnomevfs" off .include -MOZSRC:= ${WRKDIR}/comm-2.0/mozilla -WRKSRC= ${WRKDIR}/comm-2.0 +MOZSRC:= ${WRKDIR}/comm-release/mozilla +WRKSRC= ${WRKDIR}/comm-release -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED -} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} +GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui @@ -106,18 +111,29 @@ notify.1:${PORTSDIR}/devel/libnotify .endif +.if defined(WITH_LIGHTNING) +MOZ_OPTIONS+= --enable-calendar +MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar +LIGHTNING_DIR= share/lightning +SUB_FILES+= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message +.else +MOZ_OPTIONS+= --disable-calendar +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \ ${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ - ${WRKSRC}/mozilla/storage/build/Makefile.in + ${MOZSRC}/storage/build/Makefile.in \ + ${MOZSRC}/toolkit/library/Makefile.in \ + ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ ${WRKSRC}/mozilla/modules/libpref/src/init/all.js @${REINPLACE_CMD} -e 's||\"${LOCALBASE}/include/iconv.h\"|g' \ ${WRKSRC}/configure \ ${WRKSRC}/mozilla/configure \ - ${WRKSRC}/mozilla/intl/uconv/native/nsNativeUConvService.cpp \ ${WRKSRC}/mozilla/xpcom/io/nsNativeCharsetUtils.cpp @${REINPLACE_CMD} -e 's|libgnome-2.so.0|libgnome-2.so|' \ ${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \ @@ -146,4 +162,11 @@ ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/seamonkey.desktop ${PREFIX}/share/applications +post-install: +.if defined(WITH_LIGHTNING) + ${MKDIR} ${PREFIX}/${LIGHTNING_DIR} + ${INSTALL_DATA} ${MOZSRC}/dist/xpi-stage/lightning.xpi ${PREFIX}/${LIGHTNING_DIR}/lightning-${PORTNAME}.xpi + @${CAT} ${PKGMESSAGE} +.endif + .include Modified: branches/experimental/www/seamonkey/distinfo ============================================================================== --- branches/experimental/www/seamonkey/distinfo Fri Jul 22 21:46:03 2011 (r592) +++ branches/experimental/www/seamonkey/distinfo Sat Jul 23 00:58:09 2011 (r593) @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.1.source.tar.bz2) = 1eff4a7d5dab6e709145a7d88e60b879d053cbead38d013a37e115d383eac2d6 -SIZE (seamonkey-2.1.source.tar.bz2) = 84304638 +SHA256 (seamonkey-2.2.source.tar.bz2) = 0b713e2f78a2c5139bf16736bd12e87017cdbc675948d4a8893a3d834bf8c13a +SIZE (seamonkey-2.2.source.tar.bz2) = 87478968 Deleted: branches/experimental/www/seamonkey/files/mozconfig-generic.in ============================================================================== --- branches/experimental/www/seamonkey/files/mozconfig-generic.in Sat Jul 23 00:58:09 2011 (r592) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,8 +0,0 @@ -ac_add_options --prefix=@FAKEDIR@ -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -export PERL="@PERL@" Deleted: branches/experimental/www/seamonkey/files/patch-bugzilla-449453 ============================================================================== --- branches/experimental/www/seamonkey/files/patch-bugzilla-449453 Sat Jul 23 00:58:09 2011 (r592) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,99 +0,0 @@ -Index: ldap/sdks/c-sdk/ldap/include/portable.h -=================================================================== -RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/portable.h,v -retrieving revision 5.15 -diff -u -8 -p -r5.15 portable.h ---- ldap/sdks/c-sdk/ldap/include/portable.h 3 Oct 2006 20:43:40 -0000 5.15 -+++ ldap/sdks/c-sdk/ldap/include/portable.h 6 Oct 2010 19:06:58 -0000 -@@ -117,17 +117,17 @@ - #else - #define OPENLOG_OPTIONS ( LOG_PID | LOG_NOWAIT ) - #endif - - /* - * some systems don't have the BSD re_comp and re_exec routines - */ - #ifndef NEED_BSDREGEX --#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) -+#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) - #define NEED_BSDREGEX - #endif - #endif - - /* - * many systems do not have the setpwfile() library routine... we just - * enable use for those systems we know have it. - */ -Index: ldap/sdks/c-sdk/ldap/include/regex.h -=================================================================== -RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/regex.h,v -retrieving revision 5.2 -diff -u -8 -p -r5.2 regex.h ---- ldap/sdks/c-sdk/ldap/include/regex.h 15 Oct 2003 17:26:00 -0000 5.2 -+++ ldap/sdks/c-sdk/ldap/include/regex.h 6 Oct 2010 19:06:59 -0000 -@@ -68,18 +68,18 @@ extern "C" { - #define LDAP_CALL - #endif - #endif - - #ifdef NEEDPROTOS - int re_init( void ); - void re_lock( void ); - int re_unlock( void ); --char * LDAP_CALL re_comp( char *pat ); --int LDAP_CALL re_exec( char *lp ); -+char * LDAP_CALL re_comp( const char *pat ); -+int LDAP_CALL re_exec( const char *lp ); - void LDAP_CALL re_modw( char *s ); - int LDAP_CALL re_subs( char *src, char *dst ); - #else /* NEEDPROTOS */ - int re_init(); - void re_lock(); - int re_unlock(); - char * LDAP_CALL re_comp(); - int LDAP_CALL re_exec(); -Index: ldap/sdks/c-sdk/ldap/libraries/libldap/regex.c -=================================================================== -RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c,v -retrieving revision 5.2 -diff -u -8 -p -r5.2 regex.c ---- ldap/sdks/c-sdk/ldap/libraries/libldap/regex.c 15 Oct 2003 17:26:03 -0000 5.2 -+++ ldap/sdks/c-sdk/ldap/libraries/libldap/regex.c 6 Oct 2010 19:06:59 -0000 -@@ -262,17 +262,17 @@ chset(REGEXCHAR c) - bittab[((c) & (unsigned)BLKIND) >> 3] |= bitarr[(c) & BITIND]; - } - - #define badpat(x) (*nfa = END, x) - #define store(x) *mp++ = x - - char * - LDAP_CALL --re_comp( char *pat ) -+re_comp( const char *pat ) - { - register REGEXCHAR *p; /* pattern pointer */ - register REGEXCHAR *mp=nfa; /* nfa pointer */ - register REGEXCHAR *lp; /* saved pointer.. */ - register REGEXCHAR *sp=nfa; /* another one.. */ - - register int tagi = 0; /* tag stack index */ - register int tagc = 1; /* actual tag count */ -@@ -508,17 +508,17 @@ static REGEXCHAR *pmatch(); - * If a match is found, bopat[0] and eopat[0] are set - * to the beginning and the end of the matched fragment, - * respectively. - * - */ - - int - LDAP_CALL --re_exec( char *lp ) -+re_exec( const char *lp ) - { - register REGEXCHAR c; - register REGEXCHAR *ep = 0; - register REGEXCHAR *ap = nfa; - - bol = (REGEXCHAR*)lp; - - bopat[0] = 0; Added: branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc Sat Jul 23 00:58:09 2011 (r593) @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc~ ++++ mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc +@@ -39,6 +39,7 @@ + * ***** END LICENSE BLOCK ***** */ + + #include "base/atomicops.h" ++#include "base/lock.h" + + namespace base { + namespace subtle { Added: branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util.h Sat Jul 23 00:58:09 2011 (r593) @@ -0,0 +1,13 @@ +--- mozilla/ipc/chromium/src/base/file_util.h~ ++++ mozilla/ipc/chromium/src/base/file_util.h +@@ -15,8 +15,9 @@ + #elif defined(ANDROID) + #include + #elif defined(OS_POSIX) ++#include ++#include + #include +-#include + #endif + + #include Added: branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jul 23 00:58:09 2011 (r593) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/file_util_linux.cc~ ++++ mozilla/ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetShmemTempDir(FilePath* path) { + #ifdef ANDROID + return GetTempDir(path); + #else +- *path = FilePath("/dev/shm"); ++ *path = FilePath("/tmp"); + return true; + #endif + } Added: branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_posix.cc Sat Jul 23 00:58:09 2011 (r593) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/file_util_posix.cc~ ++++ mozilla/ipc/chromium/src/base/file_util_posix.cc +@@ -30,6 +30,8 @@ + #include "base/string_util.h" + #include "base/time.h" + ++#define stat64 stat ++ + namespace file_util { + + #if defined(GOOGLE_CHROME_BUILD) Added: branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_file_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_file_posix.cc Sat Jul 23 00:58:09 2011 (r593) @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/platform_file_posix.cc~ ++++ mozilla/ipc/chromium/src/base/platform_file_posix.cc +@@ -9,6 +9,7 @@ + #ifdef ANDROID + #include + #endif ++#include + + #include "base/logging.h" + #include "base/string_util.h" Added: branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_thread_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Sat Jul 23 00:58:09 2011 (r593) @@ -0,0 +1,12 @@ +--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-04-27 09:34:28.000000000 +0200 ++++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc 2011-04-27 19:47:36.344446266 +0200 +@@ -34,7 +33,8 @@ + #if defined(OS_MACOSX) + return mach_thread_self(); + #elif defined(OS_LINUX) +- return syscall(__NR_gettid); ++ // TODO(BSD): find a better thread ID ++ return reinterpret_cast(pthread_self()); + #endif + } + Added: branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h Sat Jul 23 00:58:09 2011 (r593) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h~ ++++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h +@@ -34,7 +34,7 @@ + #include "base/third_party/nspr/prcpucfg_win.h" + #elif defined(__APPLE__) + #include "base/third_party/nspr/prcpucfg_mac.h" +-#elif defined(__linux__) || defined(ANDROID) ++#elif defined(__FreeBSD__) || defined(ANDROID) + #include "base/third_party/nspr/prcpucfg_linux.h" + #else + #error Provide a prcpucfg.h appropriate for your platform Added: branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-build-build_config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-build-build_config.h Sat Jul 23 00:58:09 2011 (r593) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/build/build_config.h~ ++++ mozilla/ipc/chromium/src/build/build_config.h +@@ -17,7 +17,7 @@ + // A set of macros to use for platform detection. + #if defined(__APPLE__) + #define OS_MACOSX 1 +-#elif defined(__linux__) || defined(ANDROID) ++#elif defined(__FreeBSD__) || defined(ANDROID) + #define OS_LINUX 1 + #elif defined(_WIN32) + #define OS_WIN 1 Added: branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in Sat Jul 23 00:58:09 2011 (r593) @@ -0,0 +1,12 @@ +--- mozilla/toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500 ++++ mozilla/toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500 +@@ -181,7 +181,7 @@ + export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS) + $(INSTALL) $^ . + +-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) ++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% + + ifdef MOZ_ENABLE_LIBXUL + include $(srcdir)/libxul-rules.mk + Modified: branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Fri Jul 22 21:46:03 2011 (r592) +++ branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Sat Jul 23 00:58:09 2011 (r593) @@ -1,16 +1,16 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2009-09-17 17:14:19.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2009-09-17 17:20:22.000000000 +0200 -@@ -70,6 +70,9 @@ - ifeq (Darwin,$(OS_ARCH)) - DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-05-28 15:26:21.000000000 +0200 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-06-03 18:39:42.769434047 +0200 +@@ -74,6 +74,9 @@ + # NOTE: MODULE_OPTIMIZE_FLAGS must be set before including config.mk + MODULE_OPTIMIZE_FLAGS=-O3 endif +ifeq (x86_64,$(OS_TEST)) +CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp +endif endif endif - # -@@ -87,7 +90,7 @@ + +@@ -117,7 +120,7 @@ endif endif # IA64 Linux @@ -19,20 +19,20 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -100,6 +103,12 @@ +@@ -129,6 +132,12 @@ + ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64) CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp endif - # +# FreeBSD/amd64 +# +ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) +CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp +endif +# - # BeOS/Intel (uses the same unixish_x86 code) # - ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC) -@@ -150,9 +159,15 @@ + # Neutrino/Intel (uses the same unixish_x86 code) + # +@@ -184,9 +193,15 @@ ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s endif # @@ -49,7 +49,7 @@ CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp endif # -@@ -307,7 +322,7 @@ +@@ -341,7 +356,7 @@ # # Linux/PPC # @@ -58,7 +58,7 @@ CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s AS := $(CC) -c -x assembler-with-cpp -@@ -385,6 +400,15 @@ +@@ -419,6 +434,15 @@ ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s endif # Deleted: branches/experimental/www/seamonkey/files/patch-sysnss ============================================================================== --- branches/experimental/www/seamonkey/files/patch-sysnss Sat Jul 23 00:58:09 2011 (r592) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,196 +0,0 @@ ---- mozilla/security/manager/Makefile.in.orig 2011-02-09 21:07:24.000000000 +0100 -+++ mozilla/security/manager/Makefile.in 2011-02-15 23:30:11.000000000 +0100 -@@ -49,16 +49,8 @@ - MODULE = psm - - ifndef MOZ_NATIVE_NSS --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) - endif - --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --NSSUTIL3_LIB = $(DLL_PREFIX)nssutil3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - ifndef NSS_DISABLE_DBM - NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX) - NSSDBM3_CHK = $(DLL_PREFIX)nssdbm3.chk -@@ -68,23 +60,6 @@ - endif - - ifndef MOZ_NATIVE_NSS --ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH))) --SDK_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ -- $(NULL) --else --SDK_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \ -- $(NULL) --endif - endif - - # Default -@@ -339,74 +314,8 @@ - - libs:: - ifndef MOZ_NATIVE_NSS --ifndef NSS_DISABLE_DBM -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/dbm $(DEFAULT_GMAKE_FLAGS) --endif -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) --ifdef ENABLE_TESTS --# Need certutil binary for mochitest certificates generation -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS) -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS) -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/modutil $(DEFAULT_GMAKE_FLAGS) --endif --ifndef SKIP_CHK --ifndef ENABLE_TESTS # Just avoid secondary compile -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) --endif -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin --ifndef NSS_DISABLE_DBM --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin --endif --endif --ifndef MOZ_NATIVE_NSS --# NSS installs headers to dist/public and we want them in dist/include -- $(NSINSTALL) -D $(DIST)/include/nss -- (cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \ -- (cd $(DIST)/include && tar -xf -) - endif -+ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ -@@ -419,47 +328,6 @@ - - install:: - ifndef MOZ_NATIVE_NSS -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) --endif - endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -476,10 +344,4 @@ - $(MAKE) -C pki $@ - endif - ifndef MOZ_NATIVE_NSS -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - endif ---- mozilla/security/manager/ssl/src/Makefile.in.orig 2009-08-26 19:05:39.000000000 +0200 -+++ mozilla/security/manager/ssl/src/Makefile.in 2009-08-26 19:06:17.000000000 +0200 -@@ -138,13 +138,14 @@ - - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += $(NSS_CFLAGS) -+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss - - EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ - $(NSS_LIBS) \ -+ $(LOCAL_INCLUDES) \ - $(NULL) - - include $(topsrcdir)/config/rules.mk Deleted: branches/experimental/www/seamonkey/files/patch-xptcall-alpha ============================================================================== --- branches/experimental/www/seamonkey/files/patch-xptcall-alpha Sat Jul 23 00:58:09 2011 (r592) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,459 +0,0 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura */ -+ -+#include -+#include -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ Added: branches/experimental/www/seamonkey/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/pkg-message.in Sat Jul 23 00:58:09 2011 (r593) @@ -0,0 +1,10 @@ +***************************************************************************** +In order to activate the Lightning extension, every user should install the +XPI file into his own profile via the menu: + +Tools -> Add-ons -> Extensions -> Icon left of the search field + -> Install From File + +The XPI file was installed as: +%%PREFIX%%/share/lightning/lightning-seamonkey.xpi +*****************************************************************************