From owner-svn-ports-head@FreeBSD.ORG Wed Feb 20 22:32:36 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8ECE8F70; Wed, 20 Feb 2013 22:32:36 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 802EFDFE; Wed, 20 Feb 2013 22:32:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1KMWadh057004; Wed, 20 Feb 2013 22:32:36 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1KMWXdB056983; Wed, 20 Feb 2013 22:32:33 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201302202232.r1KMWXdB056983@svn.freebsd.org> From: Florian Smeets Date: Wed, 20 Feb 2013 22:32:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312679 - in head: Mk www/seamonkey www/seamonkey-i18n www/seamonkey/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2013 22:32:36 -0000 Author: flo Date: Wed Feb 20 22:32:32 2013 New Revision: 312679 URL: http://svnweb.freebsd.org/changeset/ports/312679 Log: - update to 2.16 - add DuckDuckGo search plugin [1] Security: http://www.vuxml.org/freebsd/e3f0374a-7ad6-11e2-84cd-d43d7e0c7c02.html Submitted by: DuckDuckGo [1] In collaboration with: Jan Beich Added: head/www/seamonkey/files/patch-bug817267 (contents, props changed) head/www/seamonkey/files/patch-duckduckgo (contents, props changed) head/www/seamonkey/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h (contents, props changed) Deleted: head/www/seamonkey/files/patch-bug732340 head/www/seamonkey/files/patch-bug778078 head/www/seamonkey/files/patch-bug781457 head/www/seamonkey/files/patch-bug783505 head/www/seamonkey/files/patch-bug788955 head/www/seamonkey/files/patch-bug798354 head/www/seamonkey/files/patch-bug800401 head/www/seamonkey/files/patch-bug806139 head/www/seamonkey/files/patch-bug815025 head/www/seamonkey/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h head/www/seamonkey/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp head/www/seamonkey/files/patch-z-bug762445 Modified: head/Mk/bsd.gecko.mk head/www/seamonkey-i18n/Makefile head/www/seamonkey-i18n/distinfo head/www/seamonkey/Makefile head/www/seamonkey/distinfo head/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile head/www/seamonkey/files/patch-bug685258 (contents, props changed) head/www/seamonkey/files/patch-bug791305 head/www/seamonkey/files/patch-bug807492 head/www/seamonkey/files/patch-bug828003 head/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp head/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in (contents, props changed) head/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc (contents, props changed) head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp (contents, props changed) Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Wed Feb 20 22:31:57 2013 (r312678) +++ head/Mk/bsd.gecko.mk Wed Feb 20 22:32:32 2013 (r312679) @@ -190,9 +190,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 15+ 15 +# Available values: yes 16+ 16 # NOTE: -# default value 15 is used in case of USE_SEAMONKEY=yes +# default value 16 is used in case of USE_SEAMONKEY=yes # # USE_SEAMONKEY_BUILD Add buildtime dependency on SeaMonkey. # Available values: see USE_SEAMONKEY @@ -294,12 +294,12 @@ USE_SEAMONKEY:= ${USE_SEAMONKEY_BUILD _SEAMONKEY_BUILD_DEPENDS= yes .endif -_SEAMONKEY_DEFAULT_VERSION= 15 -_SEAMONKEY_VERSIONS= 15 -_SEAMONKEY_RANGE_VERSIONS= 15+ +_SEAMONKEY_DEFAULT_VERSION= 16 +_SEAMONKEY_VERSIONS= 16 +_SEAMONKEY_RANGE_VERSIONS= 16+ -# For specifying [15, ..]+ -_SEAMONKEY_15P= 15 +# For specifying [16, ..]+ +_SEAMONKEY_16P= 16 # Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given .if ${USE_SEAMONKEY} == "yes" @@ -341,7 +341,7 @@ IGNORE= cannot install: unknown SeaMon .endif # Dependence lines for different SeaMonkey versions -15_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey +16_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey # Add dependencies .if defined(USE_SEAMONKEY) Modified: head/www/seamonkey-i18n/Makefile ============================================================================== --- head/www/seamonkey-i18n/Makefile Wed Feb 20 22:31:57 2013 (r312678) +++ head/www/seamonkey-i18n/Makefile Wed Feb 20 22:32:32 2013 (r312679) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= seamonkey-i18n -PORTVERSION= 2.15 +PORTVERSION= 2.16 CATEGORIES= www MASTER_SITE_SUBDIR= seamonkey/releases/${PORTVERSION}/langpack PKGNAMEPREFIX= @@ -18,7 +18,7 @@ PLIST?= ${WRKDIR}/plist PLISTD?= ${WRKDIR}/plist_dirs PLISTF?= ${WRKDIR}/plist_files -USE_SEAMONKEY= 15 +USE_SEAMONKEY= 16 USE_XPI= seamonkey linux-seamonkey USE_SUBMAKE= yes Modified: head/www/seamonkey-i18n/distinfo ============================================================================== --- head/www/seamonkey-i18n/distinfo Wed Feb 20 22:31:57 2013 (r312678) +++ head/www/seamonkey-i18n/distinfo Wed Feb 20 22:32:32 2013 (r312679) @@ -1,46 +1,46 @@ -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ca.langpack.xpi) = 6d50618890ce0e027a267a660acd5077bd92204ff51a633935dd2e14755bf548 -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ca.langpack.xpi) = 774381 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.cs.langpack.xpi) = 8fccf87607c994fa17fbfe702b540bbb12b07634b2c04b37e0a557d2abe3f48f -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.cs.langpack.xpi) = 780635 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.de.langpack.xpi) = a505f3a527772e0fbabeeec22f9b897f884baf6f37387008cbb2f8f5a59fd122 -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.de.langpack.xpi) = 803512 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.en-GB.langpack.xpi) = c212ae7470dde686171a22ebc2f453e24dbc983f56f232fe9bf5df32986f09fb -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.en-GB.langpack.xpi) = 749207 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.en-US.langpack.xpi) = 5a769a47423138f6906d33f286dc537127bd67d19a234b9c025c7427feeac52f -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.en-US.langpack.xpi) = 750320 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.es-AR.langpack.xpi) = 3886c630c357018a753e7811bfff7a2a0b8feb384cb1154cb054125429e7d6a5 -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.es-AR.langpack.xpi) = 822641 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.es-ES.langpack.xpi) = 36f2f9b492bb090ef558e3cf2e50c0d4e67f8d438745fcf23828af611d880d24 -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.es-ES.langpack.xpi) = 771022 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.fi.langpack.xpi) = 3f167297e49ea07e30c0a9344a78ecc36d41bf52645f826b87d721d21a8b70b9 -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.fi.langpack.xpi) = 769725 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.fr.langpack.xpi) = 2ef7cef1d5c10c19c007991873d4862d0f7be58852e40210393c8ecb84d4efde -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.fr.langpack.xpi) = 779197 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.hu.langpack.xpi) = 3c5692c45a0b5c5f57c05611d639b02974756fc00f344c66a507cd6b700ce46b -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.hu.langpack.xpi) = 814029 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.it.langpack.xpi) = 4b6ad130c007c39f77d4f0e4993e9d6972b80561f8d8535a8eed35c685a3fc80 -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.it.langpack.xpi) = 720238 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ja-JP-mac.langpack.xpi) = bbda684ee88b8d6b10fc92fd78802b614b6ea476c36f8513a2316114ba6fbaf1 -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ja-JP-mac.langpack.xpi) = 852408 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ja.langpack.xpi) = 49527887f98b0f7a0b062888474502067ffa65a1f82b54ead13ffd5eafd2f8d3 -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ja.langpack.xpi) = 827550 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.lt.langpack.xpi) = 13870b04fdec8cff3b482ee1662ce9a4a18f8830902726e6ed4ed294862bf683 -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.lt.langpack.xpi) = 793490 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.nb-NO.langpack.xpi) = b7e1d4cb09c7b178ceef9e46f21df0f01ecf605a253f419827d9ff1628edb4ac -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.nb-NO.langpack.xpi) = 768618 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.nl.langpack.xpi) = 7024a0e51f718e2b6d7780e16c173600abf9b7b15cd5a26ec32e20111a44fa76 -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.nl.langpack.xpi) = 765521 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.pl.langpack.xpi) = c4e02b93829255fdf11b8d41ce406bf152f18187e4c4a5cd274add7c99413b2e -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.pl.langpack.xpi) = 815325 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.pt-PT.langpack.xpi) = e682683f36279888792b2a0bea5efb19c81f1c4577f3ee0860263ac4be29945a -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.pt-PT.langpack.xpi) = 801658 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ru.langpack.xpi) = 1d7f61ffb9fc39941ab6f4c33a72ce11799c6124b57a93cca37949b2e87bf018 -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ru.langpack.xpi) = 873512 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.sk.langpack.xpi) = 8ee2cbbe409af42d49d5867f1f099bd38db6c9fdb8b71b6d43433707c30ab913 -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.sk.langpack.xpi) = 807146 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.sv-SE.langpack.xpi) = 10ca3e4aa7d6c6d9386ec336e1164d013459d4792989fb74d5ebdfe6034ba4ab -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.sv-SE.langpack.xpi) = 792884 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.tr.langpack.xpi) = b2f4e90228c06c85686b5f8d0fbf37105aceba9ce581930937892bb359a882b3 -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.tr.langpack.xpi) = 831669 -SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.uk.langpack.xpi) = a047bed31c246951a43edf4889dc69c882612bf389f505b612d62457d0246cdd -SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.uk.langpack.xpi) = 831595 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ca.langpack.xpi) = e02e367cfa1cf2e3962410765f9978ba87d432638fa0676f4d419f762a78c669 +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ca.langpack.xpi) = 777209 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.cs.langpack.xpi) = 96649b94ecaaf22fac7c9674b8db37a4b8c82784fc0b7ce9ad77a9958c68c45b +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.cs.langpack.xpi) = 782322 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.de.langpack.xpi) = c9a2b8be76b7f70b91c5dca606ccb9c9c3d465da1a3aa1ce67a613b508d925b8 +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.de.langpack.xpi) = 805627 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.en-GB.langpack.xpi) = 5da43319f2d63a7c8256ea1cb7d26ea0c680afde5ccb4e3995f94702d552d73e +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.en-GB.langpack.xpi) = 751439 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.en-US.langpack.xpi) = 916e77dca508bd02dab76991cf2b4a6a1cbf8ce9357e93c6d93ccb377c651230 +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.en-US.langpack.xpi) = 752024 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.es-AR.langpack.xpi) = 4b7dfa49f05760cb6722a9544a09c3202073f40cfafd3282a1ffdf423058d72a +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.es-AR.langpack.xpi) = 824333 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.es-ES.langpack.xpi) = 0023c3c49089cb15794c6723cece84b5f4032f35d961852821c23d1177ad170f +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.es-ES.langpack.xpi) = 772662 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.fi.langpack.xpi) = 41612f0ef771daba34d38896239f1446679b1c411dc9053f9153bf7910ae4437 +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.fi.langpack.xpi) = 772027 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.fr.langpack.xpi) = 0461b666df8cc0f28024df329d87f8a3403c6581535ffa4996a34d9d2b0a1e38 +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.fr.langpack.xpi) = 781405 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.hu.langpack.xpi) = 7b65c00bda86527c167cb763bbc9b2f2ba4b20109f8c8735f377fac5b081db15 +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.hu.langpack.xpi) = 816446 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.it.langpack.xpi) = 7719d2255f43ab085747153ed770e26cdc173e764bbd8ba1afb22bd5223ed24b +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.it.langpack.xpi) = 721930 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ja-JP-mac.langpack.xpi) = 284c7b0b8c6170bf7f1de4ebd7b9e6c56707815b8fa2ff1c17bc6201442c4bbd +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ja-JP-mac.langpack.xpi) = 854852 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ja.langpack.xpi) = 12fbad03a2b868491fc83c5ddc00fe0f6ea9c9a0c3c2a670ef714889750df23a +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ja.langpack.xpi) = 829870 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.lt.langpack.xpi) = 851a3d6d1e82482d6998c2f7f22f8c5ffc5e95f1a05a23b49a661a5c3df695d8 +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.lt.langpack.xpi) = 795358 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.nb-NO.langpack.xpi) = 264bac89d8cb25b9c0c6e20b816ecfe3811746026be242f47b90b4ea8f09152f +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.nb-NO.langpack.xpi) = 772249 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.nl.langpack.xpi) = b0db8fc017f807bf3b011b79cb8040b3e53bc77522cc8803ec0af4b927876060 +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.nl.langpack.xpi) = 767742 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.pl.langpack.xpi) = 3ef35349ceb6603c91882707b36453511de3eb9ce5910f25f712ae497dd700ed +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.pl.langpack.xpi) = 813178 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.pt-PT.langpack.xpi) = f3fa3d272772898a4daa74a7b135198f99f8b060574ffb02849ccd78d043a880 +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.pt-PT.langpack.xpi) = 805319 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ru.langpack.xpi) = 49d580909b61526ac271472826b2b659b85aaf419cb21977cdd185eba531e3f5 +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ru.langpack.xpi) = 875919 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.sk.langpack.xpi) = 3c420a328427db54528dbf168ae6389da581cda45c17d75c7eaa098714552bda +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.sk.langpack.xpi) = 808953 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.sv-SE.langpack.xpi) = 4fb1abdf5018e8d4037403ac22a35ac22850904609d8d7b27c5601b835c08284 +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.sv-SE.langpack.xpi) = 795061 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.tr.langpack.xpi) = fc600b1adde387315e060c31a7a6c5394f6804aa7cb050655cfb25111dda96a1 +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.tr.langpack.xpi) = 834967 +SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.uk.langpack.xpi) = 8c7d5af2ea2c2b751ca12e175cc78bec7ac84eeb378c3c9c54c62d9659a7d440 +SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.uk.langpack.xpi) = 835210 Modified: head/www/seamonkey/Makefile ============================================================================== --- head/www/seamonkey/Makefile Wed Feb 20 22:31:57 2013 (r312678) +++ head/www/seamonkey/Makefile Wed Feb 20 22:32:32 2013 (r312679) @@ -2,23 +2,24 @@ # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.15 +DISTVERSION= 2.16 CATEGORIES?= www ipv6 -MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} -MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source -DISTFILES= seamonkey-${DISTVERSION}.source${EXTRACT_SUFX} -EXTRACT_ONLY= seamonkey-${DISTVERSION}.source${EXTRACT_SUFX} +MASTER_SITES= ${MASTER_SITE_MOZILLA} +MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source +DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} +EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser -BUILD_DEPENDS= nspr>=4.9.3:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.9.4:${PORTSDIR}/devel/nspr \ nss>=3.14.1:${PORTSDIR}/security/nss \ sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ unzip:${PORTSDIR}/archivers/unzip -EM_VERSION= 1.5.0 +EM_VERSION= 1.5.1 +L_VERSION= 2.1b1 USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=-2.7 @@ -33,6 +34,7 @@ WANT_PERL= yes GNU_CONFIGURE= yes ALL_TARGET= default USE_GL= gl +USE_DOS2UNIX= mozilla/media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome @@ -116,7 +118,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.xpi +XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.freebsd${OSREL}-${ARCH:S/amd64/x86_64/}.xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@seamonkey.mozilla.org .else Modified: head/www/seamonkey/distinfo ============================================================================== --- head/www/seamonkey/distinfo Wed Feb 20 22:31:57 2013 (r312678) +++ head/www/seamonkey/distinfo Wed Feb 20 22:32:32 2013 (r312679) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.15.source.tar.bz2) = 29ef839f30bb5998cc60adfe16b2e5e64abc14e48cbf10dff98b5b3a5260f5c7 -SIZE (seamonkey-2.15.source.tar.bz2) = 120128259 -SHA256 (enigmail-1.5.0.tar.gz) = 51f55573448586718c8d7e664329d519b02c4b28af4910bcb550961ace9a9e71 -SIZE (enigmail-1.5.0.tar.gz) = 1216071 +SHA256 (seamonkey-2.16.source.tar.bz2) = eb694309d3186737c30b745db650de89de4b4aebb49bf609ed9eb89e3fb9b8a3 +SIZE (seamonkey-2.16.source.tar.bz2) = 121957357 +SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0 +SIZE (enigmail-1.5.1.tar.gz) = 1213954 Modified: head/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile ============================================================================== --- head/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile Wed Feb 20 22:31:57 2013 (r312678) +++ head/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile Wed Feb 20 22:32:32 2013 (r312679) @@ -31,18 +31,6 @@ CFLAGS += -fPIC endif endif -@@ -62,7 +62,11 @@ libs: source - $(CC) $(LDFLAGS) -o $(libname) $(objfiles) - - source: $(source) -+ifneq (,$(filter 4.2.%, $(CC_VERSION))) -+ $(CC) $(CFLAGS) -c -o $(objfiles) $^ -+else - $(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^ -+endif - - - clean: --- mailnews/extensions/enigmail/ipc/src/Makefile.in~ +++ mailnews/extensions/enigmail/ipc/src/Makefile.in @@ -19,26 +19,26 @@ endif @@ -76,15 +64,3 @@ CFLAGS += -fPIC endif endif -@@ -62,7 +62,11 @@ libs: source - $(CC) $(LDFLAGS) -o $(libname) $(objfiles) - - source: $(source) -+ifneq (,$(filter 4.2.%, $(CC_VERSION))) -+ $(CC) $(CFLAGS) -c -o $(objfiles) $^ -+else - $(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^ -+endif - - - clean: Modified: head/www/seamonkey/files/patch-bug685258 ============================================================================== --- head/www/seamonkey/files/patch-bug685258 Wed Feb 20 22:31:57 2013 (r312678) +++ head/www/seamonkey/files/patch-bug685258 Wed Feb 20 22:32:32 2013 (r312679) @@ -3,9 +3,9 @@ # Parent a2291c212856ad27622416e83c8311b6a33b52f1 Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf -diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp ---- mozilla/content/media/nsAudioStream.cpp -+++ mozilla/content/media/nsAudioStream.cpp +diff --git a/content/media/AudioStream.cpp b/content/media/AudioStream.cpp +--- mozilla/content/media/AudioStream.cpp ++++ mozilla/content/media/AudioStream.cpp @@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo mFormat = aFormat; Modified: head/www/seamonkey/files/patch-bug791305 ============================================================================== --- head/www/seamonkey/files/patch-bug791305 Wed Feb 20 22:31:57 2013 (r312678) +++ head/www/seamonkey/files/patch-bug791305 Wed Feb 20 22:32:32 2013 (r312679) @@ -17,6 +17,23 @@ Date: Fri Sep 14 15:54:55 2012 -0400 diff --git configure.in configure.in index f0aeb5d..1c01010 100644 +--- configure.in ++++ configure.in +@@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then + #include ], + [ #if JPEG_LIB_VERSION < $MOZJPEG + #error "Insufficient JPEG library version ($MOZJPEG required)." +- #endif +- #ifndef JCS_EXTENSIONS +- #error "libjpeg-turbo JCS_EXTENSIONS required" +- #endif +- ], ++ #endif ], + MOZ_NATIVE_JPEG=1, + AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) + fi +diff --git configure.in configure.in +index f0aeb5d..1c01010 100644 --- mozilla/configure.in +++ mozilla/configure.in @@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then Modified: head/www/seamonkey/files/patch-bug807492 ============================================================================== --- head/www/seamonkey/files/patch-bug807492 Wed Feb 20 22:31:57 2013 (r312678) +++ head/www/seamonkey/files/patch-bug807492 Wed Feb 20 22:32:32 2013 (r312679) @@ -81,11 +81,11 @@ index c167461..8346c11 100644 if test -n "$MOZ_WEBRTC"; then AC_MSG_RESULT("generating WebRTC Makefiles...") + dnl Any --include files must also appear in -D FORCED_INCLUDE_FILE= entries + dnl so that regeneration via dependencies works correctly WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi" GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}" - - $PYTHON ${srcdir}/media/webrtc/trunk/build/gyp_chromium \ diff --git js/src/config/system-headers js/src/config/system-headers index 9bd1efa..1095a01 100644 --- mozilla/js/src/config/system-headers @@ -289,7 +289,7 @@ index cc260b7..66af2d7 100644 + +#ifdef __FreeBSD__ +#include -+# if __FreeBSD_version > 900044 ++# if __FreeBSD_version > 900505 +# define HAVE_XLOCALE +# endif +#endif @@ -447,14 +447,14 @@ index bcb1ec0..bb73591 100644 --- mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h +++ mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h @@ -33,5 +33,5 @@ - #define _SYS_QUEUE_H_ - + #define _SYS_QUEUE_H_ + -#ifndef DARWIN +#if !defined(BSD) && !defined(DARWIN) #include #define __offsetof offsetof #endif - + diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c index 3aced8b..be020bb 100644 --- mozilla/media/mtransport/third_party/nrappkit/src/util/util.c @@ -581,10 +581,10 @@ diff --git media/webrtc/signaling/src/si index a7c47e1..4f191de 100644 --- mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c +++ mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c -@@ -352,21 +352,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, b +@@ -317,21 +317,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData) { static const char fname[] = "cprGetMessage"; - + void *buffer = 0; cpr_msg_queue_t *msgq; cpr_msgq_node_t *node; @@ -599,12 +599,12 @@ index a7c47e1..4f191de 100644 int tz_dsttime; /* type of dst correction to apply */ } tz; +#endif - + /* Initialize ppUserData */ if (ppUserData) { *ppUserData = NULL; } - + msgq = (cpr_msg_queue_t *) msgQueue; if (msgq == NULL) { diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in @@ -1268,7 +1268,6 @@ index 12df1b3..424ea0a 100644 +#include +#endif + - #include #include #include "ref_count.h" @@ -1276,6 +1275,7 @@ index 12df1b3..424ea0a 100644 #include "thread_wrapper.h" #include "critical_section_wrapper.h" #include "video_capture_linux.h" + diff --git media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc index e3f7bb5..882cede 100644 --- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc Added: head/www/seamonkey/files/patch-bug817267 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/seamonkey/files/patch-bug817267 Wed Feb 20 22:32:32 2013 (r312679) @@ -0,0 +1,36 @@ +commit faafeb1 +Author: Jan Beich +Date: Sat Dec 1 21:25:24 2012 -0500 + + Bug 817267 - dirfd() is a macro on some BSDs, fix build there. r=yoric +--- + dom/system/OSFileConstants.cpp | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp +index 75a41dc..63fc6b1 100644 +--- mozilla/dom/system/OSFileConstants.cpp ++++ mozilla/dom/system/OSFileConstants.cpp +@@ -41,6 +41,11 @@ + #include "OSFileConstants.h" + #include "nsIOSFileConstantsService.h" + ++#if defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#define __dd_fd dd_fd ++#endif ++ + /** + * This module defines the basic libc constants (error numbers, open modes, + * etc.) used by OS.File and possibly other OS-bound JavaScript libraries. +@@ -383,8 +388,8 @@ static dom::ConstantSpec gLibcProperties[] = + { "OSFILE_OFFSETOF_DIRENT_D_TYPE", INT_TO_JSVAL(offsetof (struct dirent, d_type)) }, + #endif // defined(DT_UNKNOWN) + +- // Under MacOS X, |dirfd| is a macro rather than a function, so we +- // need a little help to get it to work ++ // Under MacOS X and BSDs, |dirfd| is a macro rather than a ++ // function, so we need a little help to get it to work + #if defined(dirfd) + { "OSFILE_SIZEOF_DIR", INT_TO_JSVAL(sizeof (DIR)) }, + Modified: head/www/seamonkey/files/patch-bug828003 ============================================================================== --- head/www/seamonkey/files/patch-bug828003 Wed Feb 20 22:31:57 2013 (r312678) +++ head/www/seamonkey/files/patch-bug828003 Wed Feb 20 22:32:32 2013 (r312679) @@ -4,13 +4,13 @@ #include "mozilla/StandardInteger.h" /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */ -+/* stdint.h defines int*_t and uintptr_t */ ++/* StandardInteger.h defines int*_t and uintptr_t */ -#if defined (__SVR4) && defined (__sun) -/* int_types.h gets included somehow, so avoid redefining the types differently */ -#include -#elif defined (_AIX) -+#if defined (_AIX) ++#if defined(_AIX) #include -#elif defined(__OpenBSD__) -#include @@ -26,7 +26,7 @@ - -#ifdef __OS2__ -/* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ -+#elif __OS2__ ++#elif defined(__OS2__) #include -#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED) -typedef unsigned long uintptr_t; Added: head/www/seamonkey/files/patch-duckduckgo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/seamonkey/files/patch-duckduckgo Wed Feb 20 22:32:32 2013 (r312679) @@ -0,0 +1,41 @@ +--- /dev/null 2013-02-09 00:33:00.000000000 +0100 ++++ suite/locales/en-US/searchplugins/duckduckgo.xml 2013-02-09 00:40:19.000000000 +0100 +@@ -0,0 +1,11 @@ ++ ++DuckDuckGo ++We believe in better search and not tracking. ++UTF-8 ++data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/J yDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA== ++ ++ ++ ++ ++https://duckduckgo.com/ ++ +--- suite/browser/browser-prefs.js.orig 2013-02-09 21:26:33.000000000 +0100 ++++ suite/browser/browser-prefs.js 2013-02-09 21:25:32.000000000 +0100 +@@ -102,6 +102,7 @@ + // Ordering of Search Engines in the Engine list. + pref("browser.search.order.1", "chrome://communicator-region/locale/region.properties"); + pref("browser.search.order.2", "chrome://communicator-region/locale/region.properties"); ++pref("browser.search.order.3", "chrome://communicator-region/locale/region.properties"); + + // Search (side)bar results always open in a new tab. + pref("browser.search.openintab", false); +--- suite/locales/en-US/chrome/common/region.properties.orig 2013-02-09 21:31:31.000000000 +0100 ++++ suite/locales/en-US/chrome/common/region.properties 2013-02-09 21:32:04.000000000 +0100 +@@ -8,6 +8,7 @@ + # Search engine order (order displayed in the search bar dropdown) + browser.search.order.1=Google + browser.search.order.2=Yahoo ++browser.search.order.3=DuckDuckGo + + # More information about this update link available in the update wizard. + # Only change this if you are providing localized release notes. +--- suite/locales/en-US/searchplugins/list.txt.orig 2013-02-09 21:35:07.000000000 +0100 ++++ suite/locales/en-US/searchplugins/list.txt 2013-02-09 21:35:14.000000000 +0100 +@@ -2,3 +2,4 @@ + google + wikipedia + yahoo ++duckduckgo Modified: head/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp ============================================================================== --- head/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp Wed Feb 20 22:31:57 2013 (r312678) +++ head/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp Wed Feb 20 22:32:32 2013 (r312679) @@ -1,5 +1,5 @@ ---- mozilla/content/media/nsAudioStream.cpp~ -+++ mozilla/content/media/nsAudioStream.cpp +--- mozilla/content/media/AudioStream.cpp~ ++++ mozilla/content/media/AudioStream.cpp @@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure) gVolumeScale = NS_MAX(0, PR_strtod(utf8.get(), nullptr)); } Added: head/www/seamonkey/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/seamonkey/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h Wed Feb 20 22:32:32 2013 (r312679) @@ -0,0 +1,18 @@ +diff --git gfx/ots/include/opentype-sanitiser.h gfx/ots/include/opentype-sanitiser.h +index f42822e..1a5a699 100644 +--- mozilla/gfx/ots/include/opentype-sanitiser.h ++++ mozilla/gfx/ots/include/opentype-sanitiser.h +@@ -44,6 +44,13 @@ typedef unsigned __int64 uint64_t; + #include + #endif + ++#ifdef __FreeBSD__ ++# include ++# if __FreeBSD_version < 800067 ++# include // for off_t ++# endif ++#endif ++ + #include // for std::min + #include + #include Modified: head/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- head/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Wed Feb 20 22:31:57 2013 (r312678) +++ head/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Wed Feb 20 22:32:32 2013 (r312679) @@ -1,20 +1,5 @@ --- mozilla/ipc/chromium/Makefile.in~ +++ mozilla/ipc/chromium/Makefile.in -@@ -43,6 +43,14 @@ include $(DEPTH)/config/autoconf.mk - - OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS)) - -+# workaround IPC hang with libevent2 -+ifndef MOZ_DEBUG -+ifneq (,$(filter 4.2.%, $(CXX_VERSION))) -+MOZ_OPTIMIZE_FLAGS = -O1 -+OS_CXXFLAGS += $(MOZ_OPTIMIZE_FLAGS) -+endif -+endif -+ - LIBRARY_NAME = chromium_s - FORCE_STATIC_LIB = 1 - LIBXUL_LIBRARY = 1 @@ -55,9 +60,7 @@ vpath %.c \ $(srcdir)/src/third_party/libevent \ $(NULL) Modified: head/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- head/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Wed Feb 20 22:31:57 2013 (r312678) +++ head/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Wed Feb 20 22:32:32 2013 (r312679) @@ -1,9 +1,9 @@ --- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~ +++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc -@@ -15,7 +15,7 @@ - #include "base/scoped_nsautorelease_pool.h" +@@ -16,7 +16,7 @@ #include "base/scoped_ptr.h" #include "base/time.h" + #include "nsDependentSubstring.h" -#include "third_party/libevent/event.h" +#include "event.h" Modified: head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp ============================================================================== --- head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Wed Feb 20 22:31:57 2013 (r312678) +++ head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Wed Feb 20 22:32:32 2013 (r312679) @@ -1,16 +1,16 @@ --- mozilla/media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp~ +++ mozilla/media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp @@ -21,6 +21,13 @@ Scott McMurray - #include "constants.hpp" - #include - -+#ifdef __FreeBSD__ -+# include -+# if __FreeBSD_version < 900506 -+# define getchar boost_getchar -+# endif -+#endif -+ - namespace boost { - namespace detail { - //This only works on unsigned data types + #include "constants.hpp" + #include + ++#ifdef __FreeBSD__ ++# include ++# if __FreeBSD_version < 900506 ++# define getchar boost_getchar ++# endif ++#endif ++ + namespace boost { + namespace detail { + //This only works on unsigned data types