Omit needless patches in last change; mark only `install' as phony.

ok wiz

5 files changed, 14 insertions, 203 deletions

diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 25237f65d73..a1b0ac379bc 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2012/06/26 20:10:48 riastradh Exp $
+# $NetBSD: Makefile,v 1.38 2012/06/28 18:24:08 riastradh Exp $
 
 DISTNAME=		rxvt-unicode-9.15
-PKGREVISION=		2
+PKGREVISION=		3
 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 33d86c588e7..fbd6ce90401 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.16 2012/06/26 20:10:48 riastradh Exp $
+$NetBSD: distinfo,v 1.17 2012/06/28 18:24:08 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-Makefile.in) = 2784e040db2c6fce7ae49ee47a6dadc57bf63a5b
-SHA1 (patch-ac) = a880038b89ae828ec07678fd456f7de584554585
+SHA1 (patch-Makefile.in) = 85ee285374d1d0f263c3506363cb5801caeb56f8
+SHA1 (patch-ac) = b421f949628dabe81fdbc8b8e9441526e309b4f4
 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-Makefile.in b/x11/rxvt-unicode/patches/patch-Makefile.in
index df42b7cd690..0ab63c1c794 100644
--- a/x11/rxvt-unicode/patches/patch-Makefile.in
+++ b/x11/rxvt-unicode/patches/patch-Makefile.in
@@ -1,76 +1,19 @@
-$NetBSD: patch-Makefile.in,v 1.1 2012/06/26 20:14:31 riastradh Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2012/06/28 18:24:08 riastradh Exp $
 
-Mark phony targets as such.  Upstream rejected:
+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
+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
-@@ -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
+@@ -33,6 +33,8 @@ RECURSIVE_TARGETS = all allbin alldoc ta
  
  #-------------------------------------------------------------------------
  
-+.PHONY: $(RECURSIVE_TARGETS)
++.PHONY: install
++
  $(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-ac b/x11/rxvt-unicode/patches/patch-ac
index f5812e73b53..11b17604877 100644
--- a/x11/rxvt-unicode/patches/patch-ac
+++ b/x11/rxvt-unicode/patches/patch-ac
@@ -1,69 +1,15 @@
-$NetBSD: patch-ac,v 1.2 2012/06/26 20:10:49 riastradh Exp $
+$NetBSD: patch-ac,v 1.3 2012/06/28 18:24:08 riastradh Exp $
 
 Undo upstream revision 1.45, which was done in the name of simplification.
 
-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
+@@ -102,7 +102,7 @@ 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
  
diff --git a/x11/rxvt-unicode/patches/patch-src_Makefile.in b/x11/rxvt-unicode/patches/patch-src_Makefile.in
index ed98a05ac66..e69de29bb2d 100644
--- a/x11/rxvt-unicode/patches/patch-src_Makefile.in
+++ b/x11/rxvt-unicode/patches/patch-src_Makefile.in
@@ -1,77 +0,0 @@
-$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
-