Since I haven't even heard from swallace about why he upgraded

a port during a freeze, back out his change until AFTER 2.1.5 is out.

4 files changed, 59 insertions, 34 deletions

diff --git a/games/xpilot/Makefile b/games/xpilot/Makefile
index fcac8a7516a5..a5d2eb2e70ca 100644
--- a/games/xpilot/Makefile
+++ b/games/xpilot/Makefile
@@ -6,10 +6,12 @@
 # $Id: Makefile,v 1.2 1995/07/20 20:47:02 asami Exp $
 #
 
-DISTNAME=       xpilot-3.5.1
+DISTNAME=       xpilot-3.3.1
 CATEGORIES+=	games
 MASTER_SITES=	ftp://ftp.cs.uit.no/pub/games/xpilot/
 
 USE_IMAKE=	yes
+NO_INSTALL_MANPAGES= yes
+WRKSRC=		${WRKDIR}/xpilot-3.3.1/src
 
 .include <bsd.port.mk>
diff --git a/games/xpilot/files/patch-a b/games/xpilot/files/patch-a
index d9f51cab3a5f..3819af6e0072 100644
--- a/games/xpilot/files/patch-a
+++ b/games/xpilot/files/patch-a
@@ -1,38 +1,59 @@
-*** Local.config.orig	Mon May 13 13:02:22 1996
---- Local.config	Wed Jun 26 12:41:21 1996
+*** config.h.orig	Fri Jul 14 17:10:05 1995
+--- config.h	Fri Jul 14 16:48:51 1995
 ***************
-*** 25,31 ****
-  #define	LocalGuru xpilot@cs.uit.no	/* The one to contact for problems */
-  #endif /* LocalGuru */
+*** 46,52 ****
+  #    define LIBPREFIX		"esv1$dkb400:[user.graduate.hjorring.lib.xpilot"
+  #    define LIBDIR		LIBPREFIX "]"
+  #else
+! #    define LIBDIR		"/usr/local/games/lib/xpilot/"
+  #endif
+  #endif
   
-! PREFIX = /usr/local/games
+--- 46,52 ----
+  #    define LIBPREFIX		"esv1$dkb400:[user.graduate.hjorring.lib.xpilot"
+  #    define LIBDIR		LIBPREFIX "]"
+  #else
+! #    define LIBDIR		"/usr/X11R6/lib/xpilot/"
+  #endif
+  #endif
   
-  /* Manual pages for games usually go to section 6. */
-  MANSUFFIX = 6
---- 25,31 ----
-  #define	LocalGuru xpilot@cs.uit.no	/* The one to contact for problems */
-  #endif /* LocalGuru */
+*** Imakefile.orig	Fri Jul 14 16:59:25 1995
+--- Imakefile	Fri Jul 14 17:05:00 1995
+***************
+*** 29,37 ****
+  #
+  # This is where all installation changes are normally done:
+  #
+! PREFIX = /usr/local/games
+  INSTALLDIR = $(PREFIX)
+! BINDIR = $(PREFIX)
+  LIBDIR = $(PREFIX)/lib/xpilot
   
+  # Manual pages for games usually go to section 6.
+--- 29,37 ----
+  #
+  # This is where all installation changes are normally done:
+  #
 ! PREFIX = /usr/X11R6
+  INSTALLDIR = $(PREFIX)
+! BINDIR = $(PREFIX)/bin
+  LIBDIR = $(PREFIX)/lib/xpilot
   
-  /* Manual pages for games usually go to section 6. */
-  MANSUFFIX = 6
-*** src/config.h.orig	Sun Apr  7 10:05:02 1996
---- src/config.h	Wed Jun 26 12:36:51 1996
+  # Manual pages for games usually go to section 6.
 ***************
-*** 46,52 ****
-  #        define LIBPREFIX	"lib_disk:[lib.xgames.xpilot341.lib"
-  #        define LIBDIR		LIBPREFIX "]"
-  #    else
-! #        define LIBDIR		"/usr/local/games/lib/xpilot/"
-  #    endif
-  #endif
+*** 147,153 ****
   
---- 46,52 ----
-  #        define LIBPREFIX	"lib_disk:[lib.xgames.xpilot341.lib"
-  #        define LIBDIR		LIBPREFIX "]"
-  #    else
-! #        define LIBDIR		"/usr/X11R6/lib/xpilot/"
-  #    endif
-  #endif
+  /* Note that this doesn't really work well.  Dunno why.  Blame Alib & Aserver. */
+  /* #define HP_SOUND			/* Uncomment for HP sound support */
+! HPAUDIOINC = 
+  HPAUDIOLIB = -lAlib
+  
+  /*
+--- 147,153 ----
+  
+  /* Note that this doesn't really work well.  Dunno why.  Blame Alib & Aserver. */
+  /* #define HP_SOUND			/* Uncomment for HP sound support */
+! HPAUDIOINC =
+  HPAUDIOLIB = -lAlib
   
+  /*
diff --git a/games/xpilot/pkg-comment b/games/xpilot/pkg-comment
index 8b4c88d8dee0..3656e6fc69b0 100644
--- a/games/xpilot/pkg-comment
+++ b/games/xpilot/pkg-comment
@@ -1 +1 @@
-xpilot(client) and xpilots(server) version 3.5.1
+xpilot(client) and xpilots(server) version 3.3.1
diff --git a/games/xpilot/pkg-plist b/games/xpilot/pkg-plist
index cfffeaca9dfa..999c8e98c926 100644
--- a/games/xpilot/pkg-plist
+++ b/games/xpilot/pkg-plist
@@ -1,8 +1,10 @@
 @cwd /usr/X11R6
 bin/xpilot
+bin/xpilot-3.3.1
 bin/xpilots
+bin/xpilots-3.3.1
 bin/xp-replay
-man/man6/xpilot.6.gz
-man/man6/xpilots.6.gz
-man/man6/xp-replay.6.gz
+bin/xp-replay-3.3.1
+man/man6/xpilot.6
+man/man6/xpilots.6
 lib/xpilot