1 files changed, 51 insertions, 30 deletions
diff --git a/x11-wm/afterstep/files/patch-aa b/x11-wm/afterstep/files/patch-aa
index 7ce13b4ba7f3..6b400b2a87d2 100644
--- a/x11-wm/afterstep/files/patch-aa
+++ b/x11-wm/afterstep/files/patch-aa
@@ -1,30 +1,51 @@
---- configure.h.orig	Sat Aug 17 00:50:55 1996
-+++ configure.h	Sat Aug 17 00:53:36 1996
-@@ -1,6 +1,6 @@
--#define AFTERDIR     "/usr/lib/X11/afterstep"
--#define AFTER_ICONDIR   "/usr/include/X11/bitmaps:/usr/include/X11/pixmaps"
--#define STEPRC         "/usr/lib/X11/afterstep/system.steprc"
-+#define AFTERDIR     "@@PREFIX@@/lib/X11/afterstep"
-+#define AFTER_ICONDIR   "@@PREFIX@@/include/X11/bitmaps:@@PREFIX@@/include/X11/pixmaps"
-+#define STEPRC         "@@PREFIX@@/lib/X11/afterstep/system.steprc"
- 
- /* If you would like gradients, uncomment this */
- #define ENABLE_TEXTURE
-@@ -15,7 +15,7 @@
-  * Imake wants to leave binaries, then choose the second line here.
-  * If you want to install it in a different directory, uncomment and
-  * edit the first line */
--#define AFTER_BIN_DIR BINDIR=/usr/bin/X11
-+#define AFTER_BIN_DIR BINDIR=@@PREFIX@@/bin
- 
- /* Compiler over-ride for Imakefiles */
- /* Leave it as shown to get your default compiler */
-@@ -57,7 +57,7 @@
-  ***************************************************************************/
- #define XPM                      
- /*  linker flags needed to locate and link in the Xpm library, if you use it */
--#define XPMLIBRARY -L/usr/lib/X11 -lXpm -lm
-+#define XPMLIBRARY -L@@PREFIX@@/lib -lXpm -lm
- 
- /***************************************************************************
-  *#define M4
+*** configure.h.orig	Mon Aug 26 15:09:46 1996
+--- configure.h	Mon Aug 26 16:32:09 1996
+***************
+*** 1,6 ****
+! #define AFTERDIR     "/usr/lib/X11/afterstep"
+! #define AFTER_ICONDIR   "/usr/include/X11/bitmaps:/usr/include/X11/pixmaps"
+! #define STEPRC         "/usr/lib/X11/afterstep/system.steprc"
+  
+  /* If you would like gradients, uncomment this */
+  #define ENABLE_TEXTURE
+--- 1,6 ----
+! #define AFTERDIR     "@@PREFIX@@/lib/X11/afterstep"
+! #define AFTER_ICONDIR   "@@PREFIX@@/include/X11/bitmaps:@@PREFIX@@/include/X11/pixmaps"
+! #define STEPRC         "@@PREFIX@@/lib/X11/afterstep/system.steprc"
+  
+  /* If you would like gradients, uncomment this */
+  #define ENABLE_TEXTURE
+***************
+*** 15,21 ****
+   * Imake wants to leave binaries, then choose the second line here.
+   * If you want to install it in a different directory, uncomment and
+   * edit the first line */
+! #define AFTER_BIN_DIR BINDIR=/usr/bin/X11
+  
+  /* Compiler over-ride for Imakefiles */
+  /* Leave it as shown to get your default compiler */
+--- 15,21 ----
+   * Imake wants to leave binaries, then choose the second line here.
+   * If you want to install it in a different directory, uncomment and
+   * edit the first line */
+! #define AFTER_BIN_DIR BINDIR=@@PREFIX@@/bin
+  
+  /* Compiler over-ride for Imakefiles */
+  /* Leave it as shown to get your default compiler */
+***************
+*** 57,63 ****
+   ***************************************************************************/
+  #define XPM                      
+  /*  linker flags needed to locate and link in the Xpm library, if you use it */
+! #define XPMLIBRARY -L/usr/lib/X11 -lXpm
+  
+  /***************************************************************************
+   *#define M4
+--- 57,63 ----
+   ***************************************************************************/
+  #define XPM                      
+  /*  linker flags needed to locate and link in the Xpm library, if you use it */
+! #define XPMLIBRARY -L@@PREFIX@@/lib -lXpm
+  
+  /***************************************************************************
+   *#define M4