8 files changed, 205 insertions, 107 deletions

diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index e694d3b75d67..50482a287fc9 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -1,15 +1,19 @@
 # New ports collection makefile for:	xboing
-# Version required:	2.2
-# Date created:		31 Januar 1995
+# Version required:	2.3
+# Date created:		31 January 1995
 # Whom:			janek
 #
+# $Id$
 
-DISTNAME=	xboing2.2
-PKGNAME=	xboing-2.2
-EXTRACT_SUFX=	.tar.Z
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/games/
+DISTNAME=	xboing2.3
+PKGNAME=	xboing-2.3
 CATEGORIES+=	games
+MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/games/
+EXTRACT_SUFX=	.tar.gz
+
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
+USE_IMAKE=	yes
+WRKSRC= ${WRKDIR}/xboing
+
 .include <bsd.port.mk>
diff --git a/games/xboing/distinfo b/games/xboing/distinfo
index 5fcccb2b2e01..29353f5ee66e 100644
--- a/games/xboing/distinfo
+++ b/games/xboing/distinfo
@@ -1 +1 @@
-MD5 (xboing2.2.tar.Z) = f59e756963391734ae99de90765697a1
+MD5 (xboing2.3.tar.gz) = c73134a6121fdd7bc8e730114afc2ad8
diff --git a/games/xboing/files/patch-aa b/games/xboing/files/patch-aa
index 44cbd8c75fa4..af49d035e1ae 100644
--- a/games/xboing/files/patch-aa
+++ b/games/xboing/files/patch-aa
@@ -1,42 +1,45 @@
-diff -rc ../xboing2.2.orig/include/misc.h ./include/misc.h
-*** ../xboing2.2.orig/include/misc.h	Wed May 25 01:32:15 1994
---- ./include/misc.h	Wed Feb  1 00:37:19 1995
+diff -rc /usr/ports/games/xboing/xboing/include/misc.h ./include/misc.h
+*** /usr/ports/games/xboing/xboing/include/misc.h	Wed Jan  4 17:14:48 1995
+--- ./include/misc.h	Mon Apr  3 22:26:22 1995
 ***************
-*** 68,81 ****
-  int ObtainWindowWidthHeight(Display *display, Window window,
-  	int *width, int *height);
-  void sleepSync(Display *display, unsigned long ms);
-! int usleep(unsigned long usec);
-  int ObtainMousePosition(Display *display, Window window, int *x, int *y);
-  int YesNoDialogue(Display *display, char *message);
-  #else
-  int YesNoDialogue();
-  int ObtainMousePosition();
-  void sleepSync();
-! int usleep();
-  int ObtainWindowWidthHeight();
-  int ResizeMainWindow();
-  char *GetHomeDir();
---- 68,81 ----
-  int ObtainWindowWidthHeight(Display *display, Window window,
-  	int *width, int *height);
-  void sleepSync(Display *display, unsigned long ms);
-! int Usleep(unsigned long usec);
-  int ObtainMousePosition(Display *display, Window window, int *x, int *y);
-  int YesNoDialogue(Display *display, char *message);
-  #else
-  int YesNoDialogue();
-  int ObtainMousePosition();
-  void sleepSync();
-! int Usleep();
-  int ObtainWindowWidthHeight();
-  int ResizeMainWindow();
-  char *GetHomeDir();
-diff -rc ../xboing2.2.orig/misc.c ./misc.c
-*** ../xboing2.2.orig/misc.c	Mon May 30 05:59:39 1994
---- ./misc.c	Wed Feb  1 00:37:54 1995
+*** 87,93 ****
+  int 	ObtainWindowWidthHeight(Display *display, Window window,
+  			int *width, int *height);
+  void 	sleepSync(Display *display, unsigned long ms);
+! int 	usleep(unsigned long usec);
+  int 	ObtainMousePosition(Display *display, Window window, int *x, int *y);
+  int 	YesNoDialogue(Display *display, char *message);
+  Pixmap 	ScalePixmap(Display *display, Window window, Pixmap source,
+--- 87,93 ----
+  int 	ObtainWindowWidthHeight(Display *display, Window window,
+  			int *width, int *height);
+  void 	sleepSync(Display *display, unsigned long ms);
+! int 	Usleep(unsigned long usec);
+  int 	ObtainMousePosition(Display *display, Window window, int *x, int *y);
+  int 	YesNoDialogue(Display *display, char *message);
+  Pixmap 	ScalePixmap(Display *display, Window window, Pixmap source,
+***************
+*** 100,106 ****
+  int 	YesNoDialogue();
+  int 	ObtainMousePosition();
+  void 	sleepSync();
+! int 	usleep();
+  int 	ObtainWindowWidthHeight();
+  int 	ResizeMainWindow();
+  char 	*GetHomeDir();
+--- 100,106 ----
+  int 	YesNoDialogue();
+  int 	ObtainMousePosition();
+  void 	sleepSync();
+! int 	Usleep();
+  int 	ObtainWindowWidthHeight();
+  int 	ResizeMainWindow();
+  char 	*GetHomeDir();
+diff -rc /usr/ports/games/xboing/xboing/misc.c ./misc.c
+*** /usr/ports/games/xboing/xboing/misc.c	Wed Jan  4 17:13:33 1995
+--- ./misc.c	Mon Apr  3 22:13:07 1995
 ***************
-*** 65,73 ****
+*** 79,87 ****
    */
   
   #if NeedFunctionPrototypes
@@ -46,7 +49,7 @@ diff -rc ../xboing2.2.orig/misc.c ./misc.c
           unsigned long usec;
   #endif
   {
---- 65,73 ----
+--- 79,87 ----
    */
   
   #if NeedFunctionPrototypes
@@ -57,7 +60,7 @@ diff -rc ../xboing2.2.orig/misc.c ./misc.c
   #endif
   {
 ***************
-*** 108,114 ****
+*** 122,128 ****
                  ((et.tv_usec - st.tv_usec) / 1000) );
   
       if ((ms) > ((1000 / 60) + SyncTime))
@@ -65,7 +68,7 @@ diff -rc ../xboing2.2.orig/misc.c ./misc.c
   }
   
   #if NeedFunctionPrototypes
---- 108,114 ----
+--- 122,128 ----
                  ((et.tv_usec - st.tv_usec) / 1000) );
   
       if ((ms) > ((1000 / 60) + SyncTime))
diff --git a/games/xboing/files/patch-ac b/games/xboing/files/patch-ac
index ff902749ed0c..194960707fc6 100644
--- a/games/xboing/files/patch-ac
+++ b/games/xboing/files/patch-ac
@@ -10,13 +10,13 @@
   XCOMM These are some defines that must be set. Some may be overwritten in the
   XCOMM machine arch section.
   
-!     XPMLIB 				= -L../xpm3.4/lib -lXpm
-!     XPMINCLUDE 			= -I../xpm3.4/lib
+!     XPMLIB 				= -L../xpm-3.4c/lib -lXpm
+!     XPMINCLUDE 			= -I../xpm-3.4c/lib
       XBOINGINCLUDE 		= -I./include
       LEVEL_INSTALL_DIR 	= $(XBOING_DIR)/levels
       SOUNDS_DIR 			= $(XBOING_DIR)/sounds
       BACKUP_DIR 			= $(XBOING_DIR)/../backups
-      HIGH_SCORE_FILE 	= $(XBOING_DIR)/xboing.scr
+      HIGH_SCORE_FILE 	= $(XBOING_DIR)/.xboing.scr
 !     AUDIO_AVAILABLE 	= False
 !     AUDIO_SRC 			= audio/NOaudio.c
       AUDIO_INCLUDE 		=
@@ -37,7 +37,7 @@
       LEVEL_INSTALL_DIR 	= $(XBOING_DIR)/levels
       SOUNDS_DIR 			= $(XBOING_DIR)/sounds
       BACKUP_DIR 			= $(XBOING_DIR)/../backups
-      HIGH_SCORE_FILE 	= $(XBOING_DIR)/xboing.scr
+      HIGH_SCORE_FILE 	= $(XBOING_DIR)/.xboing.scr
 !     AUDIO_AVAILABLE 	= True
 !     AUDIO_SRC 			= audio/LINUXaudio.c
       AUDIO_INCLUDE 		=
diff --git a/games/xboing/files/patch-ad b/games/xboing/files/patch-ad
index 4f4f9050cdb3..7b5d3a776810 100644
--- a/games/xboing/files/patch-ad
+++ b/games/xboing/files/patch-ad
@@ -1,17 +1,17 @@
-*** highscore.c.orig	Wed May 25 02:53:44 1994
---- highscore.c	Sat Apr  1 23:34:07 1995
+*** highscore.c.orig	Wed Jan  4 17:13:31 1995
+--- highscore.c	Fri Apr  7 00:13:54 1995
 ***************
-*** 40,45 ****
---- 40,46 ----
+*** 54,59 ****
+--- 54,60 ----
+  #include <unistd.h>
+  #include <time.h>
   #include <sys/param.h>
-  #include <sys/file.h>
-  #include <sys/types.h>
 + #include <sys/stat.h>
   #include <netinet/in.h>
   #include <X11/Xlib.h>
   #include <X11/Xutil.h>
 ***************
-*** 104,110 ****
+*** 118,124 ****
   static void InitialiseHighScores(void);
   static void SortHighScores(void);
   static void DeleteScore(int i);
@@ -19,7 +19,7 @@
   #else
   static int LockUnlock();
   static void DeleteScore();
---- 105,111 ----
+--- 119,125 ----
   static void InitialiseHighScores(void);
   static void SortHighScores(void);
   static void DeleteScore(int i);
@@ -28,7 +28,7 @@
   static int LockUnlock();
   static void DeleteScore();
 ***************
-*** 825,831 ****
+*** 839,845 ****
   
   	/* Lock the file for me only */
   	if (type == GLOBAL)
@@ -36,7 +36,7 @@
   
   	/* Read in the lastest scores */
   	if (ReadHighScoreTable(type) == False)
---- 826,832 ----
+--- 840,846 ----
   
   	/* Lock the file for me only */
   	if (type == GLOBAL)
@@ -45,7 +45,7 @@
   	/* Read in the lastest scores */
   	if (ReadHighScoreTable(type) == False)
 ***************
-*** 855,861 ****
+*** 869,875 ****
   				else
   				{
   					/* Don't add as score is smaller */
@@ -53,7 +53,7 @@
   				}
   			}
   		}	/* for */
---- 856,862 ----
+--- 870,876 ----
   				else
   				{
   					/* Don't add as score is smaller */
@@ -62,7 +62,7 @@
   			}
   		}	/* for */
 ***************
-*** 877,892 ****
+*** 891,906 ****
   
   				/* Unlock the file now thanks */
   				if (id != -1) 
@@ -79,7 +79,7 @@
   
   		/* Not even a highscore - loser! */
   		return False;
---- 878,894 ----
+--- 892,908 ----
   
   				/* Unlock the file now thanks */
   				if (id != -1) 
@@ -98,7 +98,7 @@
   		/* Not even a highscore - loser! */
   		return False;
 ***************
-*** 1164,1173 ****
+*** 1178,1187 ****
   }
   
   #if NeedFunctionPrototypes
@@ -108,8 +108,8 @@
 ! 	int cmd;
   #endif
   {
-  	int 	inter = -1;
---- 1166,1175 ----
+  	static int 	inter = -1;
+--- 1180,1189 ----
   }
   
   #if NeedFunctionPrototypes
@@ -119,16 +119,16 @@
 ! 	int cmd, fd;
   #endif
   {
-  	int 	inter = -1;
+  	static int 	inter = -1;
 ***************
-*** 1204,1209 ****
---- 1206,1214 ----
+*** 1218,1223 ****
+--- 1220,1228 ----
   	/* Open the highscore file for both read & write */
   	if (cmd == LOCK_FILE)
-  		inter = open(filename, O_CREAT | O_RDWR);
+  		inter = open(filename, O_CREAT | O_RDWR, 0666);
 + 	else
 + 		/* use old fd to unlock */
 + 		inter = fd;
   
-  
   #ifndef NO_LOCKING
+  
diff --git a/games/xboing/pkg-comment b/games/xboing/pkg-comment
index 9753b7e42ac3..5549df9217b4 100644
--- a/games/xboing/pkg-comment
+++ b/games/xboing/pkg-comment
@@ -1 +1 @@
-xboing - X windows arcade game.  Version 2.2
+xboing - X windows arcade game.  Version 2.3
diff --git a/games/xboing/pkg-descr b/games/xboing/pkg-descr
index 24433a83d5af..df560164a995 100644
--- a/games/xboing/pkg-descr
+++ b/games/xboing/pkg-descr
@@ -1,30 +1,6 @@
-                    _  __ ____        _                ________
-                   | |/ // __ )____  (_)___  ____ _   /  _/  _/
-                   |   // __  / __ \/ / __ \/ __ `/   / / / /  
-                  /   |/ /_/ / /_/ / / / / / /_/ /  _/ /_/ /   
-                 /_/|_/_____/\____/_/_/ /_/\__, /  /___/___/   
-                                          /____/               
-
-                          Version 2.2 - 2nd June 1994
-
-
-Description
------------
-
-XBoing is a blockout type game where you have a paddle which you use to
-bounce a ball around the game area blowing up blocks with the ball. You win by
-obtaining points for each block destroyed and each level completed. The person
-with the highest score wins.
-
-XBoing was started like many other projects to learn Xlib better. I had the 
-XPM library and was already using it in a Motif application. I thought that it
-would be cool to have nice colour pictures/animations in an Xlib game. So I 
-did. Without the XPM library I would be still playing with the colours I think.
-
-Please read the manual page as the manual has some important game play 
-information. 
-
-WARNING: This game requires a lot of grunt to run well. If someone is doing
-         a compile or the load is large then expect the game to be a bit
-         bumpy and hard to play. Sorry about that. ;-|
+XBoing is a blockout type game where you have a paddle which you use
+to bounce a ball around the game area blowing up blocks with the ball. 
+You win by obtaining points for each block destroyed and each level
+completed. The person with the highest score wins.
 
+This is version 2.3.
diff --git a/games/xboing/pkg-plist b/games/xboing/pkg-plist
index e9cad2bd5b20..b6efdf2c653a 100644
--- a/games/xboing/pkg-plist
+++ b/games/xboing/pkg-plist
@@ -3,9 +3,124 @@
 @mode 555
 bin/xboing
 @mode 666
-lib/X11/xboing/xboing.scr
+lib/X11/xboing/.xboing.scr
 @mode 444
+lib/X11/xboing/levels/demo.data
+lib/X11/xboing/levels/editor.data
+lib/X11/xboing/levels/level01.data
+lib/X11/xboing/levels/level02.data
+lib/X11/xboing/levels/level03.data
+lib/X11/xboing/levels/level04.data
+lib/X11/xboing/levels/level05.data
+lib/X11/xboing/levels/level06.data
+lib/X11/xboing/levels/level07.data
+lib/X11/xboing/levels/level08.data
+lib/X11/xboing/levels/level09.data
+lib/X11/xboing/levels/level10.data
+lib/X11/xboing/levels/level11.data
+lib/X11/xboing/levels/level12.data
+lib/X11/xboing/levels/level13.data
+lib/X11/xboing/levels/level14.data
+lib/X11/xboing/levels/level15.data
+lib/X11/xboing/levels/level16.data
+lib/X11/xboing/levels/level17.data
+lib/X11/xboing/levels/level18.data
+lib/X11/xboing/levels/level19.data
+lib/X11/xboing/levels/level20.data
+lib/X11/xboing/levels/level21.data
+lib/X11/xboing/levels/level22.data
+lib/X11/xboing/levels/level23.data
+lib/X11/xboing/levels/level24.data
+lib/X11/xboing/levels/level25.data
+lib/X11/xboing/levels/level26.data
+lib/X11/xboing/levels/level27.data
+lib/X11/xboing/levels/level28.data
+lib/X11/xboing/levels/level29.data
+lib/X11/xboing/levels/level30.data
+lib/X11/xboing/levels/level31.data
+lib/X11/xboing/levels/level32.data
+lib/X11/xboing/levels/level33.data
+lib/X11/xboing/levels/level34.data
+lib/X11/xboing/levels/level35.data
+lib/X11/xboing/levels/level36.data
+lib/X11/xboing/levels/level37.data
+lib/X11/xboing/levels/level38.data
+lib/X11/xboing/levels/level39.data
+lib/X11/xboing/levels/level40.data
+lib/X11/xboing/levels/level41.data
+lib/X11/xboing/levels/level42.data
+lib/X11/xboing/levels/level43.data
+lib/X11/xboing/levels/level44.data
+lib/X11/xboing/levels/level45.data
+lib/X11/xboing/levels/level46.data
+lib/X11/xboing/levels/level47.data
+lib/X11/xboing/levels/level48.data
+lib/X11/xboing/levels/level49.data
+lib/X11/xboing/levels/level50.data
+lib/X11/xboing/levels/level51.data
+lib/X11/xboing/levels/level52.data
+lib/X11/xboing/levels/level53.data
+lib/X11/xboing/levels/level54.data
+lib/X11/xboing/levels/level55.data
+lib/X11/xboing/levels/level56.data
+lib/X11/xboing/levels/level57.data
+lib/X11/xboing/levels/level58.data
+lib/X11/xboing/levels/level59.data
+lib/X11/xboing/levels/level60.data
+lib/X11/xboing/levels/level61.data
+lib/X11/xboing/levels/level62.data
+lib/X11/xboing/levels/level63.data
+lib/X11/xboing/levels/level64.data
+lib/X11/xboing/levels/level65.data
+lib/X11/xboing/levels/new.data
+lib/X11/xboing/sounds/Doh1.au
+lib/X11/xboing/sounds/Doh2.au
+lib/X11/xboing/sounds/Doh3.au
+lib/X11/xboing/sounds/Doh4.au
+lib/X11/xboing/sounds/ammo.au
+lib/X11/xboing/sounds/applause.au
+lib/X11/xboing/sounds/ball2ball.au
+lib/X11/xboing/sounds/balllost.au
+lib/X11/xboing/sounds/ballshot.au
+lib/X11/xboing/sounds/boing.au
+lib/X11/xboing/sounds/bomb.au
+lib/X11/xboing/sounds/bonus.au
+lib/X11/xboing/sounds/buzzer.au
+lib/X11/xboing/sounds/click.au
+lib/X11/xboing/sounds/ddloo.au
+lib/X11/xboing/sounds/evillaugh.au
+lib/X11/xboing/sounds/game_over.au
+lib/X11/xboing/sounds/gate.au
+lib/X11/xboing/sounds/hithere.au
+lib/X11/xboing/sounds/hypspc.au
+lib/X11/xboing/sounds/intro.au
+lib/X11/xboing/sounds/key.au
+lib/X11/xboing/sounds/looksbad.au
+lib/X11/xboing/sounds/metal.au
+lib/X11/xboing/sounds/mgun.au
+lib/X11/xboing/sounds/ouch.au
+lib/X11/xboing/sounds/paddle.au
+lib/X11/xboing/sounds/ping.au
+lib/X11/xboing/sounds/shark.au
+lib/X11/xboing/sounds/shoot.au
+lib/X11/xboing/sounds/shotgun.au
+lib/X11/xboing/sounds/spring.au
+lib/X11/xboing/sounds/stamp.au
+lib/X11/xboing/sounds/sticky.au
+lib/X11/xboing/sounds/supbons.au
+lib/X11/xboing/sounds/toggle.au
+lib/X11/xboing/sounds/tone.au
+lib/X11/xboing/sounds/touch.au
+lib/X11/xboing/sounds/wallsoff.au
+lib/X11/xboing/sounds/warp.au
+lib/X11/xboing/sounds/weeek.au
+lib/X11/xboing/sounds/whizzo.au
+lib/X11/xboing/sounds/whoosh.au
+lib/X11/xboing/sounds/wzzz.au
+lib/X11/xboing/sounds/wzzz2.au
+lib/X11/xboing/sounds/youagod.au
 lib/X11/xboing/problems.doc
-lib/X11/xboing/levels
-lib/X11/xboing/sounds
 man/man1/xboing.1.gz
+@exec chmod 755 %D/lib/X11/xboing
+@exec chmod 755 %D/lib/X11/xboing/sounds
+@exec chmod 755 %D/lib/X11/xboing/levels