4 files changed, 79 insertions, 37 deletions

diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index 529155875490..ca814b7f8d49 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for: xpat2
-# Version required:	1.04
+# Version required:	1.06
 # Date created:		5 March 1997
 # Whom:			Matthew Hunt <mph@pobox.com>
 #
-# $Id: Makefile,v 1.5 1998/08/05 09:31:01 asami Exp $
+# $Id: Makefile,v 1.6 1998/11/29 07:49:31 asami Exp $
 #
 
-DISTNAME=	xpat2-1.04
+DISTNAME=	xpat2-1.06
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/solitaires
-EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	mph@freebsd.org
 
diff --git a/games/xpat2/distinfo b/games/xpat2/distinfo
index 5ce5926a7768..5760d9e7e54f 100644
--- a/games/xpat2/distinfo
+++ b/games/xpat2/distinfo
@@ -1 +1 @@
-MD5 (xpat2-1.04-src.tar.gz) = 81883b4d6d56c5c4e7a76deac3540097
+MD5 (xpat2-1.06.tar.gz) = e0621e18a18fc506002b0a196ecb972d
diff --git a/games/xpat2/files/patch-aa b/games/xpat2/files/patch-aa
index 2c0e346e9d0a..c4470b0e8ff1 100644
--- a/games/xpat2/files/patch-aa
+++ b/games/xpat2/files/patch-aa
@@ -1,26 +1,28 @@
-*** src/Imakefile.orig	Sat Nov 25 12:55:35 1995
---- src/Imakefile	Wed Mar  5 16:18:39 1997
+*** src/Imakefile.orig	Sat May 15 12:02:56 1999
+--- src/Imakefile	Mon Jun  7 13:03:04 1999
 ***************
-*** 22,29 ****
+*** 26,34 ****
   # 4.) specify, if you want sound (must copy the appropriate sound module)
   #     SOUNDOBJ should be one module of X-sound_*.o if USE_SOUND is on, else empty
   #     Note: for X-sound_SUN.o, /dev/audio must have 666 permissions */
 ! #define USE_SOUND	/* doesn't harm if you don't have a sound card */
+  # the default is to copy an .au-file to /dev/audio
 ! SOUNDOBJ = X-sound_SUN.o
-  
-  # 5.) specify, if you want the antialiased card construction set (SLOW!)
-  #define USE_CARD_CONSTRUCTION
---- 22,29 ----
+  SOUNDLIB =
+  # uncomment this if you're using the NAS audio system:
+  # SOUNDOBJ = X-sound_NAS.o
+--- 26,34 ----
   # 4.) specify, if you want sound (must copy the appropriate sound module)
   #     SOUNDOBJ should be one module of X-sound_*.o if USE_SOUND is on, else empty
   #     Note: for X-sound_SUN.o, /dev/audio must have 666 permissions */
 ! #undef USE_SOUND	/* doesn't harm if you don't have a sound card */
-! SOUNDOBJ = 
-  
-  # 5.) specify, if you want the antialiased card construction set (SLOW!)
-  #define USE_CARD_CONSTRUCTION
+  # the default is to copy an .au-file to /dev/audio
+! SOUNDOBJ =
+  SOUNDLIB =
+  # uncomment this if you're using the NAS audio system:
+  # SOUNDOBJ = X-sound_NAS.o
 ***************
-*** 37,49 ****
+*** 49,61 ****
   # BINDIR and LIBDIR should be predefined by the templates
   # BINDIR = /usr/bin/X11
   # LIBDIR = /usr/lib/X11
@@ -34,7 +36,7 @@
   
   
   # paths for installation in user's home-directory.
---- 37,49 ----
+--- 49,61 ----
   # BINDIR and LIBDIR should be predefined by the templates
   # BINDIR = /usr/bin/X11
   # LIBDIR = /usr/lib/X11
@@ -49,15 +51,15 @@
   
   # paths for installation in user's home-directory.
 ***************
-*** 53,59 ****
+*** 65,71 ****
   
   # xpat2 needs to know where the xpm library resides (if needed)
   XPMLIB 			= -L$(USRLIBDIR) -lXpm
 ! XPMINCLUDE		= -I $(INCDIR)
   
-  # *****************************************************************************
-  # I hope you don't need to change anything below this point
---- 53,61 ----
+  # for the Qt interface, the following paths are needed
+  QTDIR			= /usr/local/qt
+--- 65,73 ----
   
   # xpat2 needs to know where the xpm library resides (if needed)
   XPMLIB 			= -L$(USRLIBDIR) -lXpm
@@ -65,10 +67,10 @@
 ! 
 ! CFLAGS += -DNO_CUSERID
   
-  # *****************************************************************************
-  # I hope you don't need to change anything below this point
+  # for the Qt interface, the following paths are needed
+  QTDIR			= /usr/local/qt
 ***************
-*** 181,188 ****
+*** 217,224 ****
   	    chmod 755 $(XPATLIBDIR)/$$f; \
   	done
   	mkdirhier $(XPATMANDIR)
@@ -77,7 +79,7 @@
   
   ComplexProgramTarget($(MYPROG))
   InstallAppDefaults(XPat)
---- 183,190 ----
+--- 219,226 ----
   	    chmod 755 $(XPATLIBDIR)/$$f; \
   	done
   	mkdirhier $(XPATMANDIR)
diff --git a/games/xpat2/pkg-plist b/games/xpat2/pkg-plist
index 407f28ce8ee3..c5612e8c0d4c 100644
--- a/games/xpat2/pkg-plist
+++ b/games/xpat2/pkg-plist
@@ -1,12 +1,42 @@
-lib/X11/xpat/xpat.log
-lib/X11/xpat/XPat.ad.Motif
+bin/xpat2
+lib/X11/app-defaults/XPat
+lib/X11/xpat/PySol-large/COPYRIGHT
+lib/X11/xpat/PySol-large/Makefile
+lib/X11/xpat/PySol-large/README
+lib/X11/xpat/PySol-large/Cards.conf
+lib/X11/xpat/PySol-large/Empty.Clubs.xpm
+lib/X11/xpat/PySol-large/Empty.Diamonds.xpm
+lib/X11/xpat/PySol-large/Empty.Hearts.xpm
+lib/X11/xpat/PySol-large/Empty.Spades.xpm
+lib/X11/xpat/PySol-medium/COPYRIGHT
+lib/X11/xpat/PySol-medium/Cards.conf
+lib/X11/xpat/PySol-medium/Empty.Clubs.xpm
+lib/X11/xpat/PySol-medium/Empty.Diamonds.xpm
+lib/X11/xpat/PySol-medium/Empty.Hearts.xpm
+lib/X11/xpat/PySol-medium/Empty.Spades.xpm
+lib/X11/xpat/PySol-medium/Makefile
+lib/X11/xpat/PySol-medium/README
+lib/X11/xpat/PySol-small/COPYRIGHT
+lib/X11/xpat/PySol-small/Cards.conf
+lib/X11/xpat/PySol-small/Empty.Clubs.xpm
+lib/X11/xpat/PySol-small/Empty.Diamonds.xpm
+lib/X11/xpat/PySol-small/Empty.Hearts.xpm
+lib/X11/xpat/PySol-small/Empty.Spades.xpm
+lib/X11/xpat/PySol-small/Makefile
+lib/X11/xpat/PySol-small/README
+lib/X11/xpat/XPat.ad.XQt
 lib/X11/xpat/XPat.ad.Xaw
 lib/X11/xpat/XPat.ad.Xlib
+lib/X11/xpat/XPat.ad.Xm
 lib/X11/xpat/XPat.ad.Xview
 lib/X11/xpat/audio/cannotsave.au
 lib/X11/xpat/audio/giveup.au
 lib/X11/xpat/audio/goodbye.au
 lib/X11/xpat/audio/success.au
+lib/X11/xpat/audio/cannotsave.wav
+lib/X11/xpat/audio/giveup.wav
+lib/X11/xpat/audio/goodbye.wav
+lib/X11/xpat/audio/success.wav
 lib/X11/xpat/default/Background.xpm
 lib/X11/xpat/default/Cardback1.xpm
 lib/X11/xpat/default/Cardback2.xpm
@@ -17,6 +47,16 @@ lib/X11/xpat/default/Pictures.xpm
 lib/X11/xpat/default/Ranks.xpm
 lib/X11/xpat/default/Suits.xpm
 lib/X11/xpat/default/Cards.conf
+lib/X11/xpat/default/Cardback6.xpm
+lib/X11/xpat/default/Cardback0.xpm
+lib/X11/xpat/docvt
+lib/X11/xpat/dummy.xpm
+lib/X11/xpat/fallback/Background.xpm
+lib/X11/xpat/fallback/Cardback1.xpm
+lib/X11/xpat/fallback/Cards.conf
+lib/X11/xpat/fallback/Ranks.xpm
+lib/X11/xpat/fallback/Pictures.xpm
+lib/X11/xpat/fallback/Suits.xpm
 lib/X11/xpat/french/README.french
 lib/X11/xpat/french/XPat
 lib/X11/xpat/french/aidBakersDozen
@@ -40,6 +80,7 @@ lib/X11/xpat/french.cards
 lib/X11/xpat/german/keys
 lib/X11/xpat/german/messages
 lib/X11/xpat/german/XPat
+lib/X11/xpat/help.BlueMoon
 lib/X11/xpat/help.Canfield
 lib/X11/xpat/help.Cotillion
 lib/X11/xpat/help.Delight
@@ -47,6 +88,7 @@ lib/X11/xpat/help.FreeCell
 lib/X11/xpat/help.Gypsy
 lib/X11/xpat/help.Klondike
 lib/X11/xpat/help.Michaels
+lib/X11/xpat/help.Oonsoo
 lib/X11/xpat/help.Seahaven
 lib/X11/xpat/help.Spider
 lib/X11/xpat/help.keys
@@ -78,16 +120,15 @@ lib/X11/xpat/russian/sq01.bdf
 lib/X11/xpat/russian/messages
 lib/X11/xpat/russian/keys
 lib/X11/xpat/small.cards
-bin/xpat2
-lib/X11/app-defaults/XPat
-lib/X11/italian/app-defaults/XPat
-lib/X11/german/app-defaults/XPat
-lib/X11/russian/app-defaults/XPat
-lib/X11/french/app-defaults/XPat
+lib/X11/xpat/xpat.log
+@dirrm lib/X11/xpat/PySol-large
+@dirrm lib/X11/xpat/PySol-medium
+@dirrm lib/X11/xpat/PySol-small
 @dirrm lib/X11/xpat/audio
-@dirrm lib/X11/xpat/italian
+@dirrm lib/X11/xpat/default
+@dirrm lib/X11/xpat/fallback
+@dirrm lib/X11/xpat/french
 @dirrm lib/X11/xpat/german
+@dirrm lib/X11/xpat/italian
 @dirrm lib/X11/xpat/russian
-@dirrm lib/X11/xpat/french
-@dirrm lib/X11/xpat/default
 @dirrm lib/X11/xpat