diff options
-rw-r--r-- | Mk/bsd.gecko.mk | 16 | ||||
-rw-r--r-- | www/linux-seamonkey/Makefile | 2 | ||||
-rw-r--r-- | www/linux-seamonkey/distinfo | 4 | ||||
-rw-r--r-- | www/seamonkey-i18n/Makefile | 2 | ||||
-rw-r--r-- | www/seamonkey-i18n/distinfo | 108 | ||||
-rw-r--r-- | www/seamonkey/Makefile | 47 | ||||
-rw-r--r-- | www/seamonkey/distinfo | 8 | ||||
-rw-r--r-- | www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl | 43 | ||||
-rw-r--r-- | www/seamonkey/files/patch-bug878791 | 18 | ||||
-rw-r--r-- | www/seamonkey/files/patch-bug893397 | 2 | ||||
-rw-r--r-- | www/seamonkey/files/patch-bug945046 | 50 | ||||
-rw-r--r-- | www/seamonkey/files/patch-bug946560 | 30 | ||||
-rw-r--r-- | www/seamonkey/files/patch-bug947862 | 31 | ||||
-rw-r--r-- | www/seamonkey/files/patch-config__config.mk | 13 |
14 files changed, 217 insertions, 157 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 04e12c57bb5..f21c11ac8ff 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -187,9 +187,9 @@ Gecko_Pre_Include= bsd.gecko.mk # version is given by the maintainer via the port # or by the user via defined variable try to find # the highest stable installed version. -# Available values: yes 23+ 23 +# Available values: yes 24+ 24 # NOTE: -# default value 23 is used in case of USE_SEAMONKEY=yes +# default value 24 is used in case of USE_SEAMONKEY=yes # # USE_SEAMONKEY_BUILD Add buildtime dependency on SeaMonkey. # Available values: see USE_SEAMONKEY @@ -291,12 +291,12 @@ USE_SEAMONKEY:= ${USE_SEAMONKEY_BUILD} _SEAMONKEY_BUILD_DEPENDS= yes .endif -_SEAMONKEY_DEFAULT_VERSION= 23 -_SEAMONKEY_VERSIONS= 23 -_SEAMONKEY_RANGE_VERSIONS= 23+ +_SEAMONKEY_DEFAULT_VERSION= 24 +_SEAMONKEY_VERSIONS= 24 +_SEAMONKEY_RANGE_VERSIONS= 24+ -# For specifying [23, ..]+ -_SEAMONKEY_23P= 23 +# For specifying [24, ..]+ +_SEAMONKEY_24P= 24 # Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given .if ${USE_SEAMONKEY} == "yes" @@ -338,7 +338,7 @@ IGNORE= cannot install: unknown SeaMonkey version: seamonkey-2.${USE_SEAMONKEY .endif # Dependence lines for different SeaMonkey versions -23_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey +24_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey # Add dependencies .if defined(USE_SEAMONKEY) diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile index 355a5545adb..ed2a3b1b540 100644 --- a/www/linux-seamonkey/Makefile +++ b/www/linux-seamonkey/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.23 +DISTVERSION= 2.24 CATEGORIES= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US diff --git a/www/linux-seamonkey/distinfo b/www/linux-seamonkey/distinfo index 87bff9dadc9..3eb2c18396c 100644 --- a/www/linux-seamonkey/distinfo +++ b/www/linux-seamonkey/distinfo @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.23.tar.bz2) = 7c848d214233dfbc4543f9d76f9c8ec8afc5a21062dfe09acf137ec2be145199 -SIZE (seamonkey-2.23.tar.bz2) = 29492800 +SHA256 (seamonkey-2.24.tar.bz2) = ed4ad37ff9c5d0d36f66bf25b272698e6d5bcf828cfac694d15467d4a4014ce5 +SIZE (seamonkey-2.24.tar.bz2) = 29803592 diff --git a/www/seamonkey-i18n/Makefile b/www/seamonkey-i18n/Makefile index 65e082ebefe..fa9de41f489 100644 --- a/www/seamonkey-i18n/Makefile +++ b/www/seamonkey-i18n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= seamonkey-i18n -PORTVERSION= 2.23 +PORTVERSION= 2.24 CATEGORIES= www mail news editors irc MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack PKGNAMEPREFIX= diff --git a/www/seamonkey-i18n/distinfo b/www/seamonkey-i18n/distinfo index 5bec6ffc22d..c86755071b3 100644 --- a/www/seamonkey-i18n/distinfo +++ b/www/seamonkey-i18n/distinfo @@ -1,54 +1,54 @@ -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.be.langpack.xpi) = b2535be7b8722a66551f2e8c8a3ebbf694b2c3f9edac3d8c6b900ab7cfc9ca02 -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.be.langpack.xpi) = 813117 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ca.langpack.xpi) = 75c998f91f894e12a920688e7dd6086fd57aff7c301f82f624e092e5e8043251 -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ca.langpack.xpi) = 808769 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.cs.langpack.xpi) = eecf04f9c1d92ec0c3acec23b813a84e3ce32ad68a7b200a39e58ca0207ef7fe -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.cs.langpack.xpi) = 808200 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.de.langpack.xpi) = 938c5be269be4c302dde7f955a927d207e0f3c11502ac97aac81266a850824fb -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.de.langpack.xpi) = 815005 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.en-GB.langpack.xpi) = ac432f3f3290939c52376cd1d5072bc51de2c94d09a3e75cd7cbc100acd15e85 -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.en-GB.langpack.xpi) = 778468 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.en-US.langpack.xpi) = 0d27744b5647944083f10bb097ac89b5933ca7bec8d102ffc27dea33d4c4d533 -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.en-US.langpack.xpi) = 779456 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.es-AR.langpack.xpi) = 9c2e76b64c13e54d3c7d2380516786fbbcca50c8f5e17d4d4977b3c61594f107 -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.es-AR.langpack.xpi) = 837251 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.es-ES.langpack.xpi) = 5b7dc80e425580f3b9b40b8658454ac0d426cd8ed10a1ea77f3f57c84dd9339c -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.es-ES.langpack.xpi) = 808859 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.fi.langpack.xpi) = 5d609c8ebb1385ee8575ae0ac229cb07ef1cbc0a0179bd12ef23a08a970d966f -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.fi.langpack.xpi) = 779342 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.fr.langpack.xpi) = bdf26493ce8d8709e4a6d42ed21a983de6bb7cfa6e693e62d76ab52cca987fc9 -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.fr.langpack.xpi) = 789400 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.gl.langpack.xpi) = 419e0f16e870194a721d1e5761a8e4e55cbbf76bdbf445aa20f8caedd1606071 -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.gl.langpack.xpi) = 788124 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.hu.langpack.xpi) = 5d4d8af93375d3fdd579c5f0abc7a6a2845c2d1db3ef6d4de92bc1bebdffe284 -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.hu.langpack.xpi) = 822606 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.it.langpack.xpi) = 12fc5f170c24aa17671bcaf6ed7d0b68850107892352d738d24bb763430588ce -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.it.langpack.xpi) = 724843 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ja-JP-mac.langpack.xpi) = cdcdaefb6c4327c0267661164e64e25c3cff1287cbcbf141bc62090ef0634f98 -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ja-JP-mac.langpack.xpi) = 884592 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ja.langpack.xpi) = 31796aaffc1aa058bb1ffa2fa802c8f7422b5008594024c26c5f645de065402c -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ja.langpack.xpi) = 859315 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.lt.langpack.xpi) = 51be5c56793348c2f411dacdd5412c39aa8f5e3bbeda356111af70c5180335dd -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.lt.langpack.xpi) = 824245 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.nb-NO.langpack.xpi) = 5cf084b2f692dd0d17aa5f69dc8dff5a5be880f76aa23ba66b757a7d5492ebb4 -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.nb-NO.langpack.xpi) = 801346 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.nl.langpack.xpi) = ede8ca4771256adb7bd615f573c97e061714816fa013fec274891093e1fc6cbc -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.nl.langpack.xpi) = 775394 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.pl.langpack.xpi) = e46ae87d8f4910efc8a22486d560333f9b15785526cc13bd9cd7f5607be022d0 -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.pl.langpack.xpi) = 849833 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.pt-PT.langpack.xpi) = 100233b5e2ec6545eca11115bfedee218ba636682bdb40f79b9dea943d0a38e1 -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.pt-PT.langpack.xpi) = 811279 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ru.langpack.xpi) = d550283530cbceb1e6a6a246742da3f7e5d194c44d4a8112a4a323b0cb235efc -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.ru.langpack.xpi) = 881980 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.sk.langpack.xpi) = bbec5ef62ae14c8ff5d3e887af4ad4ee067bebb482d5fc2a8102fbf4b9980335 -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.sk.langpack.xpi) = 835661 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.sv-SE.langpack.xpi) = 7179ab458c337bb668a99394b2a64984bc841d7e653e43315295fc1b53fa121b -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.sv-SE.langpack.xpi) = 804082 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.tr.langpack.xpi) = bb6396f3dea2704687f5932d53eed3e61c0b931142d4423e79242f2bf2394db3 -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.tr.langpack.xpi) = 849214 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.uk.langpack.xpi) = 625c7a135bef8170e649bf8ce8822dea652adf3b21d26b014e4fc33291ea279c -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.uk.langpack.xpi) = 851915 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.zh-CN.langpack.xpi) = 3e0fde7598a7d1235aa90afc906fb15476ae917ad97bf39b51124a670b31258a -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.zh-CN.langpack.xpi) = 812656 -SHA256 (xpi/seamonkey-i18n-2.23/seamonkey-2.23.zh-TW.langpack.xpi) = 29cf5d2e5ed79f1b1c4e974da17bd24f8d4432ead064f75661738b6633c80289 -SIZE (xpi/seamonkey-i18n-2.23/seamonkey-2.23.zh-TW.langpack.xpi) = 835163 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.be.langpack.xpi) = 73048f93f2bc1de227d78f4baacced8ed481d0effc1d7b3b1073464dcdb7d872 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.be.langpack.xpi) = 814307 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ca.langpack.xpi) = 40bb6f6ac6e3e2739777eb9b219c88e232e2b20437ec15ff93344cabd6f61047 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ca.langpack.xpi) = 811480 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.cs.langpack.xpi) = 5605ff0b35abd28c7e84b87d2a30434803f74263e53b8b1350a9836fafea71f7 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.cs.langpack.xpi) = 809460 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.de.langpack.xpi) = 842fdef4a36a9f5f9ba99e51e4bd99e0890eb279ec151f1a6527c90d123a1997 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.de.langpack.xpi) = 816146 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.en-GB.langpack.xpi) = 8da55c64db56bdb9356c51d21a4a09a4530541a38e946543496c60bdc60ef1d3 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.en-GB.langpack.xpi) = 781088 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.en-US.langpack.xpi) = 3fae3e80f0b046ee88133c949705264e7b002ec00b2ada403c5d811a77ae87d1 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.en-US.langpack.xpi) = 782073 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.es-AR.langpack.xpi) = 28de7925df64046ce11476a5fc463e6d166bcf1f895ead8d96c563c636075052 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.es-AR.langpack.xpi) = 838204 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.es-ES.langpack.xpi) = 88d260366fb1c841c46f464510b45e4fe76b636faa02ee649e8143dba8143434 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.es-ES.langpack.xpi) = 811306 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.fi.langpack.xpi) = 209e64e3e4132d05beb124f3642e57cd5a341d73e417644725c2a8060cd56a90 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.fi.langpack.xpi) = 780302 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.fr.langpack.xpi) = db23d07a62d4f0a7f5a42f2fd1d33a0704ba484c4801e9d218469deadb122106 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.fr.langpack.xpi) = 790321 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.gl.langpack.xpi) = 9bc816dda158a5840dfe666e63c7045a73c12021ad1b19ff57ad8b8435124789 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.gl.langpack.xpi) = 789063 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.hu.langpack.xpi) = 44099a7e28c99e40483bcec2d1e33e9fe46c493f6dd5b2f95ad83d3b164e81ce +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.hu.langpack.xpi) = 823607 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.it.langpack.xpi) = c4225ca1648957624fb801000404166072277730ce5b3aab3cf815a787c64acc +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.it.langpack.xpi) = 725388 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ja-JP-mac.langpack.xpi) = 8a273e9d1070c8467ddf19290f5fc4a9382f67cc30b498e2523b48f8756965da +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ja-JP-mac.langpack.xpi) = 887433 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ja.langpack.xpi) = 246c15ce3c6f2245b518b08a88390879a5b0e329467f4d108f13e526c7d9201d +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ja.langpack.xpi) = 862158 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.lt.langpack.xpi) = d92d7755ccb9a27e2c473eb36c76f3735633d6671dd681d3613ab0e0ea4987d2 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.lt.langpack.xpi) = 827034 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.nb-NO.langpack.xpi) = 083be6b731ff4c0e97c1385d66719765e1e09992015686acec6057ecdd2f8837 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.nb-NO.langpack.xpi) = 802295 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.nl.langpack.xpi) = f58c6c559b678fc978d7822b67b11cdc0d54d055bb5a6c6059d2bf8e6ebc5d54 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.nl.langpack.xpi) = 776386 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.pl.langpack.xpi) = e5406c7cdf55841544806445e3f9f86532bed9e09d3da3077363d4e6cebe9fce +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.pl.langpack.xpi) = 852730 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.pt-PT.langpack.xpi) = 66dfe3c112c1c6c071b6a0086531f101579d1c92a0d909bbcfee48aedb647969 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.pt-PT.langpack.xpi) = 812004 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ru.langpack.xpi) = d6679b379995552a0ad7b096daa94dffb10d9392a3f8936592deedef4859791b +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.ru.langpack.xpi) = 882614 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.sk.langpack.xpi) = 4976e86f4faa81cc7ca5ca73305f827d0347a0e2990377fc00c505ce468cb777 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.sk.langpack.xpi) = 836795 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.sv-SE.langpack.xpi) = a1cd1c18dcbeb56ca35e4d14c3c2f63e682ce3f51179901c640277cbd0ecb33a +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.sv-SE.langpack.xpi) = 804953 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.tr.langpack.xpi) = 59f170597e514ca92fab8f7139a5ece6f99d1410e2f52ca4b8452ba687c9b007 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.tr.langpack.xpi) = 850114 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.uk.langpack.xpi) = 62972d16d400379183758c09373b4ace1e579a2afa2195f6b31026d50033aea9 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.uk.langpack.xpi) = 852876 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.zh-CN.langpack.xpi) = 54d7957ffbc32b34ab6490d1abce26af07e949c265bedc887c15d8a5608f4914 +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.zh-CN.langpack.xpi) = 813619 +SHA256 (xpi/seamonkey-i18n-2.24/seamonkey-2.24.zh-TW.langpack.xpi) = 90f6ec47141d5ea1aa6809c2ae2ba6c5a8c17e86b0647e5f627c19c0d490fe6c +SIZE (xpi/seamonkey-i18n-2.24/seamonkey-2.24.zh-TW.langpack.xpi) = 837900 diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 12941aa033f..47089609a0c 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.23 -PORTREVISION= 2 +DISTVERSION= 2.24 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ @@ -14,15 +13,17 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= nspr>=4.10.2:${PORTSDIR}/devel/nspr \ - nss>=3.15:${PORTSDIR}/security/nss \ - sqlite3>=3.7.17:${PORTSDIR}/databases/sqlite3 \ + nss>=3.15.4:${PORTSDIR}/security/nss \ + sqlite3>=3.8.0.2:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ unzip:${PORTSDIR}/archivers/unzip +# cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \ + LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l -EM_VERSION= 1.6 -L_VERSION= 2.8b1 +EM_VERSION= 1.6.1_pre20140112 +L_VERSION= 2.9b1 SSP_UNSAFE= yes USE_AUTOTOOLS= autoconf213:env @@ -36,14 +37,15 @@ QT_NONSTANDARD= yes WANT_PERL= yes ALL_TARGET= default USE_GL= gl -USE_DOS2UNIX= mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp +USES= dos2unix +DOS2UNIX_FILES= mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MOZ_EXTENSIONS= default MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \ --enable-application=suite -USE_MOZILLA= # empty +USE_MOZILLA= -cairo MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 @@ -76,6 +78,10 @@ MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi +.if ${PORT_OPTIONS:MALSA} +BUILD_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib +.endif + .if ! ${PORT_OPTIONS:MMAILNEWS} MOZ_OPTIONS+= --disable-ldap --disable-mailnews .else @@ -86,17 +92,19 @@ MOZ_OPTIONS+= --disable-ldap --enable-mailnews MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif .if ${PORT_OPTIONS:MENIGMAIL} -MASTER_SITES+= https://www.enigmail.net/download/source/:enigmail +#MASTER_SITES+= https://www.enigmail.net/download/source/:enigmail +MASTER_SITES+= https://dev.gentoo.org/~polynomial-c/mozilla/:enigmail DISTFILES+= ${EM_DISTFILE}:enigmail RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg EM_DISTNAME= enigmail-${EM_VERSION} -EM_DISTFILE= ${EM_DISTNAME}.tar.gz -EM_XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/bin/${EM_DISTNAME}-${OPSYS:L}-${ARCH:S/amd64/x86_64/}.xpi +EM_DISTFILE= ${EM_DISTNAME}.tar.xz +EM_XPI_FILE= ${WRKSRC}/mailnews/extensions/enigmail/build/${EM_DISTNAME}-${OPSYS:L}-${ARCH:S/amd64/x86_64/:S/i386/x86/}-gcc3.xpi EM_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5} EM_ID= ${PORTNAME}@mozilla-enigmail.org EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \ ${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \ ${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl .endif .endif @@ -108,7 +116,7 @@ MOZ_OPTIONS+= --disable-composer MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:L}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi +XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:L}${OSREL}-${ARCH:S/x86/i386/:S/amd64/x86_64/}.xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@seamonkey.mozilla.org .else @@ -133,10 +141,11 @@ post-patch: ${WRKDIR}/${MOZILLA}.desktop .if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} @${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' \ - ${WRKSRC}/mailnews/extensions/enigmail/makemake + ${WRKSRC}/mailnews/extensions/enigmail/util/fixlang.pl \ + ${WRKSRC}/mailnews/extensions/enigmail/util/make-lang-xpi.pl @${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \ -e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \ - ${WRKSRC}/mailnews/extensions/enigmail/Makefile.in + ${WRKSRC}/mailnews/extensions/enigmail/Makefile @${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \ -e '/em:maxVersion/s/pre//' \ ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf @@ -148,11 +157,15 @@ pre-configure: (cd ${MOZSRC}/js/src/ && ${AUTOCONF}) .if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} +post-configure: + cd ${WRKSRC}/mailnews/extensions/enigmail/ && \ + ${SETENV} ${MAKE_ENV} ./configure +.endif + +.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} post-build: - cd ${WRKSRC}/mailnews/extensions/enigmail && \ - ./makemake -r -o ${MOZ_OBJDIR} ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER} all xpi \ - -C ${MOZ_OBJDIR}/mailnews/extensions/enigmail + -C ${WRKSRC}/mailnews/extensions/enigmail .endif port-pre-install: diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index 5498fae97a9..fa0381f1d79 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.23.source.tar.bz2) = 45f8fd527981148ad96bc5d90eea6eb76d83f1e1b87262122ec4928127f01de1 -SIZE (seamonkey-2.23.source.tar.bz2) = 148268011 -SHA256 (enigmail-1.6.tar.gz) = 10d5eb7ba364b9b6e6275aae8bba1d0e4321ed7d55a715337d566ccf2a56ea4d -SIZE (enigmail-1.6.tar.gz) = 1231111 +SHA256 (seamonkey-2.24.source.tar.bz2) = 63855265b4754dd056af8d611b50219577a592466cdf1d3865028d86ed680474 +SIZE (seamonkey-2.24.source.tar.bz2) = 149845514 +SHA256 (enigmail-1.6.1_pre20140112.tar.xz) = 2d89a9186c3ccfc9397c933c6f63c0518224fea0096d7a292dba3765de088149 +SIZE (enigmail-1.6.1_pre20140112.tar.xz) = 916028 diff --git a/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl b/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl new file mode 100644 index 00000000000..c96f7ee2063 --- /dev/null +++ b/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl @@ -0,0 +1,43 @@ +commit 49a1daf +Author: Patrick Brunschwig <patrick@enigmail.net> +Date: Tue Jan 28 18:10:54 2014 +0100 + + fixed detection of compiler type for better supporting cross-compilers +--- + config/getOsTarget.pl | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git config/getOsTarget.pl config/getOsTarget.pl +index 91285cd..cf4a233 100755 +--- mailnews/extensions/enigmail/config/getOsTarget.pl ++++ mailnews/extensions/enigmail/config/getOsTarget.pl +@@ -9,13 +9,15 @@ + # -c : CPU and compiler type + # -o : OS type + ++use File::Basename; ++ + if ($#ARGV != 3) { + exit (1); + } + + my $srcOs = $ARGV[1]; + my $srcCpu = $ARGV[2]; +-my $srcComp = $ARGV[3]; ++my $srcComp = basename($ARGV[3]); + + my $targetOs = ""; + my $targetCpu = ""; +@@ -95,10 +97,10 @@ else { + if ($targetOs eq "WINNT") { + $targetComp = "msvc"; + } +-if ($srcComp =~ /^gcc/) { ++elsif ($srcComp =~ /gcc/ || $srcComp =~ /clang/) { + $targetComp = "gcc3"; + } +-elsif ($srcComp =~ /^cc/) { ++elsif ($srcComp =~ /cc/) { + if ($targetOs eq "SunOS") { + $targetComp = "sunc"; + } diff --git a/www/seamonkey/files/patch-bug878791 b/www/seamonkey/files/patch-bug878791 index d888521e20e..bcdd5e9bfea 100644 --- a/www/seamonkey/files/patch-bug878791 +++ b/www/seamonkey/files/patch-bug878791 @@ -1,11 +1,11 @@ --- mozilla/toolkit/components/osfile/modules/osfile_unix_allthreads.jsm.orig 2013-05-11 21:19:53.000000000 +0200 +++ mozilla/toolkit/components/osfile/modules/osfile_unix_allthreads.jsm 2013-06-02 17:15:05.000000000 +0200 -@@ -40,7 +40,7 @@ if (typeof Components != "undefined") { - // Open libc - let libc; - let libc_candidates = [ "libSystem.B.dylib", -- "libc.so.6", -+ "libc.so.7", - "libc.so" ]; - for (let i = 0; i < libc_candidates.length; ++i) { - try { +@@ -41,7 +41,7 @@ let Const = SharedAll.Constants.libc; + // Open libc + let libc; + let libc_candidates = [ "libSystem.B.dylib", +- "libc.so.6", ++ "libc.so.7", + "libc.so" ]; + for (let i = 0; i < libc_candidates.length; ++i) { + try { diff --git a/www/seamonkey/files/patch-bug893397 b/www/seamonkey/files/patch-bug893397 index 091d15fb41e..0815e8ba400 100644 --- a/www/seamonkey/files/patch-bug893397 +++ b/www/seamonkey/files/patch-bug893397 @@ -20,7 +20,7 @@ index 07b01de..11706af 100644 'osx_corewlan.mm', ] +elif CONFIG['OS_ARCH'] == 'FreeBSD': -+ CPP_SOURCES += [ ++ SOURCES += [ + 'nsWifiScannerFreeBSD.cpp', + ] elif CONFIG['OS_ARCH'] == 'WINNT': diff --git a/www/seamonkey/files/patch-bug945046 b/www/seamonkey/files/patch-bug945046 index 134c06e1590..51ea60ea499 100644 --- a/www/seamonkey/files/patch-bug945046 +++ b/www/seamonkey/files/patch-bug945046 @@ -35,15 +35,16 @@ diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterMan index b8147c8..0ffb34e 100644 --- mozilla/xpcom/base/nsMemoryReporterManager.cpp +++ mozilla/xpcom/base/nsMemoryReporterManager.cpp -@@ -196,6 +196,43 @@ static nsresult GetResidentFast(int64_t* - return GetResident(aN); +@@ -204,6 +204,61 @@ ResidentFastDistinguishedAmount(int64_t* aN) + return ResidentDistinguishedAmount(aN); } +#ifdef __FreeBSD__ +#include <libutil.h> ++#include <algorithm> + +static nsresult -+GetKinfoVmentrySelf(int64_t* prss) ++GetKinfoVmentrySelf(int64_t* prss, uint64_t* maxreg) +{ + int cnt; + struct kinfo_vmentry *vmmap, *kve; @@ -52,11 +53,16 @@ index b8147c8..0ffb34e 100644 + + if (prss) + *prss = 0; ++ if (maxreg) ++ *maxreg = 0; + + for (int i = 0; i < cnt; i++) { + kve = &vmmap[i]; + if (prss) + *prss += kve->kve_private_resident; ++ if (maxreg) ++ *maxreg = std::max(*maxreg, ++ kve->kve_end - kve->kve_start); + } + + free(vmmap); @@ -65,26 +71,39 @@ index b8147c8..0ffb34e 100644 + +#define HAVE_PRIVATE_REPORTER +static nsresult -+GetPrivate(int64_t* aN) ++PrivateDistinguishedAmount(int64_t* aN) +{ + int64_t priv; -+ nsresult rv = GetKinfoVmentrySelf(&priv); ++ nsresult rv = GetKinfoVmentrySelf(&priv, NULL); + if (NS_SUCCEEDED(rv)) + *aN = priv * getpagesize(); + + return NS_OK; +} ++ ++#define HAVE_VSIZE_MAX_CONTIGUOUS_REPORTER 1 ++static nsresult ++VsizeMaxContiguousDistinguishedAmount(int64_t* aN) ++{ ++ uint64_t biggestRegion; ++ nsresult rv = GetKinfoVmentrySelf(NULL, &biggestRegion); ++ if (NS_SUCCEEDED(rv)) ++ *aN = biggestRegion; ++ ++ return NS_OK; ++} +#endif // FreeBSD + #elif defined(SOLARIS) #include <procfs.h> -@@ -370,6 +407,24 @@ static nsresult GetResidentFast(int64_t* +@@ -416,6 +470,25 @@ VsizeMaxContiguousDistinguishedAmount(int64_t* aN) + return NS_OK; } - #define HAVE_PRIVATE_REPORTER ++#define HAVE_PRIVATE_REPORTER +static nsresult -+GetPrivate(int64_t* aN) ++PrivateDistinguishedAmount(int64_t* aN) +{ + PROCESS_MEMORY_COUNTERS_EX pmcex; + pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX); @@ -100,11 +119,22 @@ index b8147c8..0ffb34e 100644 +} +#endif // XP_<PLATFORM> + ++#ifdef HAVE_VSIZE_MAX_CONTIGUOUS_REPORTER + class VsizeMaxContiguousReporter MOZ_FINAL : public MemoryUniReporter + { + public: +@@ -429,8 +502,9 @@ public: + return VsizeMaxContiguousDistinguishedAmount(aAmount); + } + }; ++#endif + +-#define HAVE_PRIVATE_REPORTER +#ifdef HAVE_PRIVATE_REPORTER class PrivateReporter MOZ_FINAL : public MemoryUniReporter { public: -@@ -382,21 +437,10 @@ public: +@@ -443,21 +517,10 @@ public: NS_IMETHOD GetAmount(int64_t* aAmount) { @@ -119,7 +149,7 @@ index b8147c8..0ffb34e 100644 - - *aAmount = pmcex.PrivateUsage; - return NS_OK; -+ return GetPrivate(aAmount); ++ return PrivateDistinguishedAmount(aAmount); } }; - diff --git a/www/seamonkey/files/patch-bug946560 b/www/seamonkey/files/patch-bug946560 index f1ab78af9cc..7ef52a57a6b 100644 --- a/www/seamonkey/files/patch-bug946560 +++ b/www/seamonkey/files/patch-bug946560 @@ -2,7 +2,16 @@ diff --git xpcom/base/nsMemoryInfoDumper.cpp xpcom/base/nsMemoryInfoDumper.cpp index 0b2f78c..d857374 100644 --- mozilla/xpcom/base/nsMemoryInfoDumper.cpp +++ mozilla/xpcom/base/nsMemoryInfoDumper.cpp -@@ -30,7 +30,7 @@ +@@ -6,7 +6,7 @@ + + #include "mozilla/nsMemoryInfoDumper.h" + +-#ifdef XP_LINUX ++#if defined(XP_LINUX) || defined(__FreeBSD__) + #include "mozilla/Preferences.h" + #endif + #include "mozilla/unused.h" +@@ -31,7 +31,7 @@ #include <unistd.h> #endif @@ -11,7 +20,7 @@ index 0b2f78c..d857374 100644 #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> -@@ -109,7 +109,7 @@ private: +@@ -110,7 +110,7 @@ private: } // anonymous namespace @@ -20,7 +29,7 @@ index 0b2f78c..d857374 100644 namespace { /* -@@ -548,7 +548,7 @@ nsMemoryInfoDumper::~nsMemoryInfoDumper( +@@ -552,7 +552,7 @@ nsMemoryInfoDumper::~nsMemoryInfoDumper() /* static */ void nsMemoryInfoDumper::Initialize() { @@ -30,11 +39,20 @@ index 0b2f78c..d857374 100644 FifoWatcher::MaybeCreate(); #endif diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp -index 8c65665..8f6d0e9 100644 +index 1252e27..6f22093 100644 --- mozilla/xpcom/base/nsMemoryReporterManager.cpp +++ mozilla/xpcom/base/nsMemoryReporterManager.cpp -@@ -824,7 +824,7 @@ nsMemoryReporterManager::Init() - RegisterReporter(new mozilla::dmd::DMDReporter); +@@ -17,7 +17,7 @@ + #include "nsPIDOMWindow.h" + #include "nsIObserverService.h" + #include "nsIGlobalObject.h" +-#if defined(XP_LINUX) ++#if defined(XP_LINUX) || defined(__FreeBSD__) + #include "nsMemoryInfoDumper.h" + #endif + #include "mozilla/Attributes.h" +@@ -898,7 +898,7 @@ nsMemoryReporterManager::Init() + RegisterStrongReporter(new mozilla::dmd::DMDReporter()); #endif -#if defined(XP_LINUX) diff --git a/www/seamonkey/files/patch-bug947862 b/www/seamonkey/files/patch-bug947862 deleted file mode 100644 index 3dcb47036a2..00000000000 --- a/www/seamonkey/files/patch-bug947862 +++ /dev/null @@ -1,31 +0,0 @@ -diff --git media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc -index 7ef6c66..6ae1e97 100644 ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc -@@ -15,7 +15,7 @@ - #include <Windows.h> - #include <WinSock.h> - #include <MMSystem.h> --#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC)) -+#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) - #include <sys/time.h> - #include <time.h> - #endif -@@ -209,7 +209,7 @@ class WindowsRealTimeClock : public RealTimeClock { - WindowsHelpTimer* _helpTimer; - }; - --#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC)) -+#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) - class UnixRealTimeClock : public RealTimeClock { - public: - UnixRealTimeClock() {} -@@ -240,7 +240,7 @@ Clock* Clock::GetRealTimeClock() { - #if defined(_WIN32) - static WindowsRealTimeClock clock(&global_help_timer); - return &clock; --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) - static UnixRealTimeClock clock; - return &clock; - #else diff --git a/www/seamonkey/files/patch-config__config.mk b/www/seamonkey/files/patch-config__config.mk deleted file mode 100644 index 8eb805bf6af..00000000000 --- a/www/seamonkey/files/patch-config__config.mk +++ /dev/null @@ -1,13 +0,0 @@ -Fix fallout from http://hg.mozilla.org/releases/comm-release/rev/a6ab55f00e21 -XPIDL_LINK being undefined breaks enigmail build ---- config/config.mk.orig Tue Dec 10 10:22:36 2013 -+++ config/config.mk Tue Dec 10 10:22:57 2013 -@@ -325,6 +325,7 @@ MY_RULES := $(DEPTH)/config/myrules.mk - # Default command macros; can be overridden in <arch>.mk. - # - CCC = $(CXX) -+XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link - - OS_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS) $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS) - - |