Update to 1.07, based on PR 28519 by Joachim Kuebart.

Changes from xpat2-1.06 to xpat2-1.07
-------------------------------------
This is mostly a contrib release. I have added improvements obtained
from the net:
- German rules by Thomas Betker
- improvements for the motif interface by Karsten Jensen
- a new motif interface and work on Imakefile by Christian Anzenberger
- minor adaptions to make xpat2 work with Qt 2.x

5 files changed, 228 insertions, 169 deletions

diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index 6eda7448873..cb4875c3ef3 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -1,13 +1,16 @@
-# $NetBSD: Makefile,v 1.11 2004/08/01 17:55:05 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2004/12/03 13:28:22 wiz Exp $
 # FreeBSD: ports/games/xpat2/Makefile,v 1.11 2000/04/14 12:27:59 asami Exp
 
-DISTNAME=	xpat2-1.06
+DISTNAME=	xpat2-1.07
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=games/solitaires/}
+EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	kuebart@mathematik.uni-ulm.de
 COMMENT=	X11 solitaire game with 14 variations
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 USE_X11BASE=	YES
diff --git a/games/xpat2/PLIST b/games/xpat2/PLIST
index 7c4c0029f63..dbac23c3d84 100644
--- a/games/xpat2/PLIST
+++ b/games/xpat2/PLIST
@@ -1,135 +1,159 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:57:19 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/12/03 13:28:22 wiz Exp $
 bin/xpat2
 lib/X11/app-defaults/XPat
-lib/X11/xpat/PySol-large/COPYRIGHT
-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-large/Makefile
-lib/X11/xpat/PySol-large/README
-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/cannotsave.wav
-lib/X11/xpat/audio/giveup.au
-lib/X11/xpat/audio/giveup.wav
-lib/X11/xpat/audio/goodbye.au
-lib/X11/xpat/audio/goodbye.wav
-lib/X11/xpat/audio/success.au
-lib/X11/xpat/audio/success.wav
-lib/X11/xpat/default/Background.xpm
-lib/X11/xpat/default/Cardback0.xpm
-lib/X11/xpat/default/Cardback1.xpm
-lib/X11/xpat/default/Cardback2.xpm
-lib/X11/xpat/default/Cardback3.xpm
-lib/X11/xpat/default/Cardback4.xpm
-lib/X11/xpat/default/Cardback5.xpm
-lib/X11/xpat/default/Cardback6.xpm
-lib/X11/xpat/default/Cards.conf
-lib/X11/xpat/default/Pictures.xpm
-lib/X11/xpat/default/Ranks.xpm
-lib/X11/xpat/default/Suits.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/Pictures.xpm
-lib/X11/xpat/fallback/Ranks.xpm
-lib/X11/xpat/fallback/Suits.xpm
-lib/X11/xpat/french.cards
-lib/X11/xpat/french/README.french
-lib/X11/xpat/french/XPat
-lib/X11/xpat/french/aidBakersDozen
-lib/X11/xpat/french/aidCalculation
-lib/X11/xpat/french/aidMidnightOil
-lib/X11/xpat/french/aidMonteCarlo
-lib/X11/xpat/french/aide.Canfield
-lib/X11/xpat/french/aide.Cotillion
-lib/X11/xpat/french/aide.Delight
-lib/X11/xpat/french/aide.FreeCell
-lib/X11/xpat/french/aide.Gypsy
-lib/X11/xpat/french/aide.Klondike
-lib/X11/xpat/french/aide.Michaels
-lib/X11/xpat/french/aide.Seahaven
-lib/X11/xpat/french/aide.Spider
-lib/X11/xpat/french/aide.touches
-lib/X11/xpat/french/aidmodCanfield
-lib/X11/xpat/french/keys
-lib/X11/xpat/french/messages
-lib/X11/xpat/german/XPat
-lib/X11/xpat/german/keys
-lib/X11/xpat/german/messages
-lib/X11/xpat/help.BlueMoon
-lib/X11/xpat/help.Canfield
-lib/X11/xpat/help.Cotillion
-lib/X11/xpat/help.Delight
-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
-lib/X11/xpat/hlpBakersDozen
-lib/X11/xpat/hlpCalculation
-lib/X11/xpat/hlpMidnightOil
-lib/X11/xpat/hlpMonteCarlo
-lib/X11/xpat/hlpmodCanfield
-lib/X11/xpat/italian/XPat
-lib/X11/xpat/italian/help.Canfield
-lib/X11/xpat/italian/help.Cotillion
-lib/X11/xpat/italian/help.Delight
-lib/X11/xpat/italian/help.FreeCell
-lib/X11/xpat/italian/help.Gypsy
-lib/X11/xpat/italian/help.Klondike
-lib/X11/xpat/italian/help.Michaels
-lib/X11/xpat/italian/help.Seahaven
-lib/X11/xpat/italian/help.Spider
-lib/X11/xpat/italian/help.keys
-lib/X11/xpat/italian/hlpBakersDozen
-lib/X11/xpat/italian/hlpCalculation
-lib/X11/xpat/italian/hlpMidnightOil
-lib/X11/xpat/italian/hlpMonteCarlo
-lib/X11/xpat/italian/keys
-lib/X11/xpat/italian/messages
-lib/X11/xpat/keys
-lib/X11/xpat/russian/XPat
-lib/X11/xpat/russian/keys
-lib/X11/xpat/russian/messages
-lib/X11/xpat/russian/sq01.bdf
-lib/X11/xpat/small.cards
+lib/xpat/PySol-large/COPYRIGHT
+lib/xpat/PySol-large/Cards.conf
+lib/xpat/PySol-large/Empty.Clubs.xpm
+lib/xpat/PySol-large/Empty.Diamonds.xpm
+lib/xpat/PySol-large/Empty.Hearts.xpm
+lib/xpat/PySol-large/Empty.Spades.xpm
+lib/xpat/PySol-large/Makefile
+lib/xpat/PySol-large/README
+lib/xpat/PySol-medium/COPYRIGHT
+lib/xpat/PySol-medium/Cards.conf
+lib/xpat/PySol-medium/Empty.Clubs.xpm
+lib/xpat/PySol-medium/Empty.Diamonds.xpm
+lib/xpat/PySol-medium/Empty.Hearts.xpm
+lib/xpat/PySol-medium/Empty.Spades.xpm
+lib/xpat/PySol-medium/Makefile
+lib/xpat/PySol-medium/README
+lib/xpat/PySol-small/COPYRIGHT
+lib/xpat/PySol-small/Cards.conf
+lib/xpat/PySol-small/Empty.Clubs.xpm
+lib/xpat/PySol-small/Empty.Diamonds.xpm
+lib/xpat/PySol-small/Empty.Hearts.xpm
+lib/xpat/PySol-small/Empty.Spades.xpm
+lib/xpat/PySol-small/Makefile
+lib/xpat/PySol-small/README
+lib/xpat/XPat.ad.XQt
+lib/xpat/XPat.ad.Xaw
+lib/xpat/XPat.ad.Xlib
+lib/xpat/XPat.ad.Xm1
+lib/xpat/XPat.ad.Xm2
+lib/xpat/XPat.ad.Xview
+lib/xpat/audio/cannotsave.au
+lib/xpat/audio/cannotsave.wav
+lib/xpat/audio/giveup.au
+lib/xpat/audio/giveup.wav
+lib/xpat/audio/goodbye.au
+lib/xpat/audio/goodbye.wav
+lib/xpat/audio/success.au
+lib/xpat/audio/success.wav
+lib/xpat/de_DE
+lib/xpat/default/Background.xpm
+lib/xpat/default/Cardback0.xpm
+lib/xpat/default/Cardback1.xpm
+lib/xpat/default/Cardback2.xpm
+lib/xpat/default/Cardback3.xpm
+lib/xpat/default/Cardback4.xpm
+lib/xpat/default/Cardback5.xpm
+lib/xpat/default/Cardback6.lowcol.xpm
+lib/xpat/default/Cardback6.xpm
+lib/xpat/default/Cards.conf
+lib/xpat/default/Pictures.xpm
+lib/xpat/default/Ranks.xpm
+lib/xpat/default/Suits.xpm
+lib/xpat/docvt
+lib/xpat/dummy.xpm
+lib/xpat/fallback/Background.xpm
+lib/xpat/fallback/Cardback1.xpm
+lib/xpat/fallback/Cards.conf
+lib/xpat/fallback/Pictures.xpm
+lib/xpat/fallback/Ranks.xpm
+lib/xpat/fallback/Suits.xpm
+lib/xpat/fr_FR
+lib/xpat/french.cards
+lib/xpat/french/README.french
+lib/xpat/french/XPat
+lib/xpat/french/aidBakersDozen
+lib/xpat/french/aidCalculation
+lib/xpat/french/aidMidnightOil
+lib/xpat/french/aidMonteCarlo
+lib/xpat/french/aide.Canfield
+lib/xpat/french/aide.Cotillion
+lib/xpat/french/aide.Delight
+lib/xpat/french/aide.FreeCell
+lib/xpat/french/aide.Gypsy
+lib/xpat/french/aide.Klondike
+lib/xpat/french/aide.Michaels
+lib/xpat/french/aide.Seahaven
+lib/xpat/french/aide.Spider
+lib/xpat/french/aide.touches
+lib/xpat/french/aidmodCanfield
+lib/xpat/french/keys
+lib/xpat/french/messages
+lib/xpat/german/Notes
+lib/xpat/german/XPat
+lib/xpat/german/hilf.BakersDozen
+lib/xpat/german/hilf.BlueMoon
+lib/xpat/german/hilf.Calculation
+lib/xpat/german/hilf.Canfield
+lib/xpat/german/hilf.Cotillion
+lib/xpat/german/hilf.Delight
+lib/xpat/german/hilf.FreeCell
+lib/xpat/german/hilf.Gypsy
+lib/xpat/german/hilf.Klondike
+lib/xpat/german/hilf.Michaels
+lib/xpat/german/hilf.MidnightOil
+lib/xpat/german/hilf.ModCanfield
+lib/xpat/german/hilf.MonteCarlo
+lib/xpat/german/hilf.Oonsoo
+lib/xpat/german/hilf.Seahaven
+lib/xpat/german/hilf.Spider
+lib/xpat/german/hilf.bedien
+lib/xpat/german/hilf.tasten
+lib/xpat/german/keys
+lib/xpat/german/messages
+lib/xpat/help.BlueMoon
+lib/xpat/help.Canfield
+lib/xpat/help.Cotillion
+lib/xpat/help.Delight
+lib/xpat/help.FreeCell
+lib/xpat/help.Gypsy
+lib/xpat/help.Klondike
+lib/xpat/help.Michaels
+lib/xpat/help.Oonsoo
+lib/xpat/help.Seahaven
+lib/xpat/help.Spider
+lib/xpat/help.keys
+lib/xpat/hlpBakersDozen
+lib/xpat/hlpCalculation
+lib/xpat/hlpMidnightOil
+lib/xpat/hlpMonteCarlo
+lib/xpat/hlpmodCanfield
+lib/xpat/it_IT
+lib/xpat/italian/XPat
+lib/xpat/italian/help.Canfield
+lib/xpat/italian/help.Cotillion
+lib/xpat/italian/help.Delight
+lib/xpat/italian/help.FreeCell
+lib/xpat/italian/help.Gypsy
+lib/xpat/italian/help.Klondike
+lib/xpat/italian/help.Michaels
+lib/xpat/italian/help.Seahaven
+lib/xpat/italian/help.Spider
+lib/xpat/italian/help.keys
+lib/xpat/italian/hlpBakersDozen
+lib/xpat/italian/hlpCalculation
+lib/xpat/italian/hlpMidnightOil
+lib/xpat/italian/hlpMonteCarlo
+lib/xpat/italian/keys
+lib/xpat/italian/messages
+lib/xpat/keys
+lib/xpat/russian/XPat
+lib/xpat/russian/keys
+lib/xpat/russian/messages
+lib/xpat/russian/sq01.bdf
+lib/xpat/small.cards
 man/man6/xpat2.6
-@dirrm lib/X11/xpat/russian
-@dirrm lib/X11/xpat/italian
-@dirrm lib/X11/xpat/german
-@dirrm lib/X11/xpat/french
-@dirrm lib/X11/xpat/fallback
-@dirrm lib/X11/xpat/default
-@dirrm lib/X11/xpat/audio
-@dirrm lib/X11/xpat/PySol-small
-@dirrm lib/X11/xpat/PySol-medium
-@dirrm lib/X11/xpat/PySol-large
-@dirrm lib/X11/xpat
+@dirrm lib/xpat/russian
+@dirrm lib/xpat/italian
+@dirrm lib/xpat/german
+@dirrm lib/xpat/french
+@dirrm lib/xpat/fallback
+@dirrm lib/xpat/default
+@dirrm lib/xpat/audio
+@dirrm lib/xpat/PySol-small
+@dirrm lib/xpat/PySol-medium
+@dirrm lib/xpat/PySol-large
+@dirrm lib/xpat
diff --git a/games/xpat2/distinfo b/games/xpat2/distinfo
index 09abf8f2a39..d550d44f333 100644
--- a/games/xpat2/distinfo
+++ b/games/xpat2/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:41 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/12/03 13:28:22 wiz Exp $
 
-SHA1 (xpat2-1.06.tar.gz) = 5197c926bbb51d24ef8e5f246a322432ef37c460
-Size (xpat2-1.06.tar.gz) = 443882 bytes
-SHA1 (patch-aa) = d40b55c458547180ba55d16e0087fd6910bb4e7a
+SHA1 (xpat2-1.07-src.tar.gz) = a200c526e842bc6dfe5da67d4e49714c21403e9c
+Size (xpat2-1.07-src.tar.gz) = 519326 bytes
+SHA1 (patch-aa) = 077dfbbf032e6bb9f05f7245946a1ca7896a359d
 SHA1 (patch-ab) = ab30f2db479dcfab41d4283af9fd07467a548f58
+SHA1 (patch-ac) = c8f67bc417881e7bd6959d477b95d1b23e1568ac
diff --git a/games/xpat2/patches/patch-aa b/games/xpat2/patches/patch-aa
index 6b68097dda9..c14458ffe19 100644
--- a/games/xpat2/patches/patch-aa
+++ b/games/xpat2/patches/patch-aa
@@ -1,34 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/07/28 18:12:06 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2004/12/03 13:28:22 wiz Exp $
 
---- src/Imakefile.orig	Sat May 15 15:02:56 1999
-+++ src/Imakefile	Thu Jul 27 13:18:33 2000
-@@ -49,9 +49,9 @@
- # BINDIR and LIBDIR should be predefined by the templates
- # BINDIR = /usr/bin/X11
- # LIBDIR = /usr/lib/X11
--XPATLIBDIR = /usr/games/lib/xpat
-+XPATLIBDIR = $(LIBDIR)/xpat
- APPDEFSDIR = $(LIBDIR)
--XPATMANDIR = /usr/man/man6
-+XPATMANDIR = $(PREFIX)/man/man6
- 
- # This is the name of the log-file, where solved games are stored:
- # an alternative path would be $(XPATLIBDIR)/xpat.log
-@@ -64,8 +64,10 @@
- LAPPDEFSDIR = $(HOME)
- 
- # xpat2 needs to know where the xpm library resides (if needed)
--XPMLIB 			= -L$(USRLIBDIR) -lXpm
--XPMINCLUDE		= -I $(INCDIR)
-+XPMLIB 			= -Wl,-R${XPMDIR}/lib -lXpm
-+XPMINCLUDE		= -I$(XPMDIR)/include/X11
-+
-+CFLAGS			+= -DNO_CUSERID
- 
- # for the Qt interface, the following paths are needed
- QTDIR			= /usr/local/qt
-@@ -204,12 +206,12 @@
- install:: $(MYPROGS)
+--- src/Imakefile.orig	2000-11-05 20:05:10.000000000 +0100
++++ src/Imakefile	2004-12-02 23:49:15.000000000 +0100
+@@ -207,12 +207,12 @@
+ install::	$(MYPROGS)
  	mkdirhier $(XPATLIBDIR)
  	chmod 755 $(XPATLIBDIR)
 -	for f in $(LANGUAGES); do \
@@ -46,7 +21,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/07/28 18:12:06 jlam Exp $
  	(cd ../lib; tar cf - * | (cd $(XPATLIBDIR); tar xf -))
  	chown -R root $(XPATLIBDIR)
  	chmod -R a+r $(XPATLIBDIR)
-@@ -217,8 +219,8 @@
+@@ -220,8 +220,8 @@
  	    chmod 755 $(XPATLIBDIR)/$$f; \
  	done
  	mkdirhier $(XPATMANDIR)
diff --git a/games/xpat2/patches/patch-ac b/games/xpat2/patches/patch-ac
new file mode 100644
index 00000000000..262a0a1d680
--- /dev/null
+++ b/games/xpat2/patches/patch-ac
@@ -0,0 +1,56 @@
+$NetBSD: patch-ac,v 1.1 2004/12/03 13:28:49 wiz Exp $
+
+--- src/Xpat.tmpl.orig	2000-11-05 21:03:10.000000000 +0100
++++ src/Xpat.tmpl	2004-12-02 23:53:28.000000000 +0100
+@@ -40,9 +40,9 @@
+ 
+ XCOMM 1. Specify User Interface (_exactly_ one of the interfaces below)
+ #undef useXlib		/* similar to xpat version 1.x, not all features */
+-#undef useXaw		/* the classic Athena based interface for xpat2 */
++#define useXaw		/* the classic Athena based interface for xpat2 */
+ #undef useXview		/* Xview / OpenLook interface */
+-#define useXQt		/* Qt widgets, playable, but NOT YET FINISHED */
++#undef useXQt		/* Qt widgets, playable, but NOT YET FINISHED */
+ 			/* advice on Qt improvements from experienced
+ 			   programmers welcome at Michael.Bischoff@gmx.net */
+ #undef useXm1		/* Motif based interface (first variant) */
+@@ -113,7 +113,7 @@
+ 
+ #ifndef XPMINCLUDE
+ XCOMM Default for most platforms
+-XPMINCLUDE	= -I$(INCROOT)/X11
++XPMINCLUDE	= -I$(XPMDIR)/include/X11
+ XCOMM Default for Solaris Visual Workshop
+ XCOMM XPMINCLUDE	= /opt/SUNWspro/WS4.0/contrib/xpm/lib
+ #endif
+@@ -122,11 +122,13 @@
+ XCOMM Default for most platforms, statically linked
+ XCOMM XPMLIB 	= -$(USRLIBDIR)/libXpm.a
+ XCOMM Default for most platforms, dynamically linked
+-XPMLIB		= -L$(USRLIBDIR) -lXpm
++XPMLIB		= -L$(XPMDIR)/lib -Wl,-R$(XPMDIR)/lib -lXpm
+ XCOMM Default for Solaris Visual Workshop, statically linked
+ XCOMM XPMLIB	= /opt/SUNWspro/WS4.0/contrib/xpm/lib/libXpm.a
+ #endif
+ 
++CFLAGS		+= -DNO_CUSERID
++
+ #ifndef XMINCLUDE
+ XCOMM Default for most platforms
+ XMINCLUDE	= -I$(INCROOT)
+@@ -161,13 +163,13 @@
+ XCOMM #########################################################################
+ 
+ XCOMM Root directory of xpat2 installation
+-XPATROOT	= /usr/games/lib/xpat
++XPATROOT	= $(PREFIX)/lib/xpat
+ XCOMM XPATROOT	= /usr/local/lib/xpat
+ XCOMM XPATROOT	= /opt/XPat2
+ 
+ XPATLIBDIR	= $(XPATROOT)
+ APPDEFSDIR	= $(LIBDIR)
+-XPATMANDIR	= $(XPATROOT)/man/man6
++XPATMANDIR	= $(PREFIX)/man/man6
+ 
+ XCOMM This is the name of the log-file, where solved games are stored:
+ SCOREFILE	= /var/games/xpat.log