Fix for Darwin (bug #376045) and Prefix

Package-Manager: portage-2.2.01.19011-prefix/cvs/Darwin powerpc

5 files changed, 109 insertions, 15 deletions

diff --git a/app-misc/tmux/ChangeLog b/app-misc/tmux/ChangeLog
index 7d2300db39dc..eebf81d63a3a 100644
--- a/app-misc/tmux/ChangeLog
+++ b/app-misc/tmux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/tmux
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.64 2011/07/13 09:20:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.65 2011/07/30 11:58:51 grobian Exp $
+
+  30 Jul 2011; Fabian Groffen <grobian@gentoo.org> tmux-1.5.ebuild,
+  +files/tmux-1.5-darwin.patch, tmux-9999.ebuild:
+  Fix for Darwin (bug #376045) and Prefix
 
 *tmux-1.5 (13 Jul 2011)
 
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 17c133d91c3e..5b150e7e0805 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX tmux-1.2-locale.patch 628 RMD160 2f9902fdabd4349a3861e2d8f2e6fa43c363f271 SHA1 f7c6fe2e2e2fb18809a964be65d034d9bb60e944 SHA256 64ef3fadd3aef308c0ab0cac62ac1926d769651a7b6c30697f4c7a80db020404
+AUX tmux-1.5-darwin.patch 2180 RMD160 06e9a3dca7ed1e55573aec5bee6c746a0de04b13 SHA1 fcf370899c5213866d462f1461be0e3925969e74 SHA256 df949038aa2c12030d97991e4e330e9cc957bb135336fae69bd921879404f8bd
 AUX tmux.vim 55 RMD160 1299eac25b3e01700dba4b295c33964a607b8ee4 SHA1 820863224eda185aba4da86ffbe876e287a70f30 SHA256 ab10a475aa32e2aacba7b47e9ca38057ee2e447a953497a0349f1640167be6b7
 DIST tmux-1.2.tar.gz 241779 RMD160 47ac2b3606841189c6b75412bb67d6625073b035 SHA1 57a784dc998710a719ee3e13dcd29541611c009e SHA256 af3f2678ae631ab3f7973b646aff2f8757e9e00935a5984c23058da4f723491d
 DIST tmux-1.3.tar.gz 251999 RMD160 7c895562c7810117d610c420901110c7e206bebf SHA1 4d132a5fa25ef049e023f154824f39b0d7e72ab0 SHA256 72c2d6f1c30fb4ccbd29b530a7d8a08e67c9c2d87ac8d67e3806561670fc0362
@@ -10,18 +11,14 @@ DIST tmux-1.5.tar.gz 374093 RMD160 08eec02bcbd91b3c37a36a05167f3758e7911973 SHA1
 EBUILD tmux-1.2.ebuild 1328 RMD160 5029d97b4795c98bc22b1e0c3b4c35965443da21 SHA1 c96caed68a0b6bc010803fc55c6181d2b30b2a33 SHA256 2a4979c7462829c755e360b6edf3954fe1446f2634cf05d8dbdcd4e02dc1939e
 EBUILD tmux-1.3.ebuild 2001 RMD160 aafad357a0d35a5737ece39add34e368158ca1b7 SHA1 76c322e7c3fef1290d17276878d43c58c04c635a SHA256 86f8f7524cdd93dc3fd4aa1e9f0271269c03bc7666a57af3c986e297be821766
 EBUILD tmux-1.4.ebuild 2087 RMD160 8ff2ec0ea195814668094aaeccefe0b284fc8ef8 SHA1 1e19b91628eba0ed5f0852c41d49ed271ad17d92 SHA256 b2df6e2b2f3984d59e2a711faafda36f12e39bfdbe5732c1795d860721000f77
-EBUILD tmux-1.5.ebuild 1716 RMD160 5c2c2af6e1e97f9dd21eb0dba935adb992977145 SHA1 9817a98bba228601b1947a48a8f9388c7e7d9113 SHA256 784660fd7f11c983360bfde876e951aaf2c7222729d00c55281bcf72e2b1eadd
-EBUILD tmux-9999.ebuild 1161 RMD160 f82231712a8675ed8478093a675a494666d4ab84 SHA1 eca7415078170635788bd88d83e44ded7a5f5352 SHA256 224b2623719fc80a0a84b63d543016860443a6ee0672c97e6cc26a920ebdc49c
-MISC ChangeLog 7389 RMD160 6d434c26f36e37b40c67bc601dd6a1917ce68630 SHA1 3bb2cbd876915c7e2aacdfb0d0466abf09240b04 SHA256 8e21adfc74f0c4b3cb144d0affe83ab13d4083c9bc75048196091292cf1ad224
+EBUILD tmux-1.5.ebuild 2055 RMD160 e1972913ec014d8b0fce56bc552edbe78b4bc6b8 SHA1 3bb17b35561f7c9ead9c9581ad1b201c463f2550 SHA256 0a8ae72aab00a45975e9db67bd4ccbe5a1d9306c49882dc8dd9d184d795db7b2
+EBUILD tmux-9999.ebuild 1362 RMD160 5404b2e58a573cd184311bf153ccd49ec0f1e966 SHA1 c9f8f2dbcf579eb7ece463d0d73ded15cf487fa5 SHA256 833431b7d9abff42dbba622cb4b94f99900f0bf2c0442e12e2e6f1fa4dfa10f3
+MISC ChangeLog 7548 RMD160 f867324b963c34d038f3c35e5c510b6af75d0048 SHA1 85de947c6ab42beff0296024c7f4228aa19e443e SHA256 75cafe88c6c3d78d41a3b788ca107c521539cb665c09e4d8af7a9424b00e99c0
 MISC metadata.xml 553 RMD160 525d334bde540803b66251b9f2e30d697f4fc327 SHA1 4e2b9280d38ed834ec9e302b1b9c85201c71fede SHA256 767126148103c206d8a942e171f2f0c572bc42fac680cb188cf304e1ec8fc3c4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.17 (Darwin)
 
-iQEcBAEBCgAGBQJOHWNJAAoJEEqz6FtPBkyjco0H/02HhWnfB2BmlxZVpVo9HWbM
-oB2Z7ZOAGcW+Sk4VFP9BG8OZyscVwG8H9/BMxllVLRlOfb7ejVexGjKd8RszGXJE
-UHNSKCTudRyLwxPQC1xnbX78WP4+F0E7RUs3DL98GxgpPTWvjOrQToUxxcJ7Ggb2
-DRuoR6ZnTmUNsOQI5XsiVeX05HDDRQDwUeLDbyr5d8zwxri35Ziz5dIM6hqr/XLM
-HCNePB65oq3Ya1LL7BoATyr4Yeuo/VX77lnuuWKtTBpB0a28O7g1Bbk4MFQVJGZk
-6WV4b6AH7Vqc/57SZbMWiyoEB0Yt14exQwCAuI9Stme/WI2r9oO5UGzwBAJaQl4=
-=KRXP
+iEYEARECAAYFAk4z8foACgkQX3X2B8XHToloJQCfXIzZxXlY/dGScNy7TR4+O0qK
+1toAnAvuKNhoiVh6UtP6y6lh0pZl8203
+=dohu
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tmux/files/tmux-1.5-darwin.patch b/app-misc/tmux/files/tmux-1.5-darwin.patch
new file mode 100644
index 000000000000..515c4e8acc51
--- /dev/null
+++ b/app-misc/tmux/files/tmux-1.5-darwin.patch
@@ -0,0 +1,78 @@
+http://sourceforge.net/tracker/?func=detail&aid=3376684&group_id=200378&atid=973262
+
+
+--- configure.ac
++++ configure.ac
+@@ -124,6 +124,7 @@
+ # Look for networking libraries.
+ AC_SEARCH_LIBS(b64_ntop, resolv)
+ AC_SEARCH_LIBS(__b64_ntop, resolv)
++AC_SEARCH_LIBS(res_9_b64_ntop, resolv)
+ AC_SEARCH_LIBS(inet_ntoa, nsl)
+ AC_SEARCH_LIBS(socket, socket)
+ AC_CHECK_LIB(xnet, socket)
+--- configure
++++ configure
+@@ -4718,6 +4718,62 @@
+ 
+ fi
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_b64_ntop" >&5
++$as_echo_n "checking for library containing res_9_b64_ntop... " >&6; }
++if test "${ac_cv_search_res_9_b64_ntop+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char res_9_b64_ntop ();
++int
++main ()
++{
++return res_9_b64_ntop ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' resolv; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_res_9_b64_ntop=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if test "${ac_cv_search_res_9_b64_ntop+set}" = set; then :
++  break
++fi
++done
++if test "${ac_cv_search_res_9_b64_ntop+set}" = set; then :
++
++else
++  ac_cv_search_res_9_b64_ntop=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_b64_ntop" >&5
++$as_echo "$ac_cv_search_res_9_b64_ntop" >&6; }
++ac_res=$ac_cv_search_res_9_b64_ntop
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntoa" >&5
+ $as_echo_n "checking for library containing inet_ntoa... " >&6; }
+ if test "${ac_cv_search_inet_ntoa+set}" = set; then :
diff --git a/app-misc/tmux/tmux-1.5.ebuild b/app-misc/tmux/tmux-1.5.ebuild
index 8784145b049f..8e2b8e0c32c3 100644
--- a/app-misc/tmux/tmux-1.5.ebuild
+++ b/app-misc/tmux/tmux-1.5.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.5.ebuild,v 1.1 2011/07/13 09:20:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.5.ebuild,v 1.2 2011/07/30 11:58:51 grobian Exp $
 
 EAPI=4
 
+inherit eutils autotools
+
 DESCRIPTION="Terminal multiplexer"
 HOMEPAGE="http://tmux.sourceforge.net"
 SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
@@ -41,6 +43,15 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-darwin.patch  # drop on next release
+	eautoreconf  # for darwin patch
+	# look for config file in the prefix
+	sed -i -e '/SYSTEM_CFG/s:"/etc:"'"${EPREFIX}"'/etc:' tmux.h || die
+	# and don't just add some includes
+	sed -i -e 's:-I/usr/local/include::' Makefile.in || die
+}
+
 src_install() {
 	default
 
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 907f267a2f83..74c21485c81e 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-9999.ebuild,v 1.4 2011/06/02 18:06:50 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-9999.ebuild,v 1.5 2011/07/30 11:58:51 grobian Exp $
 
 EAPI=3
 
@@ -30,6 +30,10 @@ S="${WORKDIR}"/${PN}
 
 src_prepare() {
 	eautoreconf
+	# look for config file in the prefix
+	sed -i -e '/SYSTEM_CFG/s:"/etc:"'"${EPREFIX}"'/etc:' tmux.h || die
+	# and don't just add some includes
+	sed -i -e 's:-I/usr/local/include::' Makefile.in || die
 }
 
 src_configure() {