Fix for NetBSD, by soren@t.dk.

7 files changed, 55 insertions, 5 deletions

diff --git a/print/gv/Makefile b/print/gv/Makefile
index 2a3ee9402c3..b491546ab39 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,9 +1,10 @@
 # New ports collection makefile for:	gv
 # Version required:	gv-3.5.8
-# Date created:		16 Apr 1996
-# Whom:			tg@freebsd.org
+# Date created:		Nov 1997
+# Whom:			soren@t.dk
 #
-# $Id: Makefile,v 1.1.1.1 1997/12/29 02:38:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1997/12/29 02:42:26 hubertf Exp $
+# FreeBSD Id: Makefile,v 1.16 1997/07/13 18:49:29 max Exp
 #
 
 DISTNAME=	gv-3.5.8
@@ -16,6 +17,8 @@ LIB_DEPENDS=	Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d
 
 USE_IMAKE=	yes
 
+CAT1=		gv.0
+
 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 25d32adbd78..ff6422d5411 100644
--- a/print/gv/patches/patch-aa
+++ b/print/gv/patches/patch-aa
@@ -9,7 +9,7 @@
 -      GV_LIBDIR    = /usr/local/lib/gv/
 -      GV_MANDIR    = /usr/local/man/man1/
 +      GV_BINDIR    = $(BINDIR)
-+      GV_DOCDIR    = /usr/X11R6/share/doc/gv/
++      GV_DOCDIR    = $(BINDIR)/../share/doc/gv/
 +      GV_LIBDIR    = $(LIBDIR)/gv/
 +      GV_MANDIR    = $(MANDIR)
  
diff --git a/print/gv/patches/patch-ac b/print/gv/patches/patch-ac
new file mode 100644
index 00000000000..031008195f3
--- /dev/null
+++ b/print/gv/patches/patch-ac
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 00000000000..54efd12cee9
--- /dev/null
+++ b/print/gv/patches/patch-ad
@@ -0,0 +1,4 @@
+--- /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
new file mode 100644
index 00000000000..211c63f35b8
--- /dev/null
+++ b/print/gv/patches/patch-ae
@@ -0,0 +1,11 @@
+--- source/Imakefile.orig	Sun Dec 28 09:04:12 1997
++++ source/Imakefile	Sun Dec 28 09:04:18 1997
+@@ -210,7 +210,7 @@
+ 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
new file mode 100644
index 00000000000..16b70b1d02d
--- /dev/null
+++ b/print/gv/patches/patch-af
@@ -0,0 +1,20 @@
+--- Imakefile.orig	Sat Jun  7 00:00:00 1997
++++ Imakefile	Sun Dec 28 09:14:47 1997
+@@ -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 */
+ INSTALLDOCSUBDIRS 	= doc			/* make install.doc */
+ 
+ MakeSubdirs($(SUBDIRS))
+@@ -53,7 +53,7 @@
+ IncludesSubdirs($(INCLUDESSUBDIRS))
+ InstallSubdirs($(INSTALLSUBDIRS))
+ InstallManSubdirs($(INSTALLMANSUBDIRS))
+-InstallDocSubdirs($(INSTALLMANSUBDIRS))
++InstallDocSubdirs($(INSTALLDOCSUBDIRS))
+ 
+ 
+ 
diff --git a/print/gv/pkg/PLIST b/print/gv/pkg/PLIST
index 64826bb8ac5..6ef898839f2 100644
--- a/print/gv/pkg/PLIST
+++ b/print/gv/pkg/PLIST
@@ -1,9 +1,10 @@
+@comment $NetBSD: PLIST,v 1.2 1997/12/29 02:42:30 hubertf Exp $
 bin/gv
 lib/X11/app-defaults/GV
 lib/X11/gv/gv_class.ad
 lib/X11/gv/gv_system.ad
 lib/X11/gv/gv_user.ad
-man/man1/gv.1.gz
+man/cat1/gv.0.gz
 share/doc/gv/comments.doc.gz
 share/doc/gv/gs.interface.gz
 share/doc/gv/gv-1.html