Add configure-fixup patch from Ali Polatel (bug #158488)

Package-Manager: portage-2.1.1-r2

4 files changed, 49 insertions, 24 deletions

diff --git a/games-board/xboard/ChangeLog b/games-board/xboard/ChangeLog
index c576a1f356c0..be368108d66d 100644
--- a/games-board/xboard/ChangeLog
+++ b/games-board/xboard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/xboard
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.12 2006/12/12 22:40:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.13 2006/12/21 05:12:14 mr_bones_ Exp $
+
+  21 Dec 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/xboard-4.2.7-xaw3d_configure.patch, xboard-4.2.7-r1.ebuild:
+  Add configure-fixup patch from Ali Polatel (bug #158488)
 
 *xboard-4.2.7-r1 (12 Dec 2006)
 
diff --git a/games-board/xboard/Manifest b/games-board/xboard/Manifest
index 7848993f8016..73acce6857ce 100644
--- a/games-board/xboard/Manifest
+++ b/games-board/xboard/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 4.2.7-default-program.patch 362 RMD160 20dd011e2f3c98e42f99c42998435af8feb8e96a SHA1 64db648acada1aeab0cbc844058714eafc4e895f SHA256 8dbaea3493c26ad50307551c6acf31f48e416bb767af5d5808e3393f5187fc9a
 MD5 f99bdbe68caa44c40ef71762f27da40c files/4.2.7-default-program.patch 362
 RMD160 20dd011e2f3c98e42f99c42998435af8feb8e96a files/4.2.7-default-program.patch 362
@@ -21,20 +18,24 @@ AUX xboard-4.2.7-destdir.patch 1743 RMD160 c0a63982372edfc9eb3824a85bbb79e76e5dd
 MD5 be90d99c1ee3151e6adeba8fde6ea164 files/xboard-4.2.7-destdir.patch 1743
 RMD160 c0a63982372edfc9eb3824a85bbb79e76e5ddfec files/xboard-4.2.7-destdir.patch 1743
 SHA256 dcf3a64a48c632357ffb6c5ada05492ee8bb046a154202418a3812236a503803 files/xboard-4.2.7-destdir.patch 1743
+AUX xboard-4.2.7-xaw3d_configure.patch 625 RMD160 eb2b9dcc98da755c8c8b68af9d9ca342a7220463 SHA1 8f880b95e65b05eb54cd1967b4b8da72ba282da4 SHA256 b40dc08240da848958148b6e25406eb2975bd9cc906ec73645c959571c395758
+MD5 1949eed47b78f438c568c13401e52747 files/xboard-4.2.7-xaw3d_configure.patch 625
+RMD160 eb2b9dcc98da755c8c8b68af9d9ca342a7220463 files/xboard-4.2.7-xaw3d_configure.patch 625
+SHA256 b40dc08240da848958148b6e25406eb2975bd9cc906ec73645c959571c395758 files/xboard-4.2.7-xaw3d_configure.patch 625
 DIST xboard-4.2.7.tar.gz 1318110 RMD160 bd05a47319a35f7024a1743bea622e26052f4d28 SHA1 ad6bc0b25290079d744e93ea8c3dfcf349180180 SHA256 5b21f12e3e99be0c69a3fa5f3d4cb79def24b6a2195ed94efc1b6ab415fb8d3b
 DIST xboard.png 479 RMD160 d0e7fa9cc30e2cf58c13eaf08f2d576e2ea9b076 SHA1 fa96fd0c0d220a3e88e1a7312b3e8308a387764c SHA256 1c36fd6ca934eef29d7cdc72159019585d8c449f489f6a6ccc2d787bba03f41d
-EBUILD xboard-4.2.7-r1.ebuild 1424 RMD160 8b366ca842b1d8c9e72a79644e8c8667071f3564 SHA1 40abe492ab085ab2cbc68fc1dcb87bdf41c6faad SHA256 664cff259d864f65d74f6203373017361c362c6b8c4df4a69cd6a1d1847ab95a
-MD5 e03a140d08f3119a2c68ac78a68573f4 xboard-4.2.7-r1.ebuild 1424
-RMD160 8b366ca842b1d8c9e72a79644e8c8667071f3564 xboard-4.2.7-r1.ebuild 1424
-SHA256 664cff259d864f65d74f6203373017361c362c6b8c4df4a69cd6a1d1847ab95a xboard-4.2.7-r1.ebuild 1424
+EBUILD xboard-4.2.7-r1.ebuild 1443 RMD160 af83ba2fbe160a2d55127679faffae18bc9b8427 SHA1 c3319d47e2a00f3198968279870c5c1ce8feeafc SHA256 ea666dc8751fabdcb8d10bd73eb5c2d9b91e8d0d3ed272d88598806734dfadf7
+MD5 26a20208cb7c5e059969e790abe7cc4d xboard-4.2.7-r1.ebuild 1443
+RMD160 af83ba2fbe160a2d55127679faffae18bc9b8427 xboard-4.2.7-r1.ebuild 1443
+SHA256 ea666dc8751fabdcb8d10bd73eb5c2d9b91e8d0d3ed272d88598806734dfadf7 xboard-4.2.7-r1.ebuild 1443
 EBUILD xboard-4.2.7.ebuild 1065 RMD160 04300366573ccabbffc5ecfbdf9da3a842f57c69 SHA1 fd4af8fb0c87024107f71d619ef2036e3a233914 SHA256 cab98996c629af83146928cfc666140cf7e38ef9948d3c1686efd4fef21cba3c
 MD5 a2c2416bb19b9438ef13a585303622b0 xboard-4.2.7.ebuild 1065
 RMD160 04300366573ccabbffc5ecfbdf9da3a842f57c69 xboard-4.2.7.ebuild 1065
 SHA256 cab98996c629af83146928cfc666140cf7e38ef9948d3c1686efd4fef21cba3c xboard-4.2.7.ebuild 1065
-MISC ChangeLog 1939 RMD160 6f14d25b0e692812e6391d9286623cbf3078f468 SHA1 505bdda8a719d31e1bdfb0dee6c5d94e4e3512e1 SHA256 ca468bb6e47ec0c3b13c2325e57d68044dfc52dee9aad88cf37f10f0ea546840
-MD5 2498cf2e8f7189c3d5e036e8bb37a799 ChangeLog 1939
-RMD160 6f14d25b0e692812e6391d9286623cbf3078f468 ChangeLog 1939
-SHA256 ca468bb6e47ec0c3b13c2325e57d68044dfc52dee9aad88cf37f10f0ea546840 ChangeLog 1939
+MISC ChangeLog 2124 RMD160 380a937f9701d14e389d38570e0ce2d38e498c30 SHA1 8df23f85e14be3a53d199bc4c92ba1bd54122a7a SHA256 acef6756d91021df31fe37a0dfd7676ec8316977b061e2055ba5ba747d171e12
+MD5 8d61ffeb34874c5a0850ad83cd0c1085 ChangeLog 2124
+RMD160 380a937f9701d14e389d38570e0ce2d38e498c30 ChangeLog 2124
+SHA256 acef6756d91021df31fe37a0dfd7676ec8316977b061e2055ba5ba747d171e12 ChangeLog 2124
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -45,10 +46,3 @@ SHA256 a45f97e7ccee0118a22f146d7680a386cdba382552da5058677d5224a3ff5143 files/di
 MD5 3668b6ad64a5eb3f617572a2129e48c1 files/digest-xboard-4.2.7-r1 443
 RMD160 0739166206d642b1c07037900523c285f201ad9a files/digest-xboard-4.2.7-r1 443
 SHA256 a45f97e7ccee0118a22f146d7680a386cdba382552da5058677d5224a3ff5143 files/digest-xboard-4.2.7-r1 443
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFfy/kkT4lNIS36YERAjfhAJ4jDurh3BDHEp/XDWnPrn93X4wqLACeKfdY
-lC4LIUWVxWH8xVl3QabFKtc=
-=RSHM
------END PGP SIGNATURE-----
diff --git a/games-board/xboard/files/xboard-4.2.7-xaw3d_configure.patch b/games-board/xboard/files/xboard-4.2.7-xaw3d_configure.patch
new file mode 100644
index 000000000000..1d04f177c910
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.2.7-xaw3d_configure.patch
@@ -0,0 +1,24 @@
+--- configure.in	2003-11-27 21:49:24.000000000 +0200
++++ configure-fixed.in	2006-12-21 02:41:35.000000000 +0200
+@@ -35,10 +35,17 @@
+ AC_PATH_PROGS(AWKPATH, awk mawk gawk nawk)
+ AC_PATH_PROGS(PERLPATH, perl)
+ 
+-AC_ARG_WITH(Xaw3d, [  --with-Xaw3d            use Xaw3d instead of Xaw],
+-  [AC_DEFINE(USE_XAW3D)
+-   XAW_LIBS="-lXaw3d"],
+-  XAW_LIBS="-lXaw")
++AC_ARG_WITH(Xaw3d, 
++[  --with-Xaw3d            use Xaw3d instead of Xaw],
++[ with_xaw3d="$withval"], [enable_xaw3d="no"])
++
++if test "$withval" = yes; then
++	AC_DEFINE(USE_XAW3D)
++	XAW_LIBS="-lXaw3d"
++else
++	XAW_LIBS="-lXaw"
++fi
++
+ AC_SUBST(XAW_LIBS)
+ 
+ AC_HEADER_STDC
diff --git a/games-board/xboard/xboard-4.2.7-r1.ebuild b/games-board/xboard/xboard-4.2.7-r1.ebuild
index 131f26657e17..bb1b58da2fcc 100644
--- a/games-board/xboard/xboard-4.2.7-r1.ebuild
+++ b/games-board/xboard/xboard-4.2.7-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.2.7-r1.ebuild,v 1.1 2006/12/12 22:40:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.2.7-r1.ebuild,v 1.2 2006/12/21 05:12:14 mr_bones_ Exp $
 
-inherit eutils games
+inherit autotools eutils games
 
 DESCRIPTION="GUI for gnuchess and for internet chess servers"
 HOMEPAGE="http://www.tim-mann.org/xboard.html"
@@ -31,16 +31,19 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}*
+	eautoreconf
 }
 
 src_compile() {
-	egamesconf $(use_with Xaw3d) \
-		$(use_enable zippy) || die "econf failed"
+	egamesconf \
+		$(use_with Xaw3d) \
+		$(use_enable zippy) \
+		|| die
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc FAQ READ_ME ToDo ChangeLog*
 	use zippy && dodoc zippy.README
 	dohtml FAQ.html