Upgrade to 1.0i.

PR:		7933
Submitted by:	Pedro Giffuni <pfgiffun@bachue.usc.unal.edu.co>

4 files changed, 96 insertions, 143 deletions

diff --git a/games/xbl/Makefile b/games/xbl/Makefile
index 00db328eb6c3..6a23889113b6 100644
--- a/games/xbl/Makefile
+++ b/games/xbl/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	xbl
-# Version required:	1.0h
+# Version required:	1.0i
 # Date created:		May 25 1997
 # Whom:			pgs (original)
 #
-# $Id: Makefile,v 1.3 1998/08/05 09:30:57 asami Exp $
+# $Id: Makefile,v 1.4 1998/09/17 07:52:03 tg Exp $
 #
 
 DISTNAME=	xbl-1.0i
diff --git a/games/xbl/distinfo b/games/xbl/distinfo
index 348d07d90e30..6b62bda3e725 100644
--- a/games/xbl/distinfo
+++ b/games/xbl/distinfo
@@ -1 +1 @@
-MD5 (xbl-1.0h.tar.Z) = 0f4c3db8b202dc2b5d0db9a40c6ad36e
+MD5 (xbl-1.0i.tar.Z) = b9ea1555044e7ca80ff781796fd867b1
diff --git a/games/xbl/files/patch-aa b/games/xbl/files/patch-aa
index e157d714e51c..ac0641bb037d 100644
--- a/games/xbl/files/patch-aa
+++ b/games/xbl/files/patch-aa
@@ -1,129 +1,91 @@
-*** Makefile.in.orig	Sun Jan 12 14:03:54 1997
---- Makefile.in	Sat Mar 21 01:46:43 1998
-***************
-*** 14,20 ****
-  USE_SETGID=-DUSE_SETGID
-  
-  # group owner of games file
-! GROUP_GID=2
-  
-  ###########################################################################
-  # You don't need to read below if you have xmkmf or imake
---- 14,20 ----
-  USE_SETGID=-DUSE_SETGID
-  
-  # group owner of games file
-! GROUP_GID=13
-  
-  ###########################################################################
-  # You don't need to read below if you have xmkmf or imake
-***************
-*** 29,54 ****
-  # Directory who contain X Resource Database
-  # The default value if overrided by configure if xmkmf or imake exists.
-  #
-! RESOURCEDIR=/usr/lib/X11/app-defaults
-  @XAPPLOADDIR@
-  
-  # Directory where install binary
-  # The default value if overrided by configure if xmkmf or imake exists.
-  #
-! BINDIR=/usr/local/bin
-  @BINDIR@
-  
-  # Directory who contain score
-  # Put your HOME if you have a private use of the game
-  # The default value if overrided by configure if xmkmf or imake exists.
-  #
-! SCOREDIR=/usr/local/lib/xbl
-  @SCOREDIR@
-  
-  # Directory where put man pages.
-  # The default value if overrided by configure if xmkmf or imake exists.
-  #
-! MANPATH=/usr/local/man
-  @MANPATH@
-  
-  ###########################################################################
---- 29,54 ----
-  # Directory who contain X Resource Database
-  # The default value if overrided by configure if xmkmf or imake exists.
-  #
-! RESOURCEDIR=$(X11BASE)/lib/X11/app-defaults
-  @XAPPLOADDIR@
-  
-  # Directory where install binary
-  # The default value if overrided by configure if xmkmf or imake exists.
-  #
-! BINDIR=$(PREFIX)/bin
-  @BINDIR@
-  
-  # Directory who contain score
-  # Put your HOME if you have a private use of the game
-  # The default value if overrided by configure if xmkmf or imake exists.
-  #
-! SCOREDIR=$(PREFIX)/lib/xbl
-  @SCOREDIR@
-  
-  # Directory where put man pages.
-  # The default value if overrided by configure if xmkmf or imake exists.
-  #
-! MANPATH=$(PREFIX)/man
-  @MANPATH@
-  
-  ###########################################################################
-***************
-*** 82,88 ****
-  
-  # For linking (configure script will modify this line)
-  # xmkmf et imake informations are take into account.
-! LIBS = @LIBS@ -lm
-  
-  all:demo
-  
---- 82,88 ----
-  
-  # For linking (configure script will modify this line)
-  # xmkmf et imake informations are take into account.
-! LIBS = @LIBS@ -lm -lcompat
-  
-  all:demo
-  
-***************
-*** 127,146 ****
-  	@-if [ "" != "$(USE_SETGID)" ] ; then \
-  		echo "You use GID=$(GROUP_GID) protection" ; \
-  		fi
-! 	@echo "Type <Return> to continue installation"
-! 	@echo "Type NO       to stop installation"
-! 	@read LINE && test "" = "$$LINE"
-  	#
-  	# Remove old score file
-  	#
-  	@-if [ -d "$(SCOREDIR)" ] ; \
-  		then \
-! 		echo "The scoring method and speeds of Xbl had change" ; \
-! 		echo "If your version is older than 0.2e, destroy score." ; \
-! 		echo "Type <Return> to destroy old score files" ; \
-! 		echo "Type NO       to hold old score files" ; \
-! 		read LINE && test "" = "$$LINE" && rm $(SCOREDIR)/[1-9]* ; \
-! 		exit 0 ; \
-  		fi
-  	#
-  	# Install executable
---- 127,141 ----
-  	@-if [ "" != "$(USE_SETGID)" ] ; then \
-  		echo "You use GID=$(GROUP_GID) protection" ; \
-  		fi
-! #	@echo "Type <Return> to continue installation"
-! #	@echo "Type NO       to stop installation"
-! #	@read LINE && test "" = "$$LINE"
-  	#
-  	# Remove old score file
-  	#
-  	@-if [ -d "$(SCOREDIR)" ] ; \
-  		then \
-! 		rm $(SCOREDIR)/[1-9]* ; \
-  		fi
-  	#
-  	# Install executable
+--- Makefile.in.orig	Mon Aug 31 22:41:27 1998
++++ Makefile.in	Thu Sep 17 09:05:39 1998
+@@ -14,7 +14,7 @@
+ USE_SETGID=-DUSE_SETGID
+ 
+ # group owner of games file
+-GROUP_GID=2
++GROUP_GID=13
+ 
+ ###########################################################################
+ # You don't need to read below if you have xmkmf or imake
+@@ -29,26 +29,26 @@
+ # Directory who contain X Resource Database
+ # The default value if overrided by configure if xmkmf or imake exists.
+ #
+-RESOURCEDIR=/usr/lib/X11/app-defaults
++RESOURCEDIR=$(X11BASE)/lib/X11/app-defaults
+ @XAPPLOADDIR@
+ 
+ # Directory where install binary
+ # The default value if overrided by configure if xmkmf or imake exists.
+ #
+-BINDIR=/usr/local/bin
++BINDIR=$(PREFIX)/bin
+ @BINDIR@
+ 
+ # Directory who contain score
+ # Put your HOME if you have a private use of the game
+ # The default value if overrided by configure if xmkmf or imake exists.
+ #
+-SCOREDIR=/usr/local/lib/xbl
++SCOREDIR=$(PREFIX)/lib/xbl
+ @SCOREDIR@
+ 
+ # Directory where put man pages.
+ # The default value if overrided by configure if xmkmf or imake exists.
+ #
+-MANPATH=/usr/local/man
++MANPATH=$(PREFIX)/man
+ @MANPATH@
+ 
+ ###########################################################################
+@@ -82,7 +82,7 @@
+ 
+ # For linking (configure script will modify this line)
+ # xmkmf et imake informations are take into account.
+-LIBS = @LIBS@ -lm
++LIBS = @LIBS@ -lm -lcompat
+ 
+ all:demo
+ 
+@@ -93,7 +93,7 @@
+ 	 -DRESOURCEDIR=\"$(RESOURCEDIR)\" \
+ 	 -DXBLVERSION=\"$(XBLVERSION)\" \
+ 	 -DGROUP_GID=$(GROUP_GID) \
+-	  $(USE_SETGID) @DEFS@ -g
++	  $(USE_SETGID) @DEFS@
+ # For link edit options
+ LDOPTIONS=$(CFLAGS)
+ LDOPTIONS=@LDOPTIONS@
+@@ -127,25 +127,20 @@
+ 	@-if [ "" != "$(USE_SETGID)" ] ; then \
+ 		echo "You use GID=$(GROUP_GID) protection" ; \
+ 		fi
+-	@echo "Type <Return> to continue installation"
+-	@echo "Type NO       to stop installation"
+-	@read LINE && test "" = "$$LINE"
++#	@echo "Type <Return> to continue installation"
++#	@echo "Type NO       to stop installation"
++#	@read LINE && test "" = "$$LINE"
+ 	#
+ 	# Remove old score file
+ 	#
+ 	@-if [ -d "$(SCOREDIR)" ] ; \
+ 		then \
+-		echo "The scoring method and speeds of Xbl had change" ; \
+-		echo "If your version is older than 0.2e, destroy score." ; \
+-		echo "Type <Return> to destroy old score files" ; \
+-		echo "Type NO       to hold old score files" ; \
+-		read LINE && test "" = "$$LINE" && rm $(SCOREDIR)/[1-9]* ; \
+-		exit 0 ; \
++		rm $(SCOREDIR)/[1-9]* ; \
+ 		fi
+ 	#
+ 	# Install executable
+ 	#
+-	$(CP) bl $(BINDIR)/xbl	
++	$(BSD_INSTALL_PROGRAM) bl $(BINDIR)/xbl	
+ 	-if [ "" = "$(USE_SETGID)" ] ; then \
+ 	     chmod 755  $(BINDIR)/xbl ;\
+ 	   else \
diff --git a/games/xbl/pkg-descr b/games/xbl/pkg-descr
index c58f7eb7d7ad..f588e3b18601 100644
--- a/games/xbl/pkg-descr
+++ b/games/xbl/pkg-descr
@@ -1,31 +1,22 @@
-=============================================================================
                                  XBL 1.0                                  
-=============================================================================
 
 XBL is a 3D block-dropping game.
-
 XBL is an interactive game under X11 (color or black&white) and UN*X.
-
 XBL is a good training tool to understand 3D rotations and 3D vision.
     You need reflex and memory (human).
-
 XBL implements 6 different ways to perform animation under X11!
-    (more or less good)
  
 - The game world is a 3D discrete space.
 - The player has a top view of this discrete space.
 - The game throws blocks made of cubes (one to five cubes).
 - A block falls inside the discrete space, and stops when hitting the 
-floor or another block.
+  floor or another block.
 - If a discrete space level is full, it is destroyed.
 - Another block appears (only one moving block at a time).
-- Player can move or rotate blocks (perfect real time if you have a fast
-host).
+- Player can move or rotate blocks (perfect real time if you have a fast host).
 The goal is to play as long as possible.
 
 XBL home is : "ftp://ftp710.univ-lyon1.fr/pub/xbl"
 XBL URL  is : "http://www710.univ-lyon1.fr/ftp/xbl/xbl.html"
 
-Good luck!
-
 Thierry.EXCOFFIER@ligia.univ-lyon1.fr