Update patches too

4 files changed, 9 insertions, 38 deletions

diff --git a/x11/rxvt-unicode/patches/patch-Makefile.in b/x11/rxvt-unicode/patches/patch-Makefile.in
index 0ab63c1c794..7a5f29b8e28 100644
--- a/x11/rxvt-unicode/patches/patch-Makefile.in
+++ b/x11/rxvt-unicode/patches/patch-Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile.in,v 1.2 2012/06/28 18:24:08 riastradh Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2013/01/20 13:38:20 morr Exp $
 
 Mark the `install' target as phony so that the file named `INSTALL'
 will not confuse make on case-insensitive file systems such as HFS+ on
@@ -6,7 +6,7 @@ Mac OS X.  Upstream rejected:
 
 http://lists.schmorp.de/pipermail/rxvt-unicode/2010q2/001185.html
 
---- Makefile.in.orig	2011-12-28 02:31:26.000000000 +0000
+--- Makefile.in.orig	2012-11-06 20:54:10.000000000 +0000
 +++ Makefile.in
 @@ -33,6 +33,8 @@ RECURSIVE_TARGETS = all allbin alldoc ta
  
diff --git a/x11/rxvt-unicode/patches/patch-configure b/x11/rxvt-unicode/patches/patch-configure
index 665126deb2d..df7a62429e1 100644
--- a/x11/rxvt-unicode/patches/patch-configure
+++ b/x11/rxvt-unicode/patches/patch-configure
@@ -1,12 +1,13 @@
-$NetBSD: patch-configure,v 1.1 2012/02/29 19:24:12 morr Exp $
+$NetBSD: patch-configure,v 1.2 2013/01/20 13:38:20 morr Exp $
 
---- configure.orig	2012-01-21 12:36:50.000000000 +0000
+Don't use predefined CXXFLAGS.
+
+--- configure.orig	2012-12-27 10:57:25.000000000 +0000
 +++ configure
-@@ -4452,33 +4452,6 @@ rm -f core conftest.err conftest.$ac_obj
- fi
+@@ -4474,32 +4474,6 @@ fi
  LINKER=$LINKER
  
--
+ 
 -if test -z "$orig_CXXFLAGS"; then
 -  if test x$GCC = xyes && test "x$GXX" = xyes; then
 -    CXXFLAGS="-g -O3 -fno-rtti -fvisibility-inlines-hidden -fno-threadsafe-statics -fno-enforce-eh-specs"
@@ -35,4 +36,4 @@ $NetBSD: patch-configure,v 1.1 2012/02/29 19:24:12 morr Exp $
 -
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setlocale" >&5
  $as_echo_n "checking for library containing setlocale... " >&6; }
- if test "${ac_cv_search_setlocale+set}" = set; then :
+ if ${ac_cv_search_setlocale+:} false; then :
diff --git a/x11/rxvt-unicode/patches/patch-libecb_ecb.h b/x11/rxvt-unicode/patches/patch-libecb_ecb.h
deleted file mode 100644
index 7af2c4bce7c..00000000000
--- a/x11/rxvt-unicode/patches/patch-libecb_ecb.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libecb_ecb.h,v 1.1 2012/06/26 20:14:31 riastradh Exp $
-
-Use the same memory fences with llvm-gcc as with gcc and clang.
-
---- libecb/ecb.h.orig	2012-01-18 12:50:33.000000000 +0000
-+++ libecb/ecb.h
-@@ -73,7 +73,7 @@
- #endif
- 
- #ifndef ECB_MEMORY_FENCE
--  #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || defined(__clang__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
-+  #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || defined(__llvm__) || defined(__clang__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
-     #if __i386 || __i386__
-       #define ECB_MEMORY_FENCE         __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
-       #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */
diff --git a/x11/rxvt-unicode/patches/patch-libev_ev.c b/x11/rxvt-unicode/patches/patch-libev_ev.c
deleted file mode 100644
index 4025eaf7842..00000000000
--- a/x11/rxvt-unicode/patches/patch-libev_ev.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libev_ev.c,v 1.1 2012/06/26 20:14:31 riastradh Exp $
-
-Use the same memory fences with llvm-gcc as with gcc and clang.
-
---- libev/ev.c.orig	2012-01-19 17:55:00.000000000 +0000
-+++ libev/ev.c
-@@ -541,7 +541,7 @@ struct signalfd_siginfo
- #endif
- 
- #ifndef ECB_MEMORY_FENCE
--  #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || defined(__clang__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
-+  #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || defined(__llvm__) || defined(__clang__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
-     #if __i386 || __i386__
-       #define ECB_MEMORY_FENCE         __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
-       #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */