gawk-4.1.0: Add upstream patches for AIX support, bug#490266.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA630CCB8

4 files changed, 204 insertions, 18 deletions

diff --git a/sys-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog
index b236ca6525e4..fed5a72beb86 100644
--- a/sys-apps/gawk/ChangeLog
+++ b/sys-apps/gawk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/gawk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.161 2013/05/13 22:13:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.162 2013/11/19 09:03:48 haubi Exp $
+
+  19 Nov 2013; Michael Haubenwallner <haubi@gentoo.org> gawk-4.1.0.ebuild,
+  +files/gawk-4.1.0-ports.patch:
+  Add upstream patches for AIX support, bug#490266.
 
 *gawk-4.1.0 (13 May 2013)
 
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 278aaf779707..97c66e54c8a6 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -6,6 +6,7 @@ AUX filefuncs/Makefile 1226 SHA256 a3b91ceefd4d659d9ffdc0c8502c7de10e7d4f9daee4e
 AUX filefuncs/filefuncs.c 10992 SHA256 c647aa27170ef8e001d47bdf86c47809afd7f6d5a89be2f9769ce05b55ed8309 SHA512 07caa4dfe83716de8218f9035b893778461a8c709a538a0a3f45dc6a08f99387a9bf15967b849cdad8ccfe1fb94fc4c3de790457f6460998275afe20f8c16a94 WHIRLPOOL 6b2078a9538691871c6441a5d828d17246a97640ad8c3d080e9b24f324488500e2da4058bdb387ee857d849ec9f4a0be36f77fc335357c4a48f24ca9bb5271bf
 AUX gawk-3.1.3-getpgrp_void.patch 1225 SHA256 2e43682e4c86e6f50eeca42b3fc333c1c9c080838b29f3020c88f1d95dc02767 SHA512 92540e4a304c75b753f4a5c1faef1fb5ecde321f1802eecf0ee6ef9b11249178bc2aa608223a55735ac521adc02c7e1a0ce6ee3ddfbfd23ef23b3c1ea5b6ab2b WHIRLPOOL bad6c7bd2b2683cac03133f5322c671844c9ec380f6a847f2b6a7489f490ebceab9b56c6368db73950da8791d5aefafa2ddb2802850d395d16593699973ca999
 AUX gawk-3.1.6-gnuinfo.patch 895 SHA256 e0e94e01bc061bdf41160fafc406e2c05bc6d27f3e26847899f020a01f46c98a SHA512 ad0e7c7e0e37ebc4c2225882070c5f9d9aa9f5f4e71cfd5a3676d61a1c8bfcbe94bcb39b2b9b6a72c89a278180ce22f24a551eab6548e0f02887e6d887b61f4a WHIRLPOOL 61d23acaa22befae4e4255624b484f120d784740435326d53b2e3c123fc7ac9a2d82364ff439888225b3efc8f59233f86686cd40701eeff43ca93db3f7963ad9
+AUX gawk-4.1.0-ports.patch 5332 SHA256 ff39dda30e5efc14f9cd7c85f105049c36c78ff89b98fc992c86d9cf6384fca2 SHA512 37a25cc8515862b3a6056751e5fa0828a9630eee118f1da6dfda3881ac5b54e3997d389034f3d4b5b2b142449dd7631eece480d5316e59e85c3fc29b52bcd6dd WHIRLPOOL f99a6f7952431558c956b5d32d6d2e0048b3f164e211e96b0dfd07aef7de3c2fd474f86448bb7dd1e25ca0b3e5a849ad3ac72c17278ccaa16f49dfb839f8e4ec
 DIST gawk-3.1.6.tar.bz2 1861630 SHA256 513fdd5a0bd1b467bd4993eb3adb4690f65fff6857c9e2ed1a3e46d72151cb6c SHA512 cf2040a41eade41c0d08f6ae9fffdb23345d76973d5ba5607278e28c2812ce4612bbb93ec925bb56573cc021517d813ec73c1c97e24196cd11c497603d233da4 WHIRLPOOL a7d08eb243eb5d0166867efcb218b0772292c64d3fd46adc531a4864b48a2f9d03f339d4c3cf3e53b42ae22ecbbcd769d8407a0430ef6d7d03650b328b8ddd76
 DIST gawk-3.1.7.tar.bz2 2365837 SHA256 f12b76b8963c5a438a56a73223ad29aeb900c7f004deb6242fab3324188ede71 SHA512 709b9749f267e9e9ecddf1bb9eb68ea8a10151eb5b390efa04c0f421e464083e8bf1d08834f6764a06a11f0df91fd18e1fa1474075535fbe98999e7fb52aa6aa WHIRLPOOL 0bce548391624bbe68f857d7e13fdd44c74d25b404bb9d9f94ddc73b8d9ad719f05927a9d086a0534b13e29300b53b43bf3702e15cf3fb538495901c126afa53
 DIST gawk-3.1.8.tar.bz2 1984129 SHA256 5dbc7b2c4c328711337c2aacd09a122c7313122262e3ff034590f014067412b4 SHA512 a8046c1a5a6ffc8bd90cc6062d97ba6301b7a707f4a34a06355a83aaaea2ccdf4c4476563fc6f444b529a2d8d3a2de2126b53434ba50aad8bd898fb3299904dd WHIRLPOOL e24079d7c2aee57e48db2ef76df4c217ea0fa435304a563c6df8d0442f8a5e5e4cff2141809f68430939d66a3a6eda981edefa94b2b8c85e5f0a3ee7ba8a7649
@@ -20,23 +21,13 @@ EBUILD gawk-4.0.0.ebuild 1646 SHA256 38b209567247de1a6018d14ac1209c58565fa434c84
 EBUILD gawk-4.0.1-r1.ebuild 2250 SHA256 d44a7e3d7ec0bcab96716cbe0edec950219cdf25e9dd9277aa3b15737753f65b SHA512 972f0b9c18b81f41a33db0767879d25173517e0ebb808667addf5ca786428e8e2de63ea9cf271010c55bec8ef8b7190d4003c437e6a95d2504f247f60bc51fa8 WHIRLPOOL abc20bcb99dc05b115e7cc4e571acb583a34332961dbae035de9d6a0b3505b20cdfd827d9fd44a5349eb86bdce235144b2a3a6dbb1070df22f67c14eb4834d10
 EBUILD gawk-4.0.1.ebuild 1928 SHA256 6b61949dcf4c4d9beaf5111e9450e895ca963cb312c1083456bf0f7241ef3ed5 SHA512 6343596920e4f3e84835b315c7f007c702ce5eaf891f1f727f1f4e0919d405d6160dda1acfce9f950eb54b9914915a6ddcb68138eb4ca61984bf70f83d0bb1fb WHIRLPOOL bec75ad5f4094997637a1d7a4872431479aaff51ef39cd41316aaf65a07b5c95c69d7cd3272264cacecc2a79675cf174be51914d1df87e2609cc1ee50172873f
 EBUILD gawk-4.0.2.ebuild 2259 SHA256 8a97f5026c2aefbe6afa00dc772986d6f41e4e48b4c1ccd6158f157e42909b0f SHA512 f150ef040ad0b0972ce70de8d2af5ff7fa305838caeb17308cf721c5061a69b3a059c5cbcdfe33582ec22851ce3193ea09143a654472da66b7b0b85be8b6ccb9 WHIRLPOOL 98267c8a267d2884a03b114f7c1bc65b4cfd8ca3016dd704ec43f4872302bd8b8263d8f94b1afcccb9d7736559ec91b7ba1c64e45b6f96944612093a84de76d1
-EBUILD gawk-4.1.0.ebuild 2117 SHA256 59a06e035a816fbda0f99eb547789c4ca66b3ed43815844a11eba0f9cd2c0ee6 SHA512 16c2a393da0e252d3e7720c7d861c3180f7dda7ad197f0e00e21602cea00d6d60d6cec918a121c48b08843e0acf225cc53b1bb2e701332a13de24b82250b7cfe WHIRLPOOL 607cd47c2ab3c281ba78322c6b5b68cf2715d6118dc0962478162b70b038140d0f48a559e5b6deaa2de5b2470ee8e3cf9d5389ffa83ec4de399a52f3b114b40b
-MISC ChangeLog 21856 SHA256 a55d207ff87dfdbe1c63808a6ed0265182918b1b2265373c5685e367b4283e03 SHA512 9ada79d35d7e435ae4600f49375f841e61d428df65a64ec9d4fbb60839f223b49b7821b40825e6dbe1ac1e9be3c2c3182126921cf7f27ee050d3a59cd8af6b5c WHIRLPOOL 66a6c90ba2322888aef6d7e7ac8bae6028adcef424166ed9ac3c2431dc4031cf57d2f0c30fca7c4c5fce37fd31105a289991c2b983c378676c82d07fd7462ee6
+EBUILD gawk-4.1.0.ebuild 2171 SHA256 eb66af3dfe9f72fc711de31d167cd201cbcdda36ee399f3be2abbd1d884e74ec SHA512 90b34830ab42031edac40bc96a6a4e2acf0df4dbebfe782a3f2e2309840bd12cab7c5fda1d042eb52faa95cde5bdc825c4284e3834b2778bd8908ef26767b87a WHIRLPOOL 7a4c34cb23447e82a6fd09b0f788c05886bcdb36288d26ebe6ec5b91a1b497e66f5c110675ebed5795f4aeced76f0832bfe86a0105ff70ef95c30dcc9479c9ef
+MISC ChangeLog 22016 SHA256 e22d075084f7a252aa3bb064daf4d0d124a1e4d6c29652d031d6f3932fe951fb SHA512 a10fc91e8c1ec45177a7408db20fc49fe6b401ee33932eba8364fb5741fd04aa551a24d0ad5fc8e4c66a4ffbc698c0d3913eeb7348e9f76f76c267cac2e6f9e9 WHIRLPOOL a2004028abb16da6c2a7d8ac0679cac8a77f14735d1ec305c42e36929de38cf9a1106c04a904642c6f02b7c88a6bd425170be1708ce96da65c5a4a400fcad173
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRkWWFAAoJELEHsLL7fEFWfWEP/RbfwBkhbSaHx7L9QOJ70TDb
-W3ph9Vyg6PDZPG8h8Lft16GTWqZL8XO4jRGdahiTDKdtAFGINhs+xy9h8K+jKoDx
-NcRKLiGcWd07eLR29sD84thQdHZMa1w2kxuM8HGt+0JjRtTjZVDOHm3+HaTXtXx6
-Yq+h/LnsPfK6TUjA51eREGGPBqaDxLQu7qCy5spg8SCefTLUWrvW1p33CI0T2itu
-jHEn9XrvUOIj7YRLKjhmkjM2aey8rzScmqb+iwUuUpEWhydPpYGyaOxZaB9WwMg1
-FcH5+F160i/s1VBy7plv3QDELtjXBhl/146wNRIK7CyGbNbTp/5b4W5qr0aBDSp6
-GS2QtCoyiPlth8xi1n1TxXVMBAbRFbqu0snH4TQGb+B9ySxs24K/0S2bszupp+7C
-8hPJKosOA+bzJLr26PTo1JliMnkT/IPx6mKE4ugwBpKBncb0qfnBQHSu/wmX/2RG
-iafL1ZcnBCKkaf235mWWWfT2g6clUCQg0v1MlCjMllnxN9FfQJVya8OTCNA70J1B
-LS5LzI5ZFpL/ycXKtE6XTMW61eLpy1+nqUDvcQ9BpVTW/1zWFShRYHP4WSJqO+W2
-MP319DGD/5dPR5Gau+0FHzePG5tG6aWAGmz7EkQKj4jQDfAiRQogQFWELjok14/X
-xqPkWqTnQP9I1Zov/rDD
-=20R1
+iEYEAREIAAYFAlKLKXcACgkQLc0TWKYwzLgDowCgoOv6wjNBB+U/7qsi7FZoPilp
+zbQAoKSvjWYV9G2dE7nKriYcGOmU5JdR
+=j9RR
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gawk/files/gawk-4.1.0-ports.patch b/sys-apps/gawk/files/gawk-4.1.0-ports.patch
new file mode 100644
index 000000000000..9aba7e8a2df3
--- /dev/null
+++ b/sys-apps/gawk/files/gawk-4.1.0-ports.patch
@@ -0,0 +1,189 @@
+AIX port, bug#490266.
+
+This is from 2 upstream commits:
+
+http://git.savannah.gnu.org/cgit/gawk.git/commit/?h=gawk-4.1-stable&id=21c8b6d547b12942775d675ead2994992285c04c
+http://git.savannah.gnu.org/cgit/gawk.git/commit/?h=gawk-4.1-stable&id=29e3ae329c550b884169b7db20775cd74b95b77a
+
+#diff --git a/extension/ChangeLog b/extension/ChangeLog
+#index e01d6d1..4d1af22 100644
+#--- a/extension/ChangeLog
+#+++ b/extension/ChangeLog
+#@@ -1,3 +1,20 @@
+#+2013-10-23  Michael Haubenwallner <michael.haubenwallner@salomon.at>
+#+
+#+	Fix portability for AIX.
+#+
+#+	* inplace.c (_XOPEN_SOURCE): Define when not defined yet.
+#+	(_XOPEN_SOURCE_EXTENDED): Ditto. Needs to define a number.
+#+
+#+2013-06-10         Arnold D. Robbins     <arnold@skeeve.com>
+#+
+#+	* configure.ac (AC_HEADER_MAJOR): New macro added.
+#+	Add check for limits.h header.
+#+	* filefuncs.c: Add the right stuff to get the major/minor macros.
+#+	* readdir.c: Add include of limits.h appropriately wrapped.
+#+
+#+	Thanks to ICHII Takashi <ichii386@schweetheart.jp> for the reports
+#+	and pointers.
+#+
+# 2013-05-09         Arnold D. Robbins     <arnold@skeeve.com>
+# 
+# 	* 4.1.0: Release tar ball made.
+#diff --git a/extension/configure.ac b/extension/configure.ac
+#index 53ed588..3ad03ed 100644
+#--- a/extension/configure.ac
+#+++ b/extension/configure.ac
+#@@ -64,7 +64,8 @@ else
+# 	AC_MSG_RESULT([no])
+# fi
+# 
+#-AC_CHECK_HEADERS(dirent.h fnmatch.h time.h sys/time.h sys/select.h)
+#+AC_HEADER_MAJOR
+#+AC_CHECK_HEADERS(dirent.h fnmatch.h limits.h time.h sys/time.h sys/select.h)
+# 
+# AC_CHECK_FUNCS(fdopendir fnmatch gettimeofday \
+# 		getdtablesize nanosleep select GetSystemTimeAsFileTime)
+diff --git a/extension/configh.in b/extension/configh.in
+index 9162ce4..02954ee 100644
+--- a/extension/configh.in
++++ b/extension/configh.in
+@@ -66,6 +66,9 @@
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+ 
++/* Define to 1 if you have the <limits.h> header file. */
++#undef HAVE_LIMITS_H
++
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+ 
+@@ -109,6 +112,14 @@
+    */
+ #undef LT_OBJDIR
+ 
++/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
++   */
++#undef MAJOR_IN_MKDEV
++
++/* Define to 1 if `major', `minor', and `makedev' are declared in
++   <sysmacros.h>. */
++#undef MAJOR_IN_SYSMACROS
++
+ /* Name of package */
+ #undef PACKAGE
+ 
+diff --git a/extension/configure b/extension/configure
+index f848b9b..c3f8f1c 100755
+--- a/extension/configure
++++ b/extension/configure
+@@ -13885,7 +13885,57 @@ else
+ $as_echo "no" >&6; }
+ fi
+ 
+-for ac_header in dirent.h fnmatch.h time.h sys/time.h sys/select.h
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5
++$as_echo_n "checking whether sys/types.h defines makedev... " >&6; }
++if ${ac_cv_header_sys_types_h_makedev+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++int
++main ()
++{
++return makedev(0, 0);
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_header_sys_types_h_makedev=yes
++else
++  ac_cv_header_sys_types_h_makedev=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5
++$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; }
++
++if test $ac_cv_header_sys_types_h_makedev = no; then
++ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_mkdev_h" = xyes; then :
++
++$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
++
++fi
++
++
++
++  if test $ac_cv_header_sys_mkdev_h = no; then
++    ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then :
++
++$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
++
++fi
++
++
++  fi
++fi
++
++for ac_header in dirent.h fnmatch.h limits.h time.h sys/time.h sys/select.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+diff --git a/extension/filefuncs.c b/extension/filefuncs.c
+index 1e8fc8d..9e637aa 100644
+--- a/extension/filefuncs.c
++++ b/extension/filefuncs.c
+@@ -46,6 +46,12 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++#ifdef MAJOR_IN_MKDEV
++#include <sys/mkdev.h>
++#elif defined(MAJOR_IN_SYSMACROS)
++#include <sys/sysmacros.h>
++#endif
++
+ #include "gawkapi.h"
+ 
+ #include "gettext.h"
+diff --git a/extension/inplace.c b/extension/inplace.c
+index ded4746..69d452a 100644
+--- a/extension/inplace.c
++++ b/extension/inplace.c
+@@ -27,8 +27,12 @@
+ #include <config.h>
+ #endif
+ 
+-#define _XOPEN_SOURCE
+-#define _XOPEN_SOURCE_EXTENDED
++#ifndef _XOPEN_SOURCE
++# define _XOPEN_SOURCE
++#endif
++#ifndef _XOPEN_SOURCE_EXTENDED
++# define _XOPEN_SOURCE_EXTENDED 1
++#endif
+ 
+ #include <stdio.h>
+ #include <assert.h>
+diff --git a/extension/readdir.c b/extension/readdir.c
+index 5ca4dc6..c2a626a 100644
+--- a/extension/readdir.c
++++ b/extension/readdir.c
+@@ -44,6 +44,10 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++#ifdef HAVE_LIMITS_H
++#include <limits.h>
++#endif
++
+ #ifdef HAVE_DIRENT_H
+ #include <dirent.h>
+ #else
diff --git a/sys-apps/gawk/gawk-4.1.0.ebuild b/sys-apps/gawk/gawk-4.1.0.ebuild
index a18471042b0f..92f38e672613 100644
--- a/sys-apps/gawk/gawk-4.1.0.ebuild
+++ b/sys-apps/gawk/gawk-4.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-4.1.0.ebuild,v 1.1 2013/05/13 22:13:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-4.1.0.ebuild,v 1.2 2013/11/19 09:03:48 haubi Exp $
 
 EAPI="4"
 
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}-4.1.0-ports.patch" #490266
+
 	# use symlinks rather than hardlinks, and disable version links
 	sed -i \
 		-e '/^LN =/s:=.*:= $(LN_S):' \