Upgrade, 2.2 -> 2.3!

3 files changed, 69 insertions, 66 deletions

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
+