From afaa4fbc3605f4818f099318206073c97b55c156 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Mon, 26 Mar 2012 14:00:40 +0000
Subject: Don't install cat pages.

---
 editors/nvi/Makefile         |  4 ++--
 editors/nvi/PLIST            |  5 +----
 editors/nvi/distinfo         |  4 ++--
 editors/nvi/patches/patch-bd | 27 ++++++++++++++++++++++++++-
 4 files changed, 31 insertions(+), 9 deletions(-)

(limited to 'editors/nvi')

diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile
index ed86dea7c3c..611a80e37d4 100644
--- a/editors/nvi/Makefile
+++ b/editors/nvi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2011/12/28 19:34:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2012/03/26 14:00:40 joerg Exp $
 
 DISTNAME=	nvi-1.81.6
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	editors
 MASTER_SITES=	${HOMEPAGE:Q}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/editors/nvi/PLIST b/editors/nvi/PLIST
index ccbcb97748e..d20eb144f37 100644
--- a/editors/nvi/PLIST
+++ b/editors/nvi/PLIST
@@ -1,11 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:53:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/03/26 14:00:40 joerg Exp $
 bin/nex
 bin/nvi
 bin/nview
 lib/libvi.la
-man/cat1/nex.0
-man/cat1/nvi.0
-man/cat1/nview.0
 man/man1/nex.1
 man/man1/nvi.1
 man/man1/nview.1
diff --git a/editors/nvi/distinfo b/editors/nvi/distinfo
index 4dac0b540b2..5c984ae4e98 100644
--- a/editors/nvi/distinfo
+++ b/editors/nvi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2011/12/26 01:54:39 sbd Exp $
+$NetBSD: distinfo,v 1.15 2012/03/26 14:00:40 joerg Exp $
 
 SHA1 (nvi-1.81.6.tar.bz2) = d3445ed69166102735335a2ff60d092d9a9143c6
 RMD160 (nvi-1.81.6.tar.bz2) = 0db8568bea96392d9a027044177c60317c8ade36
@@ -34,4 +34,4 @@ SHA1 (patch-az) = ba04f94a768c0c9d72f9810689c2f0c46e2e4e92
 SHA1 (patch-ba) = 7c292f358fca845c478dbedae88cafe2c9155c9c
 SHA1 (patch-bb) = 2b5b91418fdcbe36c17b4cb8f635846ca408b4eb
 SHA1 (patch-bc) = 49bf2469b6d22b190a7ed41f222ea80b8721e663
-SHA1 (patch-bd) = 143f5863d7e9168737cfa0cff0dee0c64577cc36
+SHA1 (patch-bd) = ac328bc7b7a5f3c9efa7530383710f253cae5c7f
diff --git a/editors/nvi/patches/patch-bd b/editors/nvi/patches/patch-bd
index 17f049f5fc8..13794ca42e1 100644
--- a/editors/nvi/patches/patch-bd
+++ b/editors/nvi/patches/patch-bd
@@ -1,4 +1,4 @@
-$NetBSD: patch-bd,v 1.1 2010/06/02 13:24:34 adam Exp $
+$NetBSD: patch-bd,v 1.2 2012/03/26 14:00:40 joerg Exp $
 
 --- ../dist/Makefile.in.orig	2010-06-01 08:47:30.000000000 +0000
 +++ ../dist/Makefile.in
@@ -11,3 +11,28 @@ $NetBSD: patch-bd,v 1.1 2010/06/02 13:24:34 adam Exp $
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CURSCPPFLAGS = @CURSCPPFLAGS@
+@@ -1698,24 +1698,7 @@ install-data-local: install_common
+ 	@[ -d $(DESTDIR)$(mandir) ] || \
+ 	    ($(mkdir) $(DESTDIR)$(mandir) && \
+ 	     $(chmod) $(dmode) $(DESTDIR)$(mandir))
+-	@[ -d $(DESTDIR)$(mandir)/cat1 ] || \
+-	    ($(mkdir) $(DESTDIR)$(mandir)/cat1 && \
+-	     $(chmod) $(dmode) $(DESTDIR)$(mandir)/cat1)
+ 	@echo "Installing man pages: $(DESTDIR)$(mandir) ..."
+-	@cd $(DESTDIR)$(mandir)/cat1 && \
+-	    $(rm) -f `echo vi.0 | sed '$(transform)'`
+-	@$(cp) $(visrcdir)/docs/vi.man/vi.0 \
+-	    $(DESTDIR)$(mandir)/cat1/`echo vi.0 | sed '$(transform)'`
+-	@cd $(DESTDIR)$(mandir)/cat1 && \
+-	    $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'`
+-	@cd $(DESTDIR)$(mandir)/cat1 && \
+-	    $(rm) -f `echo ex.0 | sed '$(transform)'`
+-	@cd $(DESTDIR)$(mandir)/cat1 && \
+-	    $(rm) -f `echo view.0 | sed '$(transform)'`
+-	@cd $(DESTDIR)$(mandir)/cat1 && $(ln) \
+-	    `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'`
+-	@cd $(DESTDIR)$(mandir)/cat1 && $(ln) \
+-	    `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'`
+ 	@[ -d $(DESTDIR)$(mandir)/man1 ] || \
+ 	    ($(mkdir) $(DESTDIR)$(mandir)/man1 && \
+ 	     $(chmod) $(dmode) $(DESTDIR)$(mandir)/man1)
-- 
cgit v1.2.3