Patch x11/rxvt-unicode to make it work on Mac OS X 10.7.

ok wiz

3 files changed, 66 insertions, 8 deletions

diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 70ae3d2e426..25237f65d73 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2012/06/15 23:06:04 dholland Exp $
+# $NetBSD: Makefile,v 1.37 2012/06/26 20:10:48 riastradh Exp $
 
 DISTNAME=		rxvt-unicode-9.15
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11
 MASTER_SITES=		http://dist.schmorp.de/rxvt-unicode/ \
 			http://dist.schmorp.de/rxvt-unicode/Attic/
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index c4e86e82bf8..33d86c588e7 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.15 2012/02/29 18:49:40 morr Exp $
+$NetBSD: distinfo,v 1.16 2012/06/26 20:10:48 riastradh Exp $
 
 SHA1 (rxvt-unicode-9.15.tar.bz2) = e6fdf091860ecb458730dc68b0176f67f207a2f7
 RMD160 (rxvt-unicode-9.15.tar.bz2) = 80b33c123edee498f267147b5c2361a81c42f160
 Size (rxvt-unicode-9.15.tar.bz2) = 894764 bytes
-SHA1 (patch-ac) = 22c2e28a5b0ece42fbdbbafa85a8cec80f1d8277
+SHA1 (patch-Makefile.in) = 2784e040db2c6fce7ae49ee47a6dadc57bf63a5b
+SHA1 (patch-ac) = a880038b89ae828ec07678fd456f7de584554585
 SHA1 (patch-configure) = 81480aec100fff239ca075f9e7dc45b1a34d0436
+SHA1 (patch-libecb_ecb.h) = d3ee43509def82b78e5414ff600278e2a927a756
+SHA1 (patch-libev_ev.c) = cc6b575d31ad671e6ce4af02e150697a7b2803d6
+SHA1 (patch-src_Makefile.in) = 5fc95d3fe2bdd429d9634f5ad783cdcbede3a17e
diff --git a/x11/rxvt-unicode/patches/patch-ac b/x11/rxvt-unicode/patches/patch-ac
index 7cf9cb66598..f5812e73b53 100644
--- a/x11/rxvt-unicode/patches/patch-ac
+++ b/x11/rxvt-unicode/patches/patch-ac
@@ -1,15 +1,69 @@
-$NetBSD: patch-ac,v 1.1 2009/03/06 00:20:27 snj Exp $
+$NetBSD: patch-ac,v 1.2 2012/06/26 20:10:49 riastradh Exp $
 
 Undo upstream revision 1.45, which was done in the name of simplification.
 
---- doc/Makefile.in.orig	2009-02-24 13:22:58.000000000 -0800
-+++ doc/Makefile.in	2009-02-24 13:23:28.000000000 -0800
-@@ -98,7 +98,7 @@ install: all
+Mark phony targets as such.  Upstream rejected:
+
+http://lists.schmorp.de/pipermail/rxvt-unicode/2010q2/001186.html
+
+--- doc/Makefile.in.orig	2011-12-28 02:31:26.000000000 +0000
++++ doc/Makefile.in
+@@ -22,6 +22,7 @@ INSTALL_DATA = @INSTALL@ -m 644
+ srcdir =	@srcdir@
+ VPATH =		@srcdir@
+ 
++.PHONY: first_rule dummy
+ first_rule: all
+ dummy:
+ 
+@@ -35,6 +36,7 @@ SEDREPLACE = -e 's%@@RXVT_VERSION@@%$(VE
+ 
+ POD2MAN = pod2man -n @@RXVT_NAME@@ -r @@RXVT_VERSION@@ -q\" -c "RXVT-UNICODE"
+ 
++.PHONY: all
+ all:
+ 	sed $(SEDREPLACE) < $(srcdir)/rxvt.1.man.in  >rxvt.1.man
+ 	sed $(SEDREPLACE) < $(srcdir)/rxvtc.1.man.in >rxvtc.1.man
+@@ -74,25 +76,32 @@ rxvtperl.3.pod: ../src/urxvt.pm
+ $(srcdir)/etc/rxvt-unicode.termcap: $(srcdir)/etc/rxvt-unicode.terminfo
+ 	tic -C $< >$@
+ 
++.PHONY: tags allbin
+ tags allbin:
+ 
++.PHONY: alldoc
+ alldoc: rxvt.1.man.in rxvt.7.man.in rxvtc.1.man.in rxvtd.1.man.in rxvtperl.3.man.in \
+ 	../README.configure ../README.FAQ \
+ 	$(srcdir)/etc/rxvt-unicode.termcap
+ 
++.PHONY: clean
+ clean:
+ 	rm -f rxvt.1.man rxvt.7.man rxvtc.1.man rxvtd.1.man rxvtperl.3.man
+ 
++.PHONY: distclean
+ distclean: clean
+ 	rm -f Makefile
+ 
++.PHONY: realclean
+ realclean: distclean
+ 	rm -f rxvt.1.man.in rxvt.7.man.in rxvtc.1.man.in rxvtd.1.man.in rxvtperl.3.man.in
+ 	rm -f ../README.configure ../README.FAQ
+ 	rm -f $(srcdir)/etc/rxvt-unicode.termcap
+ 
++.PHONY: cleandir
+ cleandir: realclean
+ 
++.PHONY: install
+ install: all
+ 	$(INSTALL) -d $(DESTDIR)$(man1dir)
+ 	$(INSTALL) -d $(DESTDIR)$(man7dir)
+@@ -102,7 +111,8 @@ install: all
  	$(INSTALL_DATA) rxvt.7.man  $(DESTDIR)$(man7dir)/$(RXVTNAME).$(man7ext)
  @IF_PERL@	$(INSTALL) -d $(DESTDIR)$(man3dir)
  @IF_PERL@	$(INSTALL_DATA) rxvtperl.3.man $(DESTDIR)$(man3dir)/$(RXVTNAME)perl.$(man3ext)
 -	@TIC@ $(srcdir)/etc/rxvt-unicode.terminfo
 +	if test -x "@TIC@"; then if test -n "@TIC@"; then @TIC@ $(srcdir)/etc/rxvt-unicode.terminfo; fi; fi
  
++.PHONY: distdepend
  distdepend: alldoc