7 files changed, 71 insertions, 187 deletions

diff --git a/print/gv/Makefile b/print/gv/Makefile
index b6c386653c24..dbda448472d8 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,27 +1,24 @@
 # New ports collection makefile for:	gv
-# Version required:	gv_2_3_b1
+# Version required:	gv_2_7_b5
 # Date created:		16 Apr 1996
 # Whom:			thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.1.1.1 1996/04/17 07:01:09 tg Exp $
+# $Id: Makefile,v 1.2 1996/04/18 07:52:35 tg Exp $
 #
 
-DISTNAME=	gv_2_3_b1
-PKGNAME=	gv-2.3b1
+DISTNAME=	gv_2_7_b5
+PKGNAME=	gv-2.7b5
 CATEGORIES+=	print
-MASTER_SITES=	ftp://iphthf.physik.uni-mainz.de/pub/vms/linux/
+MASTER_SITES=	ftp://iphthf.physik.uni-mainz.de/pub/gv/unix/
 
-MAINTAINER=	thomas@ghpc8.ihf.rwth-aachen.de
+MAINTAINER=	tg@freebsd.org
 
 LIB_DEPENDS=	Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d
-RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript
+RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript4
 
 PATCH_STRIP=	-p1
 WRKSRC=		${WRKDIR}/gv
 USE_IMAKE=	yes
 
-pre-configure:
-	cp ${FILESDIR}/config.freebsd ${WRKSRC}
-
 .include <bsd.port.mk>
 
diff --git a/print/gv/distinfo b/print/gv/distinfo
index 72a2e03669ca..f02dfd8ca06e 100644
--- a/print/gv/distinfo
+++ b/print/gv/distinfo
@@ -1 +1 @@
-MD5 (gv_2_3_b1.tar.gz) = df1a8a04e5c83870550be9a25066fcd2
+MD5 (gv_2_7_b5.tar.gz) = 996ef53802d1c6492f0347b03e84dc03
diff --git a/print/gv/files/patch-aa b/print/gv/files/patch-aa
index 578654f796ac..77137e5a80b4 100644
--- a/print/gv/files/patch-aa
+++ b/print/gv/files/patch-aa
@@ -1,57 +1,58 @@
-diff -cr gv.orig/Imakefile gv/Imakefile
-*** gv.orig/Imakefile	Mon Mar  4 00:00:00 1996
---- gv/Imakefile	Tue Apr 16 18:35:59 1996
+*** gv/config.Unix.orig	Mon Aug 26 18:02:18 1996
+--- gv/config.Unix	Mon Aug 26 18:25:27 1996
 ***************
-*** 27,33 ****
-  XCOMM            Mainz, Germany
-  XCOMM 
+*** 28,34 ****
+  XCOMM ====================================================================
+  XCOMM === The print command.
+  XCOMM ====================================================================
+!       PRINT_COMMAND = lpr
+  
+  XCOMM ====================================================================
+  XCOMM === The name of the Xaw3d library.
+--- 28,34 ----
+  XCOMM ====================================================================
+  XCOMM === The print command.
+  XCOMM ====================================================================
+!       PRINT_COMMAND = lpr -s
+  
+  XCOMM ====================================================================
+  XCOMM === The name of the Xaw3d library.
+***************
+*** 77,94 ****
+  XCOMM ====================================================================
+  XCOMM === Destination directory for the gv manpage.
+  XCOMM ====================================================================
+!       MANDIR    = /usr/local/man/man1
   
-! #include "config.linux"
+  XCOMM ====================================================================
+  XCOMM === Destination directory for the gv executable.
+  XCOMM ====================================================================
+!       BINDIR    = /usr/local/bin
   
-  #define PassCDebugFlags
+  XCOMM ====================================================================
+  XCOMM === Destination directory for gv data files.
+  XCOMM === Must be terminated with a trailing '/'.
+  XCOMM ====================================================================
+!       GV_LIB	= /usr/local/lib/gv/
   
---- 27,33 ----
-  XCOMM            Mainz, Germany
-  XCOMM 
   
-! #include "config.freebsd"
   
-  #define PassCDebugFlags
+--- 77,94 ----
+  XCOMM ====================================================================
+  XCOMM === Destination directory for the gv manpage.
+  XCOMM ====================================================================
+! XCOMM      MANDIR    = /usr/local/man/man1
   
-diff -cr gv.orig/source/Imakefile gv/source/Imakefile
-*** gv.orig/source/Imakefile	Thu Mar  7 00:00:00 1996
---- gv/source/Imakefile	Tue Apr 16 18:41:38 1996
-***************
-*** 23,29 ****
-  XCOMM            Mainz, Germany
-  XCOMM 
+  XCOMM ====================================================================
+  XCOMM === Destination directory for the gv executable.
+  XCOMM ====================================================================
+! XCOMM      BINDIR    = /usr/local/bin
   
-! #include "../config.linux"
+  XCOMM ====================================================================
+  XCOMM === Destination directory for gv data files.
+  XCOMM === Must be terminated with a trailing '/'.
+  XCOMM ====================================================================
+!       GV_LIB	= $(LIBDIR)/gv/
   
-  SRCS	= 	\
-   Aaa.c		\
---- 23,29 ----
-  XCOMM            Mainz, Germany
-  XCOMM 
   
-! #include "../config.freebsd"
   
-  SRCS	= 	\
-   Aaa.c		\
-***************
-*** 109,115 ****
-  #endif
-  
-  DEFINES 	= -DNON_BLOCKING_IO $(SIGNAL_DEFINES) $(USER_DEFINES)
-! CC              = gcc
-  DEPLIBS		= XawClientDepLibs
-  SYS_LIBRARIES   = -lm XawClientLibs
-  INSTDATFLAGS	= -m 0644
---- 109,115 ----
-  #endif
-  
-  DEFINES 	= -DNON_BLOCKING_IO $(SIGNAL_DEFINES) $(USER_DEFINES)
-! XCOMM CC              = gcc
-  DEPLIBS		= XawClientDepLibs
-  SYS_LIBRARIES   = -lm XawClientLibs
-  INSTDATFLAGS	= -m 0644
diff --git a/print/gv/files/patch-ab b/print/gv/files/patch-ab
index 9f078ddd799c..bf805001805d 100644
--- a/print/gv/files/patch-ab
+++ b/print/gv/files/patch-ab
@@ -1,135 +1,19 @@
-diff -cr gv.orig/source/FileSel.c gv/source/FileSel.c
-*** gv.orig/source/FileSel.c	Mon Mar  4 00:00:00 1996
---- gv/source/FileSel.c	Tue Apr 16 19:00:11 1996
+*** gv/source/Imakefile.orig	Mon Aug 26 18:48:54 1996
+--- gv/source/Imakefile	Mon Aug 26 18:48:32 1996
 ***************
-*** 39,46 ****
-  #ifdef VMS
-  #   include <unixio.h> /* for chdir etc. */
-  #else
-- #   include <sys/stat.h>
-  #   include <sys/types.h>
-  #   include <dirent.h>
-  #   include <unistd.h>
-      /* Damn it, don't ever use getwd with stupid linux ###jp### */
---- 39,46 ----
-  #ifdef VMS
-  #   include <unixio.h> /* for chdir etc. */
-  #else
-  #   include <sys/types.h>
-+ #   include <sys/stat.h>
-  #   include <dirent.h>
-  #   include <unistd.h>
-      /* Damn it, don't ever use getwd with stupid linux ###jp### */
-diff -cr gv.orig/source/callbacks.c gv/source/callbacks.c
-*** gv.orig/source/callbacks.c	Tue Mar  5 00:00:00 1996
---- gv/source/callbacks.c	Tue Apr 16 19:04:46 1996
-***************
-*** 88,94 ****
-  #include "note.h"
-  #include "misc_private.h"
-  
-! #ifdef linux
-  #   include <sys/stat.h>
-  #   include <unistd.h>
-  #endif
---- 88,95 ----
-  #include "note.h"
-  #include "misc_private.h"
+*** 170,176 ****
+  GV_SOURCE_IMAKEFILE = ./Imakefile
   
-! #ifndef VMS
-! #   include <sys/types.h>
-  #   include <sys/stat.h>
-  #   include <unistd.h>
+  #if defined(USE_FALLBACK_RESOURCES) || defined(USE_FALLBACK_FILES)
+! depend:: $(APP_DEFAULTS_H) $(GV_MESSAGES_H)
   #endif
-diff -cr gv.orig/source/error.c gv/source/error.c
-*** gv.orig/source/error.c	Tue Mar  5 00:00:00 1996
---- gv/source/error.c	Tue Apr 16 19:11:16 1996
-***************
-*** 41,66 ****
-  #include INC_X11(Intrinsic.h)
   
-  #include "gv.h"
-! 
-! #ifdef VMS
-! #   ifdef __DECC
-! #      include <errno.h>
-! #      include <string.h>
-! #      ifndef __ERRNO_MAX
-! #         define __ERRNO_MAX 85
-! #      endif
-! #   else
-! #      include <errno.h>
-! #      include <perror.h>
-! #      include <string.h>
-! #   endif
-! #else
-!     extern int sys_nerr;
-!     extern char *sys_errlist[];
-! #   include <errno.h>
-!     /* BSD 4.3 errno.h does not declare errno */
-!     extern int errno;
-! #endif
+  AllTarget(gv)
+--- 170,176 ----
+  GV_SOURCE_IMAKEFILE = ./Imakefile
   
-  char* 
-  open_fail_error(errornumber,error_str,file_name,show)
---- 41,47 ----
-  #include INC_X11(Intrinsic.h)
-  
-  #include "gv.h"
-! #include "error.h"
-  
-  char* 
-  open_fail_error(errornumber,error_str,file_name,show)
-diff -cr gv.orig/source/error.h gv/source/error.h
-*** gv.orig/source/error.h	Tue Mar  5 00:00:00 1996
---- gv/source/error.h	Tue Apr 16 19:10:25 1996
-***************
-*** 39,46 ****
---- 39,48 ----
-  #      include <perror.h>
-  #   endif
-  #else
-+ #ifndef CSRG_BASED
-      extern int sys_nerr;
-      extern char *sys_errlist[];
-+ #endif
-  #   include <errno.h>
-      /* BSD 4.3 errno.h does not declare errno */
-      extern int errno;
-diff -cr gv.orig/source/paths.h gv/source/paths.h
-*** gv.orig/source/paths.h	Thu Mar  7 00:00:00 1996
---- gv/source/paths.h	Tue Apr 16 18:57:01 1996
-***************
-*** 34,42 ****
-  #   define INC_XMU(aaa) <XMU_DIRECTORY/aaa>
-  #   define INC_XAW(aaa) <XAW_DIRECTORY/aaa>
-  #else
-! #   define INC_X11(aaa) <X11/aaa>
-! #   define INC_XMU(aaa) <X11/Xmu/aaa>
-! #   define INC_XAW(aaa) <X11/Xaw3d/aaa>
-  #endif
-  
-  #endif /* _PATHS_H_ */
---- 34,42 ----
-  #   define INC_XMU(aaa) <XMU_DIRECTORY/aaa>
-  #   define INC_XAW(aaa) <XAW_DIRECTORY/aaa>
-  #else
-! #   define INC_X11(aaa) <X11/       ## aaa ## >
-! #   define INC_XMU(aaa) <X11/Xmu/   ## aaa ## >
-! #   define INC_XAW(aaa) <X11/Xaw3d/ ## aaa ## >
-  #endif
-  
-  #endif /* _PATHS_H_ */
-diff -cr gv.orig/source/zoom.c gv/source/zoom.c
-*** gv.orig/source/zoom.c	Tue Mar  5 00:00:00 1996
---- gv/source/zoom.c	Tue Apr 16 19:13:32 1996
-***************
-*** 34,39 ****
---- 34,40 ----
-  #ifdef VMS
-  #   include <stat.h>
-  #else
-+ #   include <sys/types.h>
-  #   include <sys/stat.h>
+  #if defined(USE_FALLBACK_RESOURCES) || defined(USE_FALLBACK_FILES)
+! depend:: $(APP_DEFAULTS_H) $(GV_MESSAGES_H) $(GV_INTERN_RES_H)
   #endif
   
+  AllTarget(gv)
diff --git a/print/gv/pkg-comment b/print/gv/pkg-comment
index 31644f15928f..e53849ad6252 100644
--- a/print/gv/pkg-comment
+++ b/print/gv/pkg-comment
@@ -1 +1 @@
-A postscript previewer.
+A PostScript and PDF previewer.
diff --git a/print/gv/pkg-descr b/print/gv/pkg-descr
index f990ba7a89df..8789f1f47817 100644
--- a/print/gv/pkg-descr
+++ b/print/gv/pkg-descr
@@ -1,3 +1,3 @@
-gv is an X11 postscript previewer based on Tim Theisen's
+gv is an X11 PostScript and PDF previewer based on Tim Theisen's
 ghostview-1.5.  It uses the Xaw3d widget set, thus providing a much
 nicer look and it's said to be a bit faster.
diff --git a/print/gv/pkg-plist b/print/gv/pkg-plist
index ee646c8bcad9..09ca7eb3d3f3 100644
--- a/print/gv/pkg-plist
+++ b/print/gv/pkg-plist
@@ -1,2 +1,4 @@
 bin/gv
 lib/X11/app-defaults/GV
+lib/X11/gv/gv_spartan.dat
+man/man1/gv.1.gz