- don't overwrite exim cflags

[packages/exim.git] / exim-Makefile-Default.patch

diff --git a/exim-Makefile-Default.patch b/exim-Makefile-Default.patch
index 6ce50fed7b3468c20d29af4af1fea9191ae36e5a..b52f5795bb5d5c70bd8f6b8c31b4dc93d9db793f 100644 (file)
--- a/exim-Makefile-Default.patch
+++ b/exim-Makefile-Default.patch
@@ -1,7 +1,7 @@
-diff -ruN exim-3.20.orig/OS/Makefile-Default exim-3.20/OS/Makefile-Default
---- exim-3.20.orig/OS/Makefile-Default Sat Nov 25 17:02:45 2000
-+++ exim-3.20/OS/Makefile-Default      Tue Dec  5 10:30:42 2000
-@@ -25,14 +25,14 @@
+diff -urN exim-3.30.org/OS/Makefile-Default exim-3.30/OS/Makefile-Default
+--- exim-3.30.org/OS/Makefile-Default  Sat Jun 30 00:58:22 2001
++++ exim-3.30/OS/Makefile-Default      Sat Jun 30 01:00:52 2001
+@@ -25,7 +25,7 @@
  # found, it uses /usr/ucb/basename. This copes with Solaris 2 and Linux, both
  # of which come in different versions.
  
@@ -9,6 +9,8 @@ diff -ruN exim-3.20.orig/OS/Makefile-Default exim-3.20/OS/Makefile-Default
 +BASENAME_COMMAND=/bin/basename
  
  
+ # If you set STRIP_COMMAND to the path of the "strip" command, it will be run
+@@ -38,8 +38,8 @@
  # Some of the following commands live in different places in different OS. We
  # include them all here for generality.
  
@@ -19,7 +21,7 @@ diff -ruN exim-3.20.orig/OS/Makefile-Default exim-3.20/OS/Makefile-Default
  MV_COMMAND=/bin/mv
  RM_COMMAND=/bin/rm
  
-@@ -142,7 +142,7 @@
+@@ -149,7 +149,7 @@
  # parameters for include and library directories that may be needed for IPv6
  # on some systems.
  
@@ -28,3 +30,12 @@ diff -ruN exim-3.20.orig/OS/Makefile-Default exim-3.20/OS/Makefile-Default
  # IPV6_INCLUDE=-I /usr/ipv6/include
  # IPV6_LIBS=-L/usr/ipv6/libs -linet6
  
+@@ -259,7 +259,7 @@
+ 
+ # X11 contains the location of the X11 libraries and include files.
+ 
+-X11=/usr/X11R5
++X11=/usr/X11R6
+ 
+ # XINCLUDE contains options for header inclusion when compiling functions
+ # that call X11 functions.