backport a patch to fix build on freebsd 7

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.3 x86_64

4 files changed, 36 insertions, 4 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index b453e96e176c..2d5214c4cd4b 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/nss
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.126 2008/08/13 19:26:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.127 2008/09/05 10:48:08 aballier Exp $
+
+  05 Sep 2008; Alexis Ballier <aballier@gentoo.org> +files/nss-fbsd7.patch,
+  nss-3.12.ebuild:
+  backport a patch to fix build on freebsd 7
 
   13 Aug 2008; Raúl Porcel <armin76@gentoo.org> nss-3.11.9.ebuild,
   nss-3.12.ebuild:
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index a9ed8f1af9aa..509730e6568f 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.12-nss-config.in 2400 RMD160 927a5573d72ad8c9d06a56fd094b7523d8cc0784 SHA1 0227f94c745519b67b1b530e6cc116e8069a6b43 SHA256 6d03d7c1ade80922831b90a4242bf57519d649c4ab47eaac0958ceee90c169b2
 AUX 3.12-nss.pc.in 280 RMD160 e6966434f42fdcdb71977ba80638c74ef4b2ae63 SHA1 2024da0f72759c87375459a4e521caaf97a7922c SHA256 c61ebe55abca04bf6b05024e6c160735f74fe83a1ba48b0314a4110b6828bbc9
 AUX nss-3.11-config-1.patch 1440 RMD160 052cc7d19eafaadec1cca6d9882f23265afdf8a7 SHA1 7a9153ec9bd099d2b1d42ab3de240201ae5d6004 SHA256 9a67bbbd9996535ac0aff115294c6537be5ba2efc99ae48c3bc92eb995e670bc
@@ -5,6 +8,7 @@ AUX nss-3.11-config.patch 3167 RMD160 e4b57c89a518b54070b884f40ca11224ccc60349 S
 AUX nss-3.11.5-config-1.patch 1508 RMD160 2f71b5c38841c2c24cbea6ca0f206b3debfb4942 SHA1 7df5c48fc0ea49fee61e408f8b8c64a9eb01c995 SHA256 400bfe6e75ba628663819b833a04fd0037c575edc075a1e109665fe939670c74
 AUX nss-3.12-config-1.patch 1508 RMD160 ea2f4e2f05cc865ef41af0c39e573b8eb8801f42 SHA1 4897595a91f331ce34155e9872ece3518acb1ac8 SHA256 22d72c155d7b6aa8f1dd797959d5ec3b0975cf9a1bf4607e6b0ee2207112c2b7
 AUX nss-config.in 2238 RMD160 b9dfeeef5319bae20326454a67dc67316dcd04cd SHA1 535ea4869d0f5fdc4f14b723320ef7284c14190a SHA256 57fb0219482981c80d9a72d8a86dfcbe0e776e4e5609fad8965e651f79296fa7
+AUX nss-fbsd7.patch 638 RMD160 9c60b07a9f9b9a7482221f09042266c358d6cfcf SHA1 27036a161ff076fc8a9d459458d2a4adc38876ad SHA256 f471f04def6d4f1abd2062b582246a60a33b346576ad6e71c782fcfe317c8cc7
 AUX nss-mips64.patch 508 RMD160 17e750805ec8e3e6f5989810b43522bea344f133 SHA1 dd127c2365ea13f5f5c3ec3f9d6d1991225e3565 SHA256 e50a8fcd0521b7722448b480ff672d49d6ca0dc6134d8df25ac63da1a83ab07b
 AUX nss.pc.in 269 RMD160 8716eb83ecf554c5751b0a135adeaf0a3a4208b0 SHA1 1a33aeb4131333d4cf4ccef7118533d0e89d7267 SHA256 cf659c5e72e560b79a928e7cdf5ed416b286f4eefa8d5b0cab50ee846b320e75
 DIST nss-3.11.7.tar.gz 3731160 RMD160 5edec8f5d33e15ddba45b3d4fcfa3ca62628540c SHA1 501af41c4abc2300de2e5f90311583f47c19888c SHA256 e0cb80cbd08d677f9e73d19bbdedfd75fe931777ea732ec352dc1f133f999b98
@@ -12,6 +16,13 @@ DIST nss-3.11.9.tar.gz 3760535 RMD160 f60eca812ace7dc57459a2ddbce12c2305540061 S
 DIST nss-3.12.tar.gz 5163155 RMD160 a84f9fa11e9fdb1c13f6d9b804b6f37dac4ee0af SHA1 6b8e83c0931cfad161aae993d344687b67f317aa SHA256 d30a7470b82a73ed442525b365afaf00427204e3771edfeab05743acca97122b
 EBUILD nss-3.11.7.ebuild 4195 RMD160 4277636203125b85942af289c92c7e2c8a4d13e7 SHA1 92cece9c10fea4da6a780f3d9e16e2741dd40347 SHA256 9b7bc3036787b39c47bc15eb9d261bd8a46b459021887b7323f9974cbff5bef3
 EBUILD nss-3.11.9.ebuild 4229 RMD160 e2cc4995a8c78777d972abca315de28f4c9ce6c1 SHA1 382e81ad744944f9b2cfb21a8b7d29f3b40bcdbb SHA256 9c39c5a35186ae3fe7fa4407f9b4a884a845fc9a31ac0f2db8bee9c33f82084e
-EBUILD nss-3.12.ebuild 4380 RMD160 a2b3987128da1d2b7a17ccd9400ef0d704bb186b SHA1 640c8468a16e8f6fbbb563d458373c433f386958 SHA256 51a24eace3fda7a075587c4513587403ead565eab10030ece99ce310784ff225
-MISC ChangeLog 15647 RMD160 e9a347645b7c0ecaa083b85a81fe1c3082bc6bf3 SHA1 03e0bff82bf7353e9a64ad8ed4ede1d1a0b869e7 SHA256 abcab6a88166ca4fc2e1845bdbc0cf5b74ec6d8d1d3001afbc082c9dff03945c
+EBUILD nss-3.12.ebuild 4421 RMD160 98f0771f26afd8a0756052d4c854c292fe8c4813 SHA1 ce275467675f462af4c593fd7dae438965a7b095 SHA256 c5f4ae6375b8581f271ec29abbb87f1ec8ba30f9c47990014b2a3c63da8613a9
+MISC ChangeLog 15789 RMD160 7b2259f7b7997a6abba9673aa5fe39e662d84b30 SHA1 49ad3172ce20a73aa6e9eb6a67b27eedfd2bc353 SHA256 56651e36220a0310196394aa9049b5bc246e5c12aefde161ef6ebfabc752c797
 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjBDncACgkQvFcC4BYPU0pT7ACgrvdlgIDLsX5zn/9POY4W3pfg
+dtUAoMlSJ9p3FjKvYaRR6BGvmNey4Uhp
+=rILI
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/nss/files/nss-fbsd7.patch b/dev-libs/nss/files/nss-fbsd7.patch
new file mode 100644
index 000000000000..932f9e0ea639
--- /dev/null
+++ b/dev-libs/nss/files/nss-fbsd7.patch
@@ -0,0 +1,16 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=436806
+
+objformat has been deprecated for a while. elf has been the default format for
+FreeBSD for a while too. objformat is gone from FreeBSD 7, so we default to elf.
+
+--- nss-3.12/mozilla/security/coreconf/FreeBSD.mk.old	2008-09-05 11:38:11 +0200
++++ nss-3.12/mozilla/security/coreconf/FreeBSD.mk	2008-09-05 11:38:28 +0200
+@@ -65,7 +65,7 @@
+ 
+ ARCH			= freebsd
+ 
+-MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
++MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
+ 
+ ifeq ($(MOZ_OBJFORMAT),elf)
+ DLL_SUFFIX		= so
diff --git a/dev-libs/nss/nss-3.12.ebuild b/dev-libs/nss/nss-3.12.ebuild
index 0a51dc6ff430..6ffd1097bf79 100644
--- a/dev-libs/nss/nss-3.12.ebuild
+++ b/dev-libs/nss/nss-3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.ebuild,v 1.2 2008/08/13 19:26:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.ebuild,v 1.3 2008/09/05 10:48:08 aballier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -41,6 +41,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-3.11-config.patch
 	epatch "${FILESDIR}"/${PN}-3.12-config-1.patch
 	epatch "${FILESDIR}"/${PN}-mips64.patch
+	epatch "${FILESDIR}"/${PN}-fbsd7.patch
 }
 
 src_compile() {