$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