Actually add patches to make rxvt-unicode build on Mac OS X 10.7.

It helps to run `cvs add' before adding files.

4 files changed, 183 insertions, 0 deletions

diff --git a/x11/rxvt-unicode/patches/patch-Makefile.in b/x11/rxvt-unicode/patches/patch-Makefile.in
new file mode 100644
index 00000000000..df42b7cd690
--- /dev/null
+++ b/x11/rxvt-unicode/patches/patch-Makefile.in
@@ -0,0 +1,76 @@
+$NetBSD: patch-Makefile.in,v 1.1 2012/06/26 20:14:31 riastradh Exp $
+
+Mark phony targets as such.  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
+@@ -24,6 +24,7 @@ VERNAME = rxvt-unicode-$(VERSION)
+ srcdir =	@srcdir@
+ VPATH =		@srcdir@
+ 
++.PHONY: first_rule dummy
+ first_rule: all
+ dummy:
+ 
+@@ -33,14 +34,17 @@ RECURSIVE_TARGETS = all allbin alldoc ta
+ 
+ #-------------------------------------------------------------------------
+ 
++.PHONY: $(RECURSIVE_TARGETS)
+ $(RECURSIVE_TARGETS):
+ 	@for I in $(subdirs); do (cd $$I; $(MAKE) $@) || exit 1; done
+ 
++.PHONY: distclean realclean
+ distclean realclean: distclean-local
+ 
+ #
+ # entry points for other programs
+ #
++.PHONY: rxvt
+ rxvt:
+ 	(cd src; $(MAKE))
+ 
+@@ -55,18 +59,23 @@ config.status:
+ config.h.in: configure.ac aclocal.m4 libev/libev.m4 libptytty/ptytty.m4
+ 	cd $(srcdir); ./autogen.sh
+ 
++.PHONY: check
+ check: all
+ 	echo "no tests"
+ 
++.PHONY: Makefiles
+ Makefiles:
+ 	$(SHELL) config.status
+ 
++.PHONY: cleandir
+ cleandir: realclean
+ 
++.PHONY: distclean-local
+ distclean-local:
+ 	rm -f config.cache config.h config.log config.status
+ 	rm -f Makefile
+ 
++.PHONY: distdir
+ distdir:
+ 	cd doc && $(MAKE) distdepend
+ 	cd src && $(MAKE) depend
+@@ -74,14 +83,17 @@ distdir:
+ 	mkdir $(VERNAME)
+ 	rsync -aR --copy-unsafe-links `cat MANIFEST` $(VERNAME)/.
+ 
++.PHONY: tar.gz
+ tar.gz: distdir
+ 	tar cvf - $(VERNAME) | gzip -vf9 > $(VERNAME).tar.gz
+ 	rm -rf $(VERNAME)
+ 
++.PHONY: tar.bz2
+ tar.bz2: distdir
+ 	tar cvf - $(VERNAME) | bzip2 -vf9 > $(VERNAME).tar.bz2
+ 	rm -rf $(VERNAME)
+ 
++.PHONY: dist
+ dist: tar.bz2
+ 
+ # ------------------------------------------------------------------------
diff --git a/x11/rxvt-unicode/patches/patch-libecb_ecb.h b/x11/rxvt-unicode/patches/patch-libecb_ecb.h
new file mode 100644
index 00000000000..7af2c4bce7c
--- /dev/null
+++ b/x11/rxvt-unicode/patches/patch-libecb_ecb.h
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..4025eaf7842
--- /dev/null
+++ b/x11/rxvt-unicode/patches/patch-libev_ev.c
@@ -0,0 +1,15 @@
+$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 */
diff --git a/x11/rxvt-unicode/patches/patch-src_Makefile.in b/x11/rxvt-unicode/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..ed98a05ac66
--- /dev/null
+++ b/x11/rxvt-unicode/patches/patch-src_Makefile.in
@@ -0,0 +1,77 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2012/06/26 20:14:31 riastradh Exp $
+
+Mark phony targets as such.  Upstream rejected:
+
+http://lists.schmorp.de/pipermail/rxvt-unicode/2010q2/001186.html
+
+--- src/Makefile.in.orig	2012-01-21 12:43:39.000000000 +0000
++++ src/Makefile.in
+@@ -27,6 +27,7 @@ PERLLIB = @PERLLIB@
+ srcdir =	@srcdir@
+ VPATH =		@srcdir@
+ 
++.PHONY: first_rule dummy
+ first_rule: all
+ dummy:
+ 
+@@ -56,6 +57,7 @@ RXVTD_BINNAME=$(DESTDIR)$(bindir)/$(RXVT
+ 
+ #-------------------------------------------------------------------------
+ 
++.PHONY: all
+ all: allbin
+ 
+ rxvt: rxvt.o $(COMMON)
+@@ -77,22 +79,29 @@ tags: *.[Ch]
+ TAGS: *.[Ch]
+ 	etags $(EXUBERANT_OPTS) *.[Ch]
+ 
++.PHONY: allbin
+ allbin: rxvt rxvtd rxvtc
+ 
++.PHONY: alldoc
+ alldoc:
+ 
++.PHONY: clean
+ clean:
+ 	rm -f rxvt rxvtc rxvtd perlxsi.c rxvtperl.C
+ 	rm -f *.o
+ 
++.PHONY: distclean
+ distclean: clean
+ 	rm -f Makefile
+ 
++.PHONY: realclean
+ realclean: distclean
+ 	rm -f tags TAGS
+ 
++.PHONY: cleandir
+ cleandir: realclean
+ 
++.PHONY: install-perl
+ install-perl:
+ @IF_PERL@	$(INSTALL) -d $(DESTDIR)$(libdir)
+ @IF_PERL@	$(INSTALL) -d $(DESTDIR)$(libdir)/urxvt
+@@ -100,12 +109,14 @@ install-perl:
+ @IF_PERL@	$(INSTALL_DATA) $(srcdir)/urxvt.pm $(DESTDIR)$(libdir)/urxvt/urxvt.pm
+ @IF_PERL@	for ext in $(srcdir)/perl/*; do test -f "$$ext" && $(INSTALL_DATA) "$$ext" $(DESTDIR)$(libdir)/urxvt/perl/; done
+ 
++.PHONY: install-bin
+ install-bin: allbin
+ 	$(INSTALL) -d $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROGRAM) rxvt  $(RXVT_BINNAME)
+ 	$(INSTALL_PROGRAM) rxvtc $(RXVTC_BINNAME)
+ 	$(INSTALL_PROGRAM) rxvtd $(RXVTD_BINNAME)
+ 
++.PHONY: install
+ install: install-bin install-perl
+ 
+ perlxsi.c: Makefile
+@@ -117,6 +128,7 @@ rxvtperl.C: rxvtperl.xs iom_perl.h iom_p
+ rxvtperl.o: rxvtperl.C perlxsi.c
+ 	$(COMPILE) $(PERLFLAGS) -DLIBDIR="\"$(libdir)/urxvt\"" -c $<
+ 
++.PHONY: depend
+ depend:
+ 	makedepend -f Makefile.in -I. -I.. -I../libev -I../libptytty/src -I../libecb -Y *.C >/dev/null 2>&1
+