$OpenBSD: patch-src_Imakefile,v 1.2 2002/09/19 07:00:42 pvalchev Exp $
--- src/Imakefile.orig	Sat Nov 25 10:55:35 1995
+++ src/Imakefile	Thu Sep 19 00:46:46 2002
@@ -22,8 +22,8 @@
 # 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 */
-SOUNDOBJ = X-sound_SUN.o
+#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
@@ -37,9 +37,9 @@ SOUNDOBJ = X-sound_SUN.o
 # 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 = $(MANPATH)/man6
 
 # This is the name of the log-file, where solved games are stored:
 # an alternative path would be $(XPATLIBDIR)/xpat.log
@@ -52,9 +52,10 @@ LXPATMANDIR = $(HOME)/xpat
 LAPPDEFSDIR = $(HOME)
 
 # xpat2 needs to know where the xpm library resides (if needed)
-XPMLIB 			= -L$(USRLIBDIR) -lXpm
-XPMINCLUDE		= -I $(INCDIR)
+XPMLIB 			= -L$(USRLIBDIR) -L/usr/X11R6/lib -lXpm
+XPMINCLUDE		= -I/usr/X11R6/include/X11
 
+CFLAGS += -DNO_CUSERID
 # *****************************************************************************
 # I hope you don't need to change anything below this point
 # *****************************************************************************
@@ -166,23 +167,23 @@ DEFINES =  $(LOAD_OPTION) $(HELP_OPTION)
 all::	$(MYPROG)
 
 install:: $(MYPROGS)
-	mkdirhier $(XPATLIBDIR)
-	chmod 755 $(XPATLIBDIR)
+	mkdirhier $(DESTDIR)$(XPATLIBDIR)
+	chmod 755 $(DESTDIR)$(XPATLIBDIR)
 	for f in $(LANGUAGES); do \
-	  mkdirhier $(APPDEFSDIR)/$$f/app-defaults; \
-	  cp ../lib/$$f/XPat $(APPDEFSDIR)/$$f/app-defaults; \
-	  chmod 755 $(APPDEFSDIR)/$$f/app-defaults; \
-	  chmod 644 $(APPDEFSDIR)/$$f/app-defaults/XPat; \
+	  mkdirhier $(DESTDIR)$(APPDEFSDIR)/$$f/app-defaults; \
+	  cp ../lib/$$f/XPat $(DESTDIR)$(APPDEFSDIR)/$$f/app-defaults; \
+	  chmod 755 $(DESTDIR)$(APPDEFSDIR)/$$f/app-defaults; \
+	  chmod 644 $(DESTDIR)$(APPDEFSDIR)/$$f/app-defaults/XPat; \
 	done 
-	(cd ../lib; tar cf - * | (cd $(XPATLIBDIR); tar xf -))
-	chown -R root $(XPATLIBDIR)
-	chmod -R a+r $(XPATLIBDIR)
+	(cd ../lib; tar cf - * | (cd $(DESTDIR)$(XPATLIBDIR); tar xf -))
+	chown -R root $(DESTDIR)$(XPATLIBDIR)
+	chmod -R a+r $(DESTDIR)$(XPATLIBDIR)
 	for f in $(LANGUAGES); do \
-	    chmod 755 $(XPATLIBDIR)/$$f; \
+	    chmod 755 $(DESTDIR)$(XPATLIBDIR)/$$f; \
 	done
-	mkdirhier $(XPATMANDIR)
-	cp xpat2.man $(XPATMANDIR)/xpat2.6x
-	chmod 644 $(XPATMANDIR)/xpat2.6x
+	mkdirhier $(DESTDIR)$(XPATMANDIR)
+	cp xpat2.man $(DESTDIR)$(XPATMANDIR)/xpat2.6
+	chmod 644 $(DESTDIR)$(XPATMANDIR)/xpat2.6
 
 ComplexProgramTarget($(MYPROG))
 InstallAppDefaults(XPat)