Install gnuchess4 binaries as "gnuchess?4" so that this doesn't conflict

with gnuchess.

4 files changed, 79 insertions, 36 deletions

diff --git a/games/gnuchess4/Makefile b/games/gnuchess4/Makefile
index e3200c27bb5..a312e3d7248 100644
--- a/games/gnuchess4/Makefile
+++ b/games/gnuchess4/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/03/26 14:44:41 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2000/03/27 10:25:01 jlam Exp $
 # FreeBSD Id: Makefile,v 1.6 1999/01/27 07:41:12 fenner Exp
 #
 
 DISTNAME=		gnuchess-4.0.pl80
-PKGNAME=		gnuchess-4.0.80
+PKGNAME=		gnuchess4-4.0.80
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_LOCAL}
@@ -11,16 +11,15 @@ MASTER_SITES=		${MASTER_SITE_LOCAL}
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/chess/chess.html
 
-CONFLICTS=		gnuchess-*
-
 MIRROR_DISTFILE=	no
 
 GNU_CONFIGURE=		yes
 
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/gnuchess
-.for file in ARTICLE ARTICLE.2 CHESSTOOL FAQ HEURISTICS MOVE-GEN README.font README.output
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/${file} ${PREFIX}/share/doc/gnuchess
-.endfor
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnuchess4
+	cd ${WRKSRC}/../doc; ${INSTALL_DATA} \
+		ARTICLE ARTICLE.2 CHESSTOOL FAQ HEURISTICS MOVE-GEN \
+		README.font README.output \
+		${PREFIX}/share/doc/gnuchess4
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gnuchess4/files/patch-sum b/games/gnuchess4/files/patch-sum
index 8177f70bcc5..faa463a0ae5 100644
--- a/games/gnuchess4/files/patch-sum
+++ b/games/gnuchess4/files/patch-sum
@@ -1,7 +1,8 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/03/26 14:44:41 jlam Exp $
+$NetBSD: patch-sum,v 1.2 2000/03/27 10:25:01 jlam Exp $
 
 MD5 (patch-aa) = eb9353044e32ba547471a5ec50bfd665
 MD5 (patch-ab) = 3878b056bf3bf89d75d483594a376584
 MD5 (patch-ac) = 5dbc904dd3ef1e75d198a07c2aa44340
 MD5 (patch-ad) = 91d9978a5ae0901d83a861769c21d900
-MD5 (patch-ae) = 243c76fc330ec282d83ded70ffd68e16
+MD5 (patch-ae) = b3fb129faf16ac9540a535dea2f8e5ea
+MD5 (patch-af) = aaf4c80952feea33c13f2b5175e4bd72
diff --git a/games/gnuchess4/patches/patch-ae b/games/gnuchess4/patches/patch-ae
index 45074ca2d39..6182bfbf914 100644
--- a/games/gnuchess4/patches/patch-ae
+++ b/games/gnuchess4/patches/patch-ae
@@ -1,17 +1,30 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/03/26 14:44:41 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2000/03/27 10:25:01 jlam Exp $
 
---- Makefile.in-orig	Mon Sep 28 08:41:13 1998
-+++ Makefile.in	Mon Feb  8 08:52:59 1999
+--- Makefile.in.orig	Sun Sep 27 23:41:13 1998
++++ Makefile.in	Sun Mar 26 16:15:23 2000
 @@ -127,7 +127,7 @@
  
  prefix = @prefix@
  exec_prefix = @exec_prefix@
 -LIBDIR = $(prefix)/lib
-+LIBDIR = $(prefix)/share/gnuchess
++LIBDIR = $(prefix)/share/gnuchess4
  BINDIR = $(exec_prefix)/bin
  MANDIR = $(prefix)/man/man6
  MANEXT = .6
-@@ -156,6 +156,7 @@
+@@ -148,29 +148,30 @@
+ all: gnuchess gnuchessr gnuchessn gnuchessx gnuchessc postprint gnuan game gnuchess.eco gnuchess.data
+ 
+ install: 
+-	$(INSTALL) gnuchess $(BINDIR)/gnuchess	
+-	$(INSTALL) gnuchessr $(BINDIR)/gnuchessr
+-	$(INSTALL) gnuchessn $(BINDIR)/gnuchessn
+-	$(INSTALL) gnuchessx $(BINDIR)/gnuchessx
+-	$(INSTALL) gnuchessc $(BINDIR)/gnuchessc
++	$(INSTALL) gnuchess $(BINDIR)/gnuchess4
++	$(INSTALL) gnuchessr $(BINDIR)/gnuchessr4
++	$(INSTALL) gnuchessn $(BINDIR)/gnuchessn4
++	$(INSTALL) gnuchessx $(BINDIR)/gnuchessx4
++	$(INSTALL) gnuchessc $(BINDIR)/gnuchessc4
  	$(INSTALL) postprint $(BINDIR)/postprint
  	$(INSTALL) gnuan $(BINDIR)/gnuan
  	$(INSTALL) game $(BINDIR)/game
@@ -19,3 +32,33 @@ $NetBSD: patch-ae,v 1.1.1.1 2000/03/26 14:44:41 jlam Exp $
  	$(INSTALL) $(srcdir)/../misc/gnuchess.lang $(LIBDIR)/gnuchess.lang
  	$(INSTALL) $(srcdir)/../book/eco.pgn $(LIBDIR)/eco.pgn
  	$(INSTALL) gnuchess.data $(LIBDIR)/gnuchess.data
+ 	$(INSTALL) gnuchess.eco $(LIBDIR)/gnuchess.eco
+ 	$(INSTALL_DATA) $(srcdir)/../doc/game.6 $(MANDIR)/game.6
+ 	$(INSTALL_DATA) $(srcdir)/../doc/gnuan.6 $(MANDIR)/gnuan.6
+-	$(INSTALL_DATA) $(srcdir)/../doc/gnuchess.6 $(MANDIR)/gnuchess.6
++	$(INSTALL_DATA) $(srcdir)/../doc/gnuchess.6 $(MANDIR)/gnuchess4.6
+ 	$(INSTALL_DATA) $(srcdir)/../doc/postprint.6 $(MANDIR)/postprint.6
+ 
+ uninstall:
+-	rm -f $(BINDIR)/gnuchess
+-	rm -f $(BINDIR)/gnuchessr
+-	rm -f $(BINDIR)/gnuchessn
+-	rm -f $(BINDIR)/gnuchessx
+-	rm -f $(BINDIR)/gnuchessc
++	rm -f $(BINDIR)/gnuchess4
++	rm -f $(BINDIR)/gnuchessr4
++	rm -f $(BINDIR)/gnuchessn4
++	rm -f $(BINDIR)/gnuchessx4
++	rm -f $(BINDIR)/gnuchessc4
+ 	rm -f $(BINDIR)/postprint
+ 	rm -f $(BINDIR)/gnuan
+ 	rm -f $(BINDIR)/game
+@@ -180,7 +181,7 @@
+ 	rm -f $(LIBDIR)/gnuchess.eco
+ 	rm -f $(MANDIR)/game.6
+ 	rm -f $(MANDIR)/gnuan.6
+-	rm -f $(MANDIR)/gnuchess.6
++	rm -f $(MANDIR)/gnuchess4.6
+ 	rm -f $(MANDIR)/postprint.6
+ 
+ clean:
diff --git a/games/gnuchess4/pkg/PLIST b/games/gnuchess4/pkg/PLIST
index a265ce522c3..49c17a50b7c 100644
--- a/games/gnuchess4/pkg/PLIST
+++ b/games/gnuchess4/pkg/PLIST
@@ -1,27 +1,27 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/03/26 14:44:41 jlam Exp $
-bin/gnuchess
-bin/gnuchessr
-bin/gnuchessn
-bin/gnuchessx
-bin/gnuchessc
+@comment $NetBSD: PLIST,v 1.2 2000/03/27 10:25:01 jlam Exp $
+bin/gnuchess4
+bin/gnuchessr4
+bin/gnuchessn4
+bin/gnuchessx4
+bin/gnuchessc4
 bin/postprint
 bin/gnuan
 bin/game
-share/gnuchess/gnuchess.lang
-share/gnuchess/eco.pgn
-share/gnuchess/gnuchess.data
-share/gnuchess/gnuchess.eco
-share/doc/gnuchess/ARTICLE
-share/doc/gnuchess/ARTICLE.2
-share/doc/gnuchess/CHESSTOOL
-share/doc/gnuchess/FAQ
-share/doc/gnuchess/HEURISTICS
-share/doc/gnuchess/MOVE-GEN
-share/doc/gnuchess/README.font
-share/doc/gnuchess/README.output
+share/gnuchess4/gnuchess.lang
+share/gnuchess4/eco.pgn
+share/gnuchess4/gnuchess.data
+share/gnuchess4/gnuchess.eco
+share/doc/gnuchess4/ARTICLE
+share/doc/gnuchess4/ARTICLE.2
+share/doc/gnuchess4/CHESSTOOL
+share/doc/gnuchess4/FAQ
+share/doc/gnuchess4/HEURISTICS
+share/doc/gnuchess4/MOVE-GEN
+share/doc/gnuchess4/README.font
+share/doc/gnuchess4/README.output
 man/man6/game.6
 man/man6/gnuan.6
-man/man6/gnuchess.6
+man/man6/gnuchess4.6
 man/man6/postprint.6
-@dirrm share/gnuchess
-@dirrm share/doc/gnuchess
+@dirrm share/gnuchess4
+@dirrm share/doc/gnuchess4