From 5a723b690b1d3fe5cec2192c301de32c4f4de27f Mon Sep 17 00:00:00 2001
From: Satoshi Asami <asami@FreeBSD.org>
Date: Thu, 19 Jun 1997 05:26:20 +0000
Subject: [PATCH] Fix XPMINCLUDE, as XFree86-3.3's INCDIR doesn't include the
 trailing "X11" anymore.  By the way, if you see how this patch changed,
 you'll know why I hate context diffs -- it would have been much easier to fix
 the patch (I could have just hand-edited one line) if it were a unified
 diff....

---
 games/xpat2/files/patch-aa | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/games/xpat2/files/patch-aa b/games/xpat2/files/patch-aa
index 6e2eef504ba4..2c0e346e9d0a 100644
--- a/games/xpat2/files/patch-aa
+++ b/games/xpat2/files/patch-aa
@@ -49,16 +49,24 @@
   
   # paths for installation in user's home-directory.
 ***************
-*** 55,60 ****
---- 55,62 ----
-  XPMLIB 			= -L$(USRLIBDIR) -lXpm
-  XPMINCLUDE		= -I $(INCDIR)
+*** 53,59 ****
+  
+  # xpat2 needs to know where the xpm library resides (if needed)
+  XPMLIB 			= -L$(USRLIBDIR) -lXpm
+! XPMINCLUDE		= -I $(INCDIR)
   
-+ CFLAGS += -DNO_CUSERID
-+ 
   # *****************************************************************************
   # I hope you don't need to change anything below this point
+--- 53,61 ----
+  
+  # xpat2 needs to know where the xpm library resides (if needed)
+  XPMLIB 			= -L$(USRLIBDIR) -lXpm
+! XPMINCLUDE		= -I$(INCDIR)/X11
+! 
+! CFLAGS += -DNO_CUSERID
+  
   # *****************************************************************************
+  # I hope you don't need to change anything below this point
 ***************
 *** 181,188 ****
   	    chmod 755 $(XPATLIBDIR)/$$f; \