Tiny fix for whereis(1) to work with our (sys-apps/man) manpath.

Package-Manager: portage-2.1.2_pre2-r6

diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index 94c606e104d58e026f9b9a013a82550b76b51c29..82ee025a0657e7830bb52eb638174fc023768428 100644 (file)
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.27 2006/10/05 21:06:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.28 2006/10/09 09:04:16 the_paya Exp $
+
+  09 Oct 2006; Javier Villavicencio <the_paya@gentoo.org>
+  freebsd-ubin-6.1.ebuild, freebsd-ubin-6.2_beta1.ebuild,
+  freebsd-ubin-6.2_beta2.ebuild:
+  Tiny fix for whereis(1) to work with our (sys-apps/man) manpath.
 
   05 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-ubin-6.1.ebuild, freebsd-ubin-6.2_beta2.ebuild:

diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index c932ebf55175bce6f68f3770f059b9759fbd3682..30239113c78dc41eaaa257c022087b77ced96955 100644 (file)
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX SA-06-02-ee.patch 2446 RMD160 9934e6ee6c0ebaa1998939163bf4f1e233d5eba0 SHA1 31d014af41aee818494acfc40fe5d392d772bd4b SHA256 1c27b3e1f5906da36a654409290e9ffb0493b70a1e83bed89704942f2a9c0d10
 MD5 9256a421446d791cc6fbc17d4d8a9780 files/SA-06-02-ee.patch 2446
 RMD160 9934e6ee6c0ebaa1998939163bf4f1e233d5eba0 files/SA-06-02-ee.patch 2446
@@ -69,26 +66,26 @@ DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fb
 DIST freebsd-lib-6.2_beta1.tar.bz2 2661080 RMD160 904eae7bf7fb7ac8575eee10dea3de44944dcecc SHA1 a3efa5d3c3c062e4399ee851b50f5674cb7f39d4 SHA256 5f6235820f8dcbeeeae90ff05917ab61b203730b07015b920732a49204df356e
 DIST freebsd-lib-6.2_beta2.tar.bz2 2669048 RMD160 dfb33df2c853bf226034843fdc319a5e0781fcf7 SHA1 c1062981050f4666e146affc4b152a5ad427904a SHA256 ee3f7c41c0991b0196cbb550ed6a97093f220efd9caac52705ef4f49050c4f14
 DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA1 f9da69cabdaaad268c79670c06ba4fff3e3ef6a8 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f
-DIST freebsd-sys-6.2_beta2.tar.bz2 18317253 RMD160 c53fdcb1289d56f5184b3912fdb0ce2cc4edcc49 SHA1 5f5e3d61f7580eecafb87cbd08050ac8a2c8a1c4 SHA256 a5e503e13340bd1ac674aeae3737d4b65f3b00650a43ef11bfb9771fcf0f62d3
+DIST freebsd-sys-6.2_beta2.tar.bz2 1582664 RMD160 104f94c6dbd595b5a9a140c8b6ea42119291d1a1 SHA1 f62e514c25ebd9dc57ec30247c88f99617cea6ab SHA256 823a2b369714e9d8f5a2c75fd295fb657d21c7ba772e3ac08d89a29c86bcddb4
 DIST freebsd-ubin-6.1.tar.bz2 1763218 RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e SHA1 7d1b0568d02f192dcd3bd7f972613376d3d0f16d SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6
 DIST freebsd-ubin-6.2_beta1.tar.bz2 1771844 RMD160 0bedcb1038ac157a2c3eee59db38f75d310bbfa1 SHA1 4a3ef8eb543635b2f88ce9f3fe49ec02e5e62e6a SHA256 b82e2b310001ccb335f26c19bf74431691ace27320fe4d1a49d0b4c86ba419cd
 DIST freebsd-ubin-6.2_beta2.tar.bz2 1773001 RMD160 3eab2de326885151e6b76e996c687cfd6772581f SHA1 821e69be1305b04d6009055863614cfc7c9ea011 SHA256 4037b96452eca9d12a201f81d5f545671cb2f28c869ce0497268d179ac2b2869
-EBUILD freebsd-ubin-6.1.ebuild 2936 RMD160 886bf3b51e715fba69c8b1329ca5f94561937382 SHA1 034ed1a6003d50d75dc705840fbd4e2965228bed SHA256 5305fafac7eb44a8f5c295421bceb08b65d8d96bc0a851c7442f3563f1e921a3
-MD5 3a8be5b9b223d22fc06c5715133d3b6f freebsd-ubin-6.1.ebuild 2936
-RMD160 886bf3b51e715fba69c8b1329ca5f94561937382 freebsd-ubin-6.1.ebuild 2936
-SHA256 5305fafac7eb44a8f5c295421bceb08b65d8d96bc0a851c7442f3563f1e921a3 freebsd-ubin-6.1.ebuild 2936
-EBUILD freebsd-ubin-6.2_beta1.ebuild 2893 RMD160 132f85d75f3cac18ce67a99acbd4913b04c80ea4 SHA1 f552687f4cb6dd026caec1ae5f9dec345dec35cf SHA256 56066ad03269ab16ebd8d7130b9666da53c416b2195543578091207e3745aa1d
-MD5 da750bf4f690fbdec875239c56f408d7 freebsd-ubin-6.2_beta1.ebuild 2893
-RMD160 132f85d75f3cac18ce67a99acbd4913b04c80ea4 freebsd-ubin-6.2_beta1.ebuild 2893
-SHA256 56066ad03269ab16ebd8d7130b9666da53c416b2195543578091207e3745aa1d freebsd-ubin-6.2_beta1.ebuild 2893
-EBUILD freebsd-ubin-6.2_beta2.ebuild 2968 RMD160 651d187de7bbd56d1e6d4c6b4bcfcab44e3bb7b7 SHA1 e04084a07fff51507a40d6ca10b1b97abcb7dd14 SHA256 8eceaafc4fc2ad8c9ec4806ce83cf91c1146878a61c6885a46ef3d37624165bd
-MD5 8b25f6058cb28a6679c83e22cb975db9 freebsd-ubin-6.2_beta2.ebuild 2968
-RMD160 651d187de7bbd56d1e6d4c6b4bcfcab44e3bb7b7 freebsd-ubin-6.2_beta2.ebuild 2968
-SHA256 8eceaafc4fc2ad8c9ec4806ce83cf91c1146878a61c6885a46ef3d37624165bd freebsd-ubin-6.2_beta2.ebuild 2968
-MISC ChangeLog 8473 RMD160 c710f9a8417f9687434b5cc9b74a458f53c4af1e SHA1 ababda540fa9934e05fa6900e5a8b43aad97c090 SHA256 eb5b295952ef741b1324e89ee9d82c0ed8f05a43de233974980819c87fa6cdec
-MD5 d6e324bb0f2aa25df68b31d3946a61f3 ChangeLog 8473
-RMD160 c710f9a8417f9687434b5cc9b74a458f53c4af1e ChangeLog 8473
-SHA256 eb5b295952ef741b1324e89ee9d82c0ed8f05a43de233974980819c87fa6cdec ChangeLog 8473
+EBUILD freebsd-ubin-6.1.ebuild 3035 RMD160 00f1357a8f928aeb249dbd17df4121da71716eae SHA1 e7bb907d040b7d5063a324ca4c93367f56d2882e SHA256 dbb4f8a53e5e2e8b4b77e1f69c44c7fd3258d57f22655329690c4e6af8f13485
+MD5 0adfe59c63a7ff52da8c0b505e45e607 freebsd-ubin-6.1.ebuild 3035
+RMD160 00f1357a8f928aeb249dbd17df4121da71716eae freebsd-ubin-6.1.ebuild 3035
+SHA256 dbb4f8a53e5e2e8b4b77e1f69c44c7fd3258d57f22655329690c4e6af8f13485 freebsd-ubin-6.1.ebuild 3035
+EBUILD freebsd-ubin-6.2_beta1.ebuild 2992 RMD160 e0b5678a1b4709f445b649007ed7689b7fa7502f SHA1 f03805a3391dfe60bf1d3518d89cb26a567c5639 SHA256 255ab19bb573ab7e60b7875af2c3756910d8ccfffb863c83d47c44d50956ed3e
+MD5 b825a5fe9e5b903cce4c88b7d324eb6f freebsd-ubin-6.2_beta1.ebuild 2992
+RMD160 e0b5678a1b4709f445b649007ed7689b7fa7502f freebsd-ubin-6.2_beta1.ebuild 2992
+SHA256 255ab19bb573ab7e60b7875af2c3756910d8ccfffb863c83d47c44d50956ed3e freebsd-ubin-6.2_beta1.ebuild 2992
+EBUILD freebsd-ubin-6.2_beta2.ebuild 3067 RMD160 4327a24df3ec893baaa303b01e8bbcce9220912e SHA1 4515c339f52bd7ee5883acfa0e5b0c5c0c117978 SHA256 e299966c1341b663b8eea3e1a917c4fe6ba5993025a79b4b8078320a5598a1fd
+MD5 4e5fa79638340966ff4114bd875bf8a5 freebsd-ubin-6.2_beta2.ebuild 3067
+RMD160 4327a24df3ec893baaa303b01e8bbcce9220912e freebsd-ubin-6.2_beta2.ebuild 3067
+SHA256 e299966c1341b663b8eea3e1a917c4fe6ba5993025a79b4b8078320a5598a1fd freebsd-ubin-6.2_beta2.ebuild 3067
+MISC ChangeLog 8689 RMD160 e93dae4ca8e3b8926a6e7c5f7fcc893bd28e79b9 SHA1 f085363c066f3c1299a6ec2d30c81f0539e4dce2 SHA256 47abf9c7e5a133c5fab0cc1918815349283099cef270a98d57dc0c1c54a608d3
+MD5 c24259c4b29337279d712789c2240a2b ChangeLog 8689
+RMD160 e93dae4ca8e3b8926a6e7c5f7fcc893bd28e79b9 ChangeLog 8689
+SHA256 47abf9c7e5a133c5fab0cc1918815349283099cef270a98d57dc0c1c54a608d3 ChangeLog 8689
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -99,13 +96,6 @@ SHA256 b185465d2d3030a516bbb26199657b865cf9ed25cfdebb7bc6d5a6963948a240 files/di
 MD5 d2623fc990e626dd5f64bd9bb299b0ed files/digest-freebsd-ubin-6.2_beta1 1647
 RMD160 fab3f17887909c6c7a1b852bb53738718389cea4 files/digest-freebsd-ubin-6.2_beta1 1647
 SHA256 5c806a71075f0191a3590b752fae6e4fd7967535ab8087f578091efbb5ecc0b6 files/digest-freebsd-ubin-6.2_beta1 1647
-MD5 1dcb3ad14550329b03469315ea531669 files/digest-freebsd-ubin-6.2_beta2 1921
-RMD160 159dc3ba117d543f0a6a45d82d1a3f90c8ed39cb files/digest-freebsd-ubin-6.2_beta2 1921
-SHA256 8bb651675188698f5f01b46601a132f449cd2c7e1be7dbda7f1d9d79a2b8917a files/digest-freebsd-ubin-6.2_beta2 1921
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFJXP3AiZjviIA2XgRAsv8AJ0agFW8juaFuRz//xKg2p1B5rNqlQCg5UD6
-m4KfYXgLKPMbINX3HsbWfRo=
-=2QSI
------END PGP SIGNATURE-----
+MD5 9deb0753a9bcb79e192cc566277c8f3c files/digest-freebsd-ubin-6.2_beta2 1918
+RMD160 af659a27da37af28ae5a3a5ea666d5098fe67b3f files/digest-freebsd-ubin-6.2_beta2 1918
+SHA256 d32d037cd0b44c753699aca6f62f0e4f04c912eba6ea70c43d30a9d310ddcb1b files/digest-freebsd-ubin-6.2_beta2 1918

diff --git a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.2_beta2 b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.2_beta2
index 869c29aedea42ada0e83de32bc2b759408d59f2c..92f5a3692408f31fd6007d7db2bb54800608963a 100644 (file)
--- a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.2_beta2
+++ b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.2_beta2
@@ -13,9 +13,9 @@ SHA256 d2ab03d2db180d4a444b99b7f164eb1ef5e04ac8ad69e1ffcb621ea8c594fa3f freebsd-
 MD5 280ec9cccb1e34dabc8344d682dcfa23 freebsd-lib-6.2_beta2.tar.bz2 2669048
 RMD160 dfb33df2c853bf226034843fdc319a5e0781fcf7 freebsd-lib-6.2_beta2.tar.bz2 2669048
 SHA256 ee3f7c41c0991b0196cbb550ed6a97093f220efd9caac52705ef4f49050c4f14 freebsd-lib-6.2_beta2.tar.bz2 2669048
-MD5 7457f7ec6d84a5cc00a8689fca2082ea freebsd-sys-6.2_beta2.tar.bz2 18317253
-RMD160 c53fdcb1289d56f5184b3912fdb0ce2cc4edcc49 freebsd-sys-6.2_beta2.tar.bz2 18317253
-SHA256 a5e503e13340bd1ac674aeae3737d4b65f3b00650a43ef11bfb9771fcf0f62d3 freebsd-sys-6.2_beta2.tar.bz2 18317253
+MD5 6454d1881584fc0e494f2410f44520c1 freebsd-sys-6.2_beta2.tar.bz2 1582664
+RMD160 104f94c6dbd595b5a9a140c8b6ea42119291d1a1 freebsd-sys-6.2_beta2.tar.bz2 1582664
+SHA256 823a2b369714e9d8f5a2c75fd295fb657d21c7ba772e3ac08d89a29c86bcddb4 freebsd-sys-6.2_beta2.tar.bz2 1582664
 MD5 caa3dd80d07aad286292fb4928ae1276 freebsd-ubin-6.2_beta2.tar.bz2 1773001
 RMD160 3eab2de326885151e6b76e996c687cfd6772581f freebsd-ubin-6.2_beta2.tar.bz2 1773001
 SHA256 4037b96452eca9d12a201f81d5f545671cb2f28c869ce0497268d179ac2b2869 freebsd-ubin-6.2_beta2.tar.bz2 1773001

diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild
index 12119294f7847863d62867ced9a5dc8736d44b18..2613bcd50eb5a07385dbf8cd1890e92e39a9c3b4 100644 (file)
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild,v 1.11 2006/10/05 21:06:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild,v 1.12 2006/10/09 09:04:16 the_paya Exp $
 
 inherit bsdmk freebsd flag-o-matic pam
 
@@ -79,6 +79,8 @@ src_unpack() {
 
        # Rename manpage for renamed cmp
        mv ${S}/cmp/cmp.1 ${S}/cmp/bsdcmp.1
+       # Fix whereis(1) manpath search.
+       sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
 }
 
 src_install() {

diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta1.ebuild
index 70e79a3cbaac1521dc71a28292197ad1468f9de9..4e20a47900ca7940d30088e67e6fbbed659ca078 100644 (file)
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta1.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta1.ebuild,v 1.3 2006/09/22 09:31:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta1.ebuild,v 1.4 2006/10/09 09:04:16 the_paya Exp $
 
 inherit bsdmk freebsd flag-o-matic pam
 
@@ -79,6 +79,8 @@ src_unpack() {
 
        # Rename manpage for renamed cmp
        mv ${S}/cmp/cmp.1 ${S}/cmp/bsdcmp.1
+       # Fix whereis(1) manpath search.
+       sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
 }
 
 src_install() {

diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild
index 3ee714a034d4362224f6e5e25e685fb917df24dc..242b6cf158528ff330d616225a95715c17184453 100644 (file)
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild,v 1.2 2006/10/05 21:06:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild,v 1.3 2006/10/09 09:04:16 the_paya Exp $
 
 inherit bsdmk freebsd flag-o-matic pam
 
@@ -80,6 +80,8 @@ src_unpack() {
 
        # Rename manpage for renamed cmp
        mv ${S}/cmp/cmp.1 ${S}/cmp/bsdcmp.1
+       # Fix whereis(1) manpath search.
+       sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
 }
 
 src_install() {