>Number:         28519
>Category:       pkg
>Synopsis:       upgrade games/xpat2 to version 1.07
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Dec 02 23:09:00 +0000 2004
>Originator:     Joachim Kuebart
>Release:        NetBSD 2.0B
>Organization:
>Environment:
System: NetBSD jaja 2.0B NetBSD 2.0B (ALPHA-$Revision: 1.191 $) #10: Thu Apr 22 17:37:18 CEST 2004 joki@jaja:/home/joki/NetBSD/compile/JAJA alpha
Architecture: alpha
Machine: alpha
>Description:
Upgrade the xpat2 solitaire game to the current version 1.07.
>How-To-Repeat:
n/a
>Fix:
The enclosed patch needs to be applied to the top of the CVS tree. Note
that Qt support has been disabled because

     1) it's marked as unstable in src/Xpat.tmpl

     2) the Athena widgets interface is more mature (resizing the window
	doesn't cause the layout to be adjusted in the Qt version)

     3) it bloats the application compared to the Athena widgets version

     4) xpat2 dumps core when the mouse is dragged (maybe Alpha related
	problem).

I don't have time to look into this more, so if someone feels it should be
added they should go ahead. ;)

As a side effect, this patch also pkgviews-enables xpat2.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/xpat2/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile	1 Aug 2004 17:55:05 -0000	1.11
+++ Makefile	2 Dec 2004 23:01:10 -0000
@@ -1,12 +1,15 @@
 # $NetBSD: Makefile,v 1.11 2004/08/01 17:55:05 jschauma 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
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/games/xpat2/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-aa
--- patches/patch-aa	28 Jul 2000 18:12:06 -0000	1.1.1.1
+++ patches/patch-aa	2 Dec 2004 23:01:10 -0000
@@ -1,34 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/07/28 18:12:06 jlam Exp $
+$NetBSD$
 
---- 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 1
  	(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)


There is one new patch file, patches/patch-ac:


$NetBSD$

--- 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