Update 4.2.1 -> 4.3.1:

Several server-side enhancements, including features from Deathcup 2000.

Lots of client "fixes", not so much for bugs as for game rules.

PR:		ports/26604
Submitted by:	Goran Runfeldt <goranrunfeldt@home.se>

4 files changed, 109 insertions, 68 deletions

diff --git a/games/xpilot/Makefile b/games/xpilot/Makefile
index 4f39b7265c76..631010f8a151 100644
--- a/games/xpilot/Makefile
+++ b/games/xpilot/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	xpilot
-PORTVERSION=	4.2.1
+PORTVERSION=	4.3.1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.xpilot.org/pub/xpilot/ \
+		ftp://ftp.xpilot.org/pub/xpilot/old/ \
 		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/multiplayer
 
diff --git a/games/xpilot/distinfo b/games/xpilot/distinfo
index 12266d0ffb2a..eb7a1879a516 100644
--- a/games/xpilot/distinfo
+++ b/games/xpilot/distinfo
@@ -1 +1 @@
-MD5 (xpilot-4.2.1.tar.gz) = 83ec28cbee660251b8ff4eb5eb2628f7
+MD5 (xpilot-4.3.1.tar.gz) = c1f533900c24df3aa6832736b4c41431
diff --git a/games/xpilot/files/patch-a b/games/xpilot/files/patch-a
index 5e8904b37340..c5911e88aa73 100644
--- a/games/xpilot/files/patch-a
+++ b/games/xpilot/files/patch-a
@@ -1,36 +1,26 @@
-*** Local.config.orig	Tue Dec 17 04:30:18 1996
---- Local.config	Wed Feb 12 08:32:57 1997
-***************
-*** 25,31 ****
-  #define	LocalGuru xpilot@xpilot.org	/* The one to contact for problems */
-  #endif /* LocalGuru */
-  
-! PREFIX = /usr/local/games
-  
-  /* Manual pages for games usually go to section 6. */
-  MANSUFFIX = 6
---- 25,31 ----
-  #define	LocalGuru xpilot@xpilot.org	/* The one to contact for problems */
-  #endif /* LocalGuru */
-  
-! PREFIX = /usr/X11R6
-  
-  /* Manual pages for games usually go to section 6. */
-  MANSUFFIX = 6
-***************
-*** 91,97 ****
-   * CDEBUGFLAGS should specify optimalization or debug information (or both).
-   * Try not defining anything first.
-   */
-! CDEBUGFLAGS = -g				/* General debug flag */
-  /* CDEBUGFLAGS = -O				/* General optimize flag */
-  /* CDEBUGFLAGS = -Ae +O3 +FPD			/* HP cc optimize flags (no +ESlit) */
-  /* CDEBUGFLAGS = -Ae -g -z +w1			/* HP cc debug flags */
---- 91,97 ----
-   * CDEBUGFLAGS should specify optimalization or debug information (or both).
-   * Try not defining anything first.
-   */
-! /* CDEBUGFLAGS = -g				/* General debug flag */
-  /* CDEBUGFLAGS = -O				/* General optimize flag */
-  /* CDEBUGFLAGS = -Ae +O3 +FPD			/* HP cc optimize flags (no +ESlit) */
-  /* CDEBUGFLAGS = -Ae -g -z +w1			/* HP cc debug flags */
+--- Local.config.orig	Sun Apr  1 14:57:24 2001
++++ Local.config	Sun Apr  8 17:44:02 2001
+@@ -36,12 +36,12 @@
+ #define	LocalGuru xpilot@xpilot.org	/* The one to contact for problems */
+ #endif /* LocalGuru */
+ 
+-PREFIX = /usr/local/games
++PREFIX = /usr/X11R6
+ 
+ /* Manual pages for games usually go to section 6. */
+ MANSUFFIX = 6
+ INSTMANDIR = $(PREFIX)/man/man$(MANSUFFIX)
+-INSTLIBDIR = $(PREFIX)/lib/xpilot
++INSTLIBDIR = $(PREFIX)/share/xpilot
+ INSTBINDIR = $(PREFIX)/bin
+ 
+ /* #define Log		/* Try to log every server start to log file */
+@@ -107,7 +107,7 @@
+  * Try not defining anything first.  You probably want -O for speed.
+  */
+ /* CDEBUGFLAGS = -g				/* General debug flag */
+-CDEBUGFLAGS = -O				/* General optimize flag */
++/* CDEBUGFLAGS = -O				/* General optimize flag */
+ /* CDEBUGFLAGS = -Ae +O3 +FPD			/* HP cc optimize flags (no +ESlit) */
+ /* CDEBUGFLAGS = -Ae -g -z +w1			/* HP cc debug flags */
+ /* CDEBUGFLAGS = -g2 -O2			/* SGI debug */
diff --git a/games/xpilot/pkg-plist b/games/xpilot/pkg-plist
index 97b1a4a890bc..f8ad0c4fb7b3 100644
--- a/games/xpilot/pkg-plist
+++ b/games/xpilot/pkg-plist
@@ -2,33 +2,83 @@ bin/xpilot
 bin/xpilots
 bin/xp-replay
 bin/xp-mapedit
-lib/xpilot/sounds
-lib/xpilot/defaults
-lib/xpilot/robots
-lib/xpilot/maps/CAMD.xp
-lib/xpilot/maps/blood-music2.xp
-lib/xpilot/maps/cloudscape.xp
-lib/xpilot/maps/default.xp
-lib/xpilot/maps/doggy.xp
-lib/xpilot/maps/fireball.xp
-lib/xpilot/maps/fuzz.xp
-lib/xpilot/maps/fuzz2.xp
-lib/xpilot/maps/globe.xp
-lib/xpilot/maps/grandprix.xp
-lib/xpilot/maps/newdarkhell.xp
-lib/xpilot/maps/newdarkhell2.xp
-lib/xpilot/maps/pad.xp
-lib/xpilot/maps/pit.xp
-lib/xpilot/maps/planetx.xp
-lib/xpilot/maps/teamball.xp
-lib/xpilot/maps/tourmination.xp
-lib/xpilot/maps/tournament.xp
-lib/xpilot/maps/war.xp
-lib/xpilot/textures/ball.xpm
-lib/xpilot/textures/metalite.xpm
-lib/xpilot/textures/moon.xpm
-lib/xpilot/textures/rock4.xpm
-lib/xpilot/textures/volcanic.xpm
-@dirrm lib/xpilot/maps
-@dirrm lib/xpilot/textures
-@dirrm lib/xpilot
+share/xpilot/sounds
+share/xpilot/defaults
+share/xpilot/robots
+share/xpilot/maps/CAMD.xp
+share/xpilot/maps/blood-music2.xp
+share/xpilot/maps/cloudscape.xp
+share/xpilot/maps/default.xp
+share/xpilot/maps/doggy.xp
+share/xpilot/maps/fireball.xp
+share/xpilot/maps/fuzz.xp
+share/xpilot/maps/fuzz2.xp
+share/xpilot/maps/globe.xp
+share/xpilot/maps/grandprix.xp
+share/xpilot/maps/newdarkhell.xp
+share/xpilot/maps/newdarkhell2.xp
+share/xpilot/maps/pad.xp
+share/xpilot/maps/pit.xp
+share/xpilot/maps/planetx.xp
+share/xpilot/maps/teamball.xp
+share/xpilot/maps/tourmination.xp
+share/xpilot/maps/tournament.xp
+share/xpilot/maps/war.xp
+share/xpilot/textures/ball.xpm
+share/xpilot/textures/metalite.xpm
+share/xpilot/textures/moon.xpm
+share/xpilot/textures/rock4.xpm
+share/xpilot/textures/volcanic.xpm
+share/xpilot/textures/allitems.ppm
+share/xpilot/textures/ball.ppm
+share/xpilot/textures/base_down.ppm
+share/xpilot/textures/base_left.ppm
+share/xpilot/textures/base_right.ppm
+share/xpilot/textures/base_up.ppm
+share/xpilot/textures/bullet.ppm
+share/xpilot/textures/bullet2.ppm
+share/xpilot/textures/bullet_blue.ppm
+share/xpilot/textures/bullet_green.ppm
+share/xpilot/textures/cannon_down.ppm
+share/xpilot/textures/cannon_left.ppm
+share/xpilot/textures/cannon_right.ppm
+share/xpilot/textures/cannon_up.ppm
+share/xpilot/textures/checkpoint.ppm
+share/xpilot/textures/clouds.ppm
+share/xpilot/textures/concentrator.ppm
+share/xpilot/textures/fuel2.ppm
+share/xpilot/textures/fuelcell.ppm
+share/xpilot/textures/holder1.ppm
+share/xpilot/textures/holder2.ppm
+share/xpilot/textures/logo.ppm
+share/xpilot/textures/meter.ppm
+share/xpilot/textures/mine_other.ppm
+share/xpilot/textures/mine_team.ppm
+share/xpilot/textures/minus.ppm
+share/xpilot/textures/paused.ppm
+share/xpilot/textures/plus.ppm
+share/xpilot/textures/radar.ppm
+share/xpilot/textures/radar2.ppm
+share/xpilot/textures/radar3.ppm
+share/xpilot/textures/refuel.ppm
+share/xpilot/textures/ship.ppm
+share/xpilot/textures/ship_blue.ppm
+share/xpilot/textures/ship_red.ppm
+share/xpilot/textures/ship_red2.ppm
+share/xpilot/textures/ship_red3.ppm
+share/xpilot/textures/sparks.ppm
+share/xpilot/textures/wall_bottom.ppm
+share/xpilot/textures/wall_dl.ppm
+share/xpilot/textures/wall_dr.ppm
+share/xpilot/textures/wall_fi.ppm
+share/xpilot/textures/wall_left.ppm
+share/xpilot/textures/wall_right.ppm
+share/xpilot/textures/wall_top.ppm
+share/xpilot/textures/wall_ul.ppm
+share/xpilot/textures/wall_ull.ppm
+share/xpilot/textures/wall_ur.ppm
+share/xpilot/textures/wall_url.ppm
+share/xpilot/textures/wormhole.ppm
+@dirrm share/xpilot/maps
+@dirrm share/xpilot/textures
+@dirrm share/xpilot