fix cboard component (bug #117464) with patch from nyhm; use make install; add modular X deps

(Portage version: 2.1_pre10-r2)

6 files changed, 86 insertions, 5 deletions

diff --git a/games-board/xboard/ChangeLog b/games-board/xboard/ChangeLog
index c47da4774847..cf351b35b406 100644
--- a/games-board/xboard/ChangeLog
+++ b/games-board/xboard/ChangeLog
@@ -1,6 +1,13 @@
 # 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.6 2006/01/23 21:10:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.7 2006/05/04 04:51:53 mr_bones_ Exp $
+
+  04 May 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/xboard-4.2.7-cmail.patch,
+  +files/xboard-4.2.7-default-program.patch,
+  +files/xboard-4.2.7-destdir.patch, xboard-4.2.7.ebuild:
+  fix cboard component (bug #117464) with patch from nyhm; use make install;
+  add modular X deps
 
   23 Jan 2006; Markus Rothe <corsair@gentoo.org> xboard-4.2.7.ebuild:
   Added ~ppc64; bug #120092
diff --git a/games-board/xboard/files/digest-xboard-4.2.7 b/games-board/xboard/files/digest-xboard-4.2.7
index 8a91649444b3..aaa7565960be 100644
--- a/games-board/xboard/files/digest-xboard-4.2.7
+++ b/games-board/xboard/files/digest-xboard-4.2.7
@@ -1 +1,3 @@
 MD5 b70ad8ff7569975302c5fb402d5eea32 xboard-4.2.7.tar.gz 1318110
+RMD160 bd05a47319a35f7024a1743bea622e26052f4d28 xboard-4.2.7.tar.gz 1318110
+SHA256 5b21f12e3e99be0c69a3fa5f3d4cb79def24b6a2195ed94efc1b6ab415fb8d3b xboard-4.2.7.tar.gz 1318110
diff --git a/games-board/xboard/files/xboard-4.2.7-cmail.patch b/games-board/xboard/files/xboard-4.2.7-cmail.patch
new file mode 100644
index 000000000000..22179a92b260
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.2.7-cmail.patch
@@ -0,0 +1,11 @@
+--- backend.c
++++ backend.c
+@@ -6949,7 +6949,7 @@
+ 	|| (nCmailMovesRegistered + nCmailResults == nCmailGames)) {
+ 	sprintf(string, partCommandString,
+ 		appData.debugMode ? " -v" : "", appData.cmailGameName);
+-	commandOutput = popen(string, "rb");
++	commandOutput = popen(string, "r");
+ 
+ 	if (commandOutput == NULL) {
+ 	    DisplayError("Failed to invoke cmail", 0);
diff --git a/games-board/xboard/files/xboard-4.2.7-default-program.patch b/games-board/xboard/files/xboard-4.2.7-default-program.patch
new file mode 100644
index 000000000000..34c8f72091b7
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.2.7-default-program.patch
@@ -0,0 +1,11 @@
+--- xboard.old	2002-04-13 19:44:26.000000000 -0700
++++ xboard.h	2002-04-13 19:44:08.000000000 -0700
+@@ -100,7 +100,7 @@
+ 
+ #define BORDER_X_OFFSET 3
+ #define BORDER_Y_OFFSET 27
+-#define FIRST_CHESS_PROGRAM	"gnuchessx"
++#define FIRST_CHESS_PROGRAM	"gnuchess"
+ #define SECOND_CHESS_PROGRAM	"gnuchessx"
+ 
+ /* Default to no flashing (the "usual" XBoard behavior) */
diff --git a/games-board/xboard/files/xboard-4.2.7-destdir.patch b/games-board/xboard/files/xboard-4.2.7-destdir.patch
new file mode 100644
index 000000000000..8fbf539ca8a0
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.2.7-destdir.patch
@@ -0,0 +1,38 @@
+--- Makefile.in.orig	2006-05-04 00:03:28.000000000 -0400
++++ Makefile.in	2006-05-04 00:14:10.000000000 -0400
+@@ -21,7 +21,7 @@
+ # Yuck; the autoconf generated configure script sets an infodir variable
+ # and provides a command-line flag to change it, but the default is 
+ # /usr/info instead of /usr/share/info.
+-infodir = $(prefix)/share/info
++infodir = /usr/share/info
+ 
+ CC = @CC@
+ CFLAGS = @CFLAGS@ @CPPFLAGS@ -DINFODIR=\"$(infodir)\"
+@@ -63,18 +63,16 @@
+ all: default pseudosource info FAQ html dvi ps
+ 
+ install: installdirs default
+-	$(INSTALL_PROGRAM) -s xboard $(bindir)/xboard
+-	$(INSTALL_PROGRAM) -s zic2xpm $(bindir)/zic2xpm
+-	$(INSTALL_PROGRAM) cmail $(bindir)/cmail
+-	$(INSTALL_PROGRAM) $(srcdir)/pxboard $(bindir)/pxboard
+-	$(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext)
+-	$(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
+-	$(INSTALL_DATA) xboard.info $(infodir)/xboard.info
+-	-PATH=$$PATH:/sbin:/usr/sbin install-info \
+-		$(infodir)/xboard.info $(infodir)/dir
++	$(INSTALL_PROGRAM) xboard $(DESTDIR)$(bindir)/xboard
++	$(INSTALL_PROGRAM) zic2xpm $(DESTDIR)$(bindir)/zic2xpm
++	$(INSTALL_PROGRAM) cmail $(DESTDIR)$(bindir)/cmail
++	$(INSTALL_PROGRAM) $(srcdir)/pxboard $(DESTDIR)$(bindir)/pxboard
++	$(INSTALL_DATA) $(srcdir)/xboard.man $(DESTDIR)$(man6dir)/xboard$(man6ext)
++	$(INSTALL_DATA) $(srcdir)/zic2xpm.man $(DESTDIR)$(man6dir)/zic2xpm$(man6ext)
++	$(INSTALL_DATA) xboard.info $(DESTDIR)$(infodir)/xboard.info
+ 
+ installdirs: mkinstalldirs
+-	$(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir) $(DESTDIR)$(man6dir) $(DESTDIR)$(infodir)
+ 
+ uninstall:
+ 	rm -f $(bindir)/xboard $(bindir)/cmail $(bindir)/pxboard
diff --git a/games-board/xboard/xboard-4.2.7.ebuild b/games-board/xboard/xboard-4.2.7.ebuild
index ef7430088d0c..529a125fccfc 100644
--- a/games-board/xboard/xboard-4.2.7.ebuild
+++ b/games-board/xboard/xboard-4.2.7.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/games-board/xboard/xboard-4.2.7.ebuild,v 1.9 2006/04/23 06:44:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.2.7.ebuild,v 1.10 2006/05/04 04:51:53 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -13,16 +13,28 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc ~ppc64 x86"
 IUSE=""
 
-DEPEND="games-board/gnuchess"
+RDEPEND="games-board/gnuchess
+	|| (
+		( x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXmu
+		x11-libs/libXext
+		x11-libs/libICE
+		x11-libs/libXpm
+		x11-libs/libXaw )
+		virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xproto ) virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PV}-default-program.patch"
+	epatch "${FILESDIR}"/${P}*
 }
 
 src_install() {
-	egamesinstall || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc FAQ READ_ME ToDo ChangeLog*
 	dohtml FAQ.html
 	prepgamesdirs