Don't install an empty manpage, there is one in the package, pointed

out in pr 6632 by Johnny C. Lam.

7 files changed, 34 insertions, 40 deletions

diff --git a/print/gv/Makefile b/print/gv/Makefile
index f6d9009a7e5..4f2f852a6c0 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/11/19 15:40:46 agc Exp $
+# $NetBSD: Makefile,v 1.16 1998/12/23 23:09:59 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/07/13 18:49:29 max Exp
 #
 
@@ -16,6 +16,9 @@ USE_IMAKE=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
+post-extract:
+	${MV} ${WRKSRC}/doc/gv.man ${WRKSRC}/source/
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@(cd ${WRKSRC}; ${MAKE} install.doc)
diff --git a/print/gv/patches/patch-aa b/print/gv/patches/patch-aa
index 8f54b37136e..4ddfd2e6b90 100644
--- a/print/gv/patches/patch-aa
+++ b/print/gv/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:11:25 agc Exp $
+$NetBSD: patch-aa,v 1.4 1998/12/23 23:09:59 frueauf Exp $
 
---- config.Unix.orig	Fri Jun  6 15:00:00 1997
-+++ config.Unix	Mon Jun  9 14:45:19 1997
+--- config.Unix.orig	Fri Jun  6 18:00:00 1997
++++ config.Unix	Tue Dec 22 01:07:53 1998
 @@ -32,10 +32,10 @@
  XCOMM --------------------------------------------------------------------
  XCOMM  Destination directories.
@@ -17,3 +17,12 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:11:25 agc Exp $
  
  XCOMM --------------------------------------------------------------------
  XCOMM --- The name of the Xaw3d library.
+@@ -110,7 +110,7 @@
+ XCOMM --------------------------------------------------------------------
+ XCOMM --- Use extra code for setenv() and getenv() ?
+ XCOMM --------------------------------------------------------------------
+-#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture)
++#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) && !defined(NetBSDArchitecture) && !defined(OpenBSDArchitecture)
+ #   define USE_SETENV_CODE
+ #endif
+ 
diff --git a/print/gv/patches/patch-ab b/print/gv/patches/patch-ab
index e871ea2922d..cc45fcd8dfd 100644
--- a/print/gv/patches/patch-ab
+++ b/print/gv/patches/patch-ab
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:11:25 agc Exp $
+$NetBSD: patch-ab,v 1.3 1998/12/23 23:09:59 frueauf Exp $
 
---- doc/Imakefile.orig	Fri Jun  6 15:00:00 1997
-+++ doc/Imakefile	Mon Jun  9 14:36:59 1997
-@@ -27,7 +27,7 @@
+--- doc/Imakefile.orig	Fri Jun  6 18:00:00 1997
++++ doc/Imakefile	Tue Dec 22 01:28:02 1998
+@@ -27,10 +27,6 @@
  GV_CONFIG_FILE = ../config.Unix
  #include "../config.Unix"
  
 -MANDIR=$(GV_MANDIR)
-+XCOMM MANDIR=$(GV_MANDIR)
- 
- ComplexProgramTarget(gv)
- 
+-
+-ComplexProgramTarget(gv)
+-
+ #ifndef InstallDocFiles
+ #define InstallDocFiles(file,destdir)				@@\
+ install.doc::							@@\
diff --git a/print/gv/patches/patch-ac b/print/gv/patches/patch-ac
deleted file mode 100644
index 548643a487e..00000000000
--- a/print/gv/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:11:25 agc Exp $
-
---- config.Unix.orig	Sun Nov 30 00:39:51 1997
-+++ config.Unix	Sun Nov 30 00:44:34 1997
-@@ -110,7 +110,7 @@
- XCOMM --------------------------------------------------------------------
- XCOMM --- Use extra code for setenv() and getenv() ?
- XCOMM --------------------------------------------------------------------
--#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture)
-+#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) && !defined(NetBSDArchitecture) && !defined(OpenBSDArchitecture)
- #   define USE_SETENV_CODE
- #endif
- 
diff --git a/print/gv/patches/patch-ad b/print/gv/patches/patch-ad
deleted file mode 100644
index 87686c368b2..00000000000
--- a/print/gv/patches/patch-ad
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:11:26 agc Exp $
-
---- /dev/null	Sun Nov 30 04:26:34 1997
-+++ source/gv.man	Sun Nov 30 04:30:01 1997
-@@ -0,0 +1 @@
-+
diff --git a/print/gv/patches/patch-ae b/print/gv/patches/patch-ae
index 9e695a201b7..8a0c74ee977 100644
--- a/print/gv/patches/patch-ae
+++ b/print/gv/patches/patch-ae
@@ -1,13 +1,12 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:11:26 agc Exp $
+$NetBSD: patch-ae,v 1.3 1998/12/23 23:10:00 frueauf Exp $
 
---- source/Imakefile.orig	Sun Dec 28 09:04:12 1997
-+++ source/Imakefile	Sun Dec 28 09:04:18 1997
-@@ -210,7 +210,7 @@
+--- source/Imakefile.orig	Fri Jun 20 18:00:00 1997
++++ source/Imakefile	Tue Dec 22 02:00:09 1998
+@@ -210,7 +210,6 @@
  InstallProgramWithFlags(program,$(GV_BINDIR),NullParameter)
  #endif /* InstallProgram */
  
 -MANDIR=$(GV_MANDIR)
-+XCOMM MANDIR=$(GV_MANDIR)
  ComplexProgramTarget(gv)
  InstallNonExec($(GV_SYSTEM_AD),$(GV_LIBDIR))
  InstallNonExec($(GV_USER_AD),$(GV_LIBDIR))
diff --git a/print/gv/patches/patch-af b/print/gv/patches/patch-af
index e1cf630c01c..12e0f597c19 100644
--- a/print/gv/patches/patch-af
+++ b/print/gv/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:11:26 agc Exp $
+$NetBSD: patch-af,v 1.3 1998/12/23 23:10:00 frueauf Exp $
 
---- Imakefile.orig	Sat Jun  7 00:00:00 1997
-+++ Imakefile	Sun Dec 28 09:14:47 1997
+--- Imakefile.orig	Fri Jun  6 18:00:00 1997
++++ Imakefile	Tue Dec 22 01:55:12 1998
 @@ -42,7 +42,7 @@
  DEPSUBDIRS 		= doc doc/source source	/* make depend */
  INSTALLSUBDIRS		= source		/* make install */
  INCLUDESSUBDIRS 	= source		/* make includes */
 -INSTALLMANSUBDIRS 	= doc			/* make install.man */
-+INSTALLMANSUBDIRS 	= doc source		/* make install.man */
++INSTALLMANSUBDIRS 	= source		/* make install.man */
  INSTALLDOCSUBDIRS 	= doc			/* make install.doc */
  
  MakeSubdirs($(SUBDIRS))