Update to version 7.3.3.

PR:		19702
Submitted by:	maintainer

4 files changed, 46 insertions, 25 deletions

diff --git a/games/xconq/files/patch-ad b/games/xconq/files/patch-ad
index 424411f..53098bb 100644
--- a/games/xconq/files/patch-ad
+++ b/games/xconq/files/patch-ad
@@ -1,8 +1,8 @@
---- Makefile.in.orig	Sat Feb 21 16:26:25 1998
-+++ Makefile.in	Sun Apr 30 18:36:42 2000
-@@ -25,12 +25,12 @@
- 
- srcdir = .
+--- Makefile.in.orig	Tue Jun 13 08:04:45 2000
++++ Makefile.in	Wed Jun 28 21:37:36 2000
+@@ -27,12 +27,12 @@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
  
 -GAMEUID = games
 -GAMEGRP = bin
@@ -18,12 +18,24 @@
  
  SHELL = /bin/sh
  
-@@ -44,7 +44,7 @@
+@@ -46,8 +46,6 @@
  
- CC = cc
+ CC = @CC@
  
 -CFLAGS = -g
-+CFLAGS ?= -O
- 
+-
  RANLIB = ranlib
  
+ AR = ar
+@@ -274,10 +272,8 @@
+ install-dirs:
+ 	@for i in $(MAKEDIRS) ; do \
+ 		echo Making $$i... ; \
+-		parent=`echo $$i | sed -e 's@/[^/]*$$@@' | sed -e 's@^$$@/@'`; \
+-		if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi ; \
+ 		if [ ! -d $$i ] ; then \
+-			if mkdir $$i ; then \
++			if mkdir -p $$i ; then \
+ 				true ; \
+ 			else \
+ 				exit 1 ; \
diff --git a/games/xconq/files/patch-ai b/games/xconq/files/patch-ai
index 01ffb30..2005b1e 100644
--- a/games/xconq/files/patch-ai
+++ b/games/xconq/files/patch-ai
@@ -1,6 +1,6 @@
---- x11/Makefile.in.orig	Sun Apr 30 19:49:50 2000
-+++ x11/Makefile.in	Sun Apr 30 19:50:36 2000
-@@ -25,10 +25,10 @@
+--- x11/Makefile.in.orig	Mon Jun 19 10:36:18 2000
++++ x11/Makefile.in	Thu Jun 29 04:44:07 2000
+@@ -24,10 +24,10 @@
  
  krnsrcdir = $(srcdir)/../kernel
  
@@ -14,3 +14,12 @@
  DIRPERM  = 0755
  FILEPERM = 0644
  
+@@ -215,7 +215,7 @@
+ 	$(CC) -o imf2x $(ALL_CFLAGS) $(LDFLAGS) imf2x.o $(XUTOBJS) $(LOW_LIB) $(X11_LIB_FLAGS) $(WITH_LIBS) $(XAW_LIB) $(NET_EXTRA_LIBS)
+ 
+ ximfapp:	ximfapp.o xcutil.o $(TKIAPP_LIB) $(TKIMF_LIB) $(LOW_LIB)
+-	$(CC) -o ximfapp $(ALL_CFLAGS) $(LDFLAGS) ximfapp.o xcutil.o $(TKIAPP_LIB) $(TKIMF_LIB) $(LOW_LIB) $(X11_LIB_FLAGS) $(WITH_LIBS) $(TCLTK_LIB) $(X11_LIB) $(NET_EXTRA_LIBS)
++	$(CC) -o ximfapp $(ALL_CFLAGS) $(LDFLAGS) ximfapp.o xcutil.o $(TKIAPP_LIB) $(TKIMF_LIB) $(LOW_LIB) $(X11_LIB_FLAGS) $(WITH_LIBS) $(TCLTK_LIB) $(X11_LIB) $(NET_EXTRA_LIBS) -lm
+ 
+ xshowimf:	xshowimf.o $(XUTOBJS) $(LOW_LIB)
+ 	$(CC) -o xshowimf $(ALL_CFLAGS) $(LDFLAGS) xshowimf.o $(XUTOBJS) $(LOW_LIB) $(X11_LIB_FLAGS) $(WITH_LIBS) $(SELFILE_LIB) $(XAW_LIB) $(NET_EXTRA_LIBS)
diff --git a/games/xconq/files/patch-aj b/games/xconq/files/patch-aj
index 070398a..4b536b5 100644
--- a/games/xconq/files/patch-aj
+++ b/games/xconq/files/patch-aj
@@ -1,13 +1,13 @@
---- x11/xconq.c.orig	Sun Apr 30 20:34:14 2000
-+++ x11/xconq.c	Sun Apr 30 20:34:50 2000
-@@ -119,8 +119,8 @@
-     extern uid_t games_uid;
- 
+--- x11/xconq.c.orig	Mon Apr 24 07:56:58 2000
++++ x11/xconq.c	Wed Jun 28 21:45:49 2000
+@@ -46,8 +46,8 @@
+     if (argc == -1)
+       cmd_error(NULL, NULL);
      /* Shift to being the user that started the game. */
 -    games_uid = geteuid();
 -    setuid(getuid());
 +    games_uid = getegid();
 +    setgid(getgid());
      init_library_path(NULL);
-     printf("\n              Welcome to X11 Xconq version %s\n\n",
- 	   version_string());
+     /* Fiddle with game module structures. */
+     clear_game_modules();
diff --git a/games/xconq/files/patch-ak b/games/xconq/files/patch-ak
index a234982..24ae1b5 100644
--- a/games/xconq/files/patch-ak
+++ b/games/xconq/files/patch-ak
@@ -1,15 +1,15 @@
---- kernel/unix.c.orig	Mon May 18 19:35:03 1998
-+++ kernel/unix.c	Sun Apr 30 20:35:33 2000
-@@ -240,7 +240,7 @@
+--- kernel/unix.c.orig	Fri Jun  9 09:52:41 2000
++++ kernel/unix.c	Wed Jun 28 21:49:40 2000
+@@ -267,7 +267,7 @@
      /* The scorefile is only writable by the owner of the Xconq
         executable, but we normally run as the user, so switch over
         before writing. */
 -    setuid(games_uid);
 +    setgid(games_uid);
-     fp = fopen(score_file_pathname(name), "a");
+     fp = open_file(score_file_pathname(name), "a");
      return fp;
  }
-@@ -251,7 +251,7 @@
+@@ -277,7 +277,7 @@
  {
      fclose(fp);
      /* Reset the uid back to the user who started the game. */
@@ -17,4 +17,4 @@
 +    setgid(getgid());
  }
  
- static char *scorenamebuf;
+ /* Given the name of a scorefile, return a complete path to it,