From 8b72a4342df9af0b1764d9ecf73b009d8e6da3b8 Mon Sep 17 00:00:00 2001
From: Torsten Blum <torstenb@FreeBSD.org>
Date: Sat, 14 Sep 1996 22:53:16 +0000
Subject: Upgrade to 3.4 patchlevel 2

---
 x11-wm/ctwm/files/patch-aa | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'x11-wm/ctwm/files/patch-aa')

diff --git a/x11-wm/ctwm/files/patch-aa b/x11-wm/ctwm/files/patch-aa
index 2bb0c27cc431..aca61e317224 100644
--- a/x11-wm/ctwm/files/patch-aa
+++ b/x11-wm/ctwm/files/patch-aa
@@ -1,11 +1,11 @@
-*** Imakefile.orig	Wed Jan  4 18:10:33 1995
---- Imakefile	Sat Feb 11 11:48:41 1995
+*** Imakefile.orig	Sun Sep 15 00:25:16 1996
+--- Imakefile	Sun Sep 15 00:28:49 1996
 ***************
-*** 10,24 ****
-  #undef  IMCONV
+*** 11,25 ****
   #undef  USE_SOUND
   #define XPM
   #define USEM4
+! #undef X11R6
   
            YFLAGS = -d
           DEPLIBS = $(DEPXMULIB) $(DEPEXTENSIONLIB) $(DEPXLIB)
@@ -17,18 +17,18 @@
   
        XPMDEFINES = -DXPM
            XPMLIB = $(XPMLIBDIR) -lXpm
---- 10,24 ----
-  #undef  IMCONV
+--- 11,25 ----
   #undef  USE_SOUND
   #define XPM
-  #define  USEM4
+  #define USEM4
+! #define X11R6
   
            YFLAGS = -d
           DEPLIBS = $(DEPXMULIB) $(DEPEXTENSIONLIB) $(DEPXLIB)
          LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
   
   #ifdef XPM
-!       XPMLIBDIR = -L /usr/X11R6/lib
+!       XPMLIBDIR = -L/usr/X11R6/lib
 !       XPMINCDIR = -I/usr/X11R6/include
   
        XPMDEFINES = -DXPM
-- 
cgit v1.2.3