Update to version 3.6.1

PR:		ports/75627
Submitted by:	Ports Fury

19 files changed, 137 insertions, 188 deletions

diff --git a/print/gv/Makefile b/print/gv/Makefile
index 23aa36287bcf..1bd99eb00351 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -7,31 +7,38 @@
 #
 
 PORTNAME=	gv
-PORTVERSION=	3.5.8
-PORTREVISION=	3
+PORTVERSION=	3.6.1
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftpthep.physik.uni-mainz.de/pub/gv/unix/  \
-		${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	support/ghostscript/gnu/gv/unix
-
-PATCHFILES=	gv_3.5.8-26.1.diff.gz
-PATCH_SITES=	http://security.debian.org/pool/updates/main/g/gv/
-PATCH_DIST_STRIP=	-p1
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A PostScript and PDF previewer
 
-USE_GHOSTSCRIPT= yes
-
 LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 
-USE_IMAKE=	yes
+USE_X_PREFIX=	yes
+USE_XPM=	yes
+USE_GHOSTSCRIPT=	yes
+USE_GETOPT_LONG=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--libdir=${PREFIX}/lib/X11
+
+CPPFLAGS=	-I${X11BASE}/include
+LDFLAGS=	-L${X11BASE}/lib
+
 MAN1=		gv.1
+INFO=		gv
+PLIST_FILES=	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
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install.doc)
-.endif
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/print/gv/distinfo b/print/gv/distinfo
index 03d44f243d80..34944f02421d 100644
--- a/print/gv/distinfo
+++ b/print/gv/distinfo
@@ -1,4 +1,2 @@
-MD5 (gv-3.5.8.tar.gz) = 8f2f0bd97395d6cea52926ddee736da8
-SIZE (gv-3.5.8.tar.gz) = 369609
-MD5 (gv_3.5.8-26.1.diff.gz) = f9910a58912e1a6fbaef33ff4fe27b94
-SIZE (gv_3.5.8-26.1.diff.gz) = 18453
+MD5 (gv-3.6.1.tar.gz) = ace080d647b70f46fca7946e9543b79e
+SIZE (gv-3.6.1.tar.gz) = 453921
diff --git a/print/gv/files/patch-aa b/print/gv/files/patch-aa
deleted file mode 100644
index a0cd7830b51c..000000000000
--- a/print/gv/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- config.Unix.orig	Fri Oct 18 11:54:17 2002
-+++ config.Unix	Fri Oct 18 11:55:45 2002
-@@ -32,10 +32,10 @@
- XCOMM --------------------------------------------------------------------
- XCOMM  Destination directories.
- XCOMM --------------------------------------------------------------------
--      GV_BINDIR    = /usr/X11R6/bin/
--      GV_DOCDIR    = /usr/share/doc/gv/
--      GV_LIBDIR    = /usr/X11R6/lib/X11/gv/
--      GV_MANDIR    = /usr/X11R6/man/man1/
-+      GV_BINDIR    = $(BINDIR)
-+      GV_DOCDIR    = $(PREFIX)/share/doc/gv/
-+      GV_LIBDIR    = $(LIBDIR)/gv/
-+      GV_MANDIR    = $(MANDIR)
- 
- XCOMM --------------------------------------------------------------------
- XCOMM --- The name of the Xaw3d library.
diff --git a/print/gv/files/patch-ab b/print/gv/files/patch-ab
deleted file mode 100644
index 9ffe11e320e6..000000000000
--- a/print/gv/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- doc/Imakefile.orig	Sat Jun  7 07:00:00 1997
-+++ doc/Imakefile	Wed Feb 21 06:44:54 2001
-@@ -27,7 +27,7 @@
- GV_CONFIG_FILE = ../config.Unix
- #include "../config.Unix"
- 
--MANDIR=$(GV_MANDIR)
-+XCOMM MANDIR=$(GV_MANDIR)
- 
- ComplexProgramTarget(gv)
- 
-@@ -52,4 +52,5 @@
- InstallDocFile(key-bindings.txt-gz,key-bindings.txt.gz,$(GV_DOCDIR))
- InstallDocFile(comments.doc-gz,comments.doc.gz,$(GV_DOCDIR))
- InstallDocFile(gv.ps-gz,gv.ps.gz,$(GV_DOCDIR))
--InstallDocFiles(gv*.html,$(GV_DOCDIR))
-+InstallDocFile(gv.html,gv.html,$(GV_DOCDIR))
-+InstallDocFiles(gv-*.html,$(GV_DOCDIR))
diff --git a/print/gv/files/patch-ac b/print/gv/files/patch-ac
deleted file mode 100644
index fa45131f82de..000000000000
--- a/print/gv/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./source/Imakefile.org	Fri Jun 20 15:00:00 1997
-+++ ./source/Imakefile	Thu Sep 21 17:13:55 2000
-@@ -211,7 +211,7 @@
- #endif /* InstallProgram */
- 
- MANDIR=$(GV_MANDIR)
--ComplexProgramTarget(gv)
-+ComplexProgramTargetNoMan(gv)
- InstallNonExec($(GV_SYSTEM_AD),$(GV_LIBDIR))
- InstallNonExec($(GV_USER_AD),$(GV_LIBDIR))
- InstallNonExec($(GV_CLASS_AD),$(GV_LIBDIR))
diff --git a/print/gv/files/patch-ad b/print/gv/files/patch-ad
deleted file mode 100644
index 269419eb6aec..000000000000
--- a/print/gv/files/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
---- doc/gv.man.orig	Sun Oct 20 07:50:47 2002
-+++ doc/gv.man	Sun Oct 20 07:50:58 2002
-@@ -3,7 +3,6 @@
- .if n .ds U \&"
- .if t .ds U ''
- .TH "gv" 1 
--.tr \&
- .nr bi 0
- .nr ll 0
- .nr el 0
diff --git a/print/gv/files/patch-source::paths.h b/print/gv/files/patch-source::paths.h
deleted file mode 100644
index 830cd717ab91..000000000000
--- a/print/gv/files/patch-source::paths.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- source/paths.h.orig Sun Apr  6 00:00:00 1997
-+++ source/paths.h      Fri Jul 18 19:18:09 2003
-@@ -34,9 +34,9 @@
- #   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##>
-+#   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 --git a/print/gv/files/patch-source::ps.c b/print/gv/files/patch-source::ps.c
deleted file mode 100644
index 88bd6361c2bc..000000000000
--- a/print/gv/files/patch-source::ps.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- source/ps.c.orig	Sat Feb  1 00:56:20 2003
-+++ source/ps.c	Sat Feb  1 01:17:43 2003
-@@ -1770,8 +1770,6 @@
-            (DSCcomment(line) && iscomment(line+2,(comment)))
- #define IS_BEGIN(comment)				\
-            (iscomment(line+7,(comment)))
--#define IS_END(comment)				\
--           (iscomment(line+5,(comment)))
- #define SKIP_WHILE(cond)				\
- 	   while (readline(fd, &line, NULL, &nbytes) && (cond)) *line_lenP += nbytes;\
-            skipped=1;
-@@ -1808,10 +1806,10 @@
- #endif
-    if  (!IS_COMMENT("Begin"))     {} /* Do nothing */
-    else if IS_BEGIN("Document:")  {  /* Skip the EPS without handling its content */
--            while (line && !IS_END("Document")) {
--               line = ps_io_fgetchars(fd,-1);
--               if (line) *line_lenP += FD_LINE_LEN;
--            }
-+            while ((line = ps_io_fgetchars(fd,-1)) && !IS_COMMENT("EndDocument"))
-+               *line_lenP += FD_LINE_LEN;
-+	    nbytes = line ? FD_LINE_LEN : 0;
-+	    skipped = 1;
-    }
-    else if IS_BEGIN("Feature:")   SKIP_UNTIL_1("EndFeature")
- #ifdef USE_ACROREAD_WORKAROUND
diff --git a/print/gv/files/patch-source::secscanf.c b/print/gv/files/patch-source::secscanf.c
deleted file mode 100644
index 6d80c865482b..000000000000
--- a/print/gv/files/patch-source::secscanf.c
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- source/secscanf.c	2002/10/18 09:04:10	1.1
-+++ source/secscanf.c	2002/10/18 09:12:07
-@@ -45,6 +45,21 @@
- static int	process_number(union scan_value *vp, const char **sp, char fmt);
- static int	process_char_class(const char **, const char **, int);
- 
-+#if __FreeBSD__
-+static char *
-+strndup(const char *src, size_t size)
-+{
-+	char *dst;
-+
-+	dst = malloc(size + 1);
-+	if (dst == NULL)
-+		return (NULL);
-+	dst[size] = '\0';
-+	strncpy(dst, src, size);
-+	return (dst);
-+}
-+#endif
-+
- static inline int
- set_conv_type(int *type, int new_type)
- {
-@@ -347,7 +362,7 @@
- 	case 'g':
- 	case 'e':
- 	case 'E':
--		vp->v_double = strtold(s, (char **) sp);
-+		vp->v_double = strtod(s, (char **) sp);
- 		break;
- 	default:
- 		return 0;
diff --git a/print/gv/files/patch-src-Makefile.in b/print/gv/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..e4f912c27194
--- /dev/null
+++ b/print/gv/files/patch-src-Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Mon Dec 20 04:17:13 2004
++++ src/Makefile.in	Wed Dec 29 23:06:46 2004
+@@ -233,7 +233,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat
+-appdefaultsdir = $(pkglibdir)
++appdefaultsdir = $(libdir)/app-defaults
+ appdefaults_DATA = GV
+ EXTRA_DIST = ad2c gv_font_res.dat gv_layout_res.dat gv_misc_res.dat Aaa_bison.yacc \
+            gv_current.xbm gv_doc.xbm gv_empty.xbm gv_even.xbm gv_icon.xbm gv_odd.xbm \
diff --git a/print/gv/files/patch-source::gv_misc_res.dat b/print/gv/files/patch-src-gv_misc_res.dat
index 0e8f9dc7d840..86d971fb6692 100644
--- a/print/gv/files/patch-source::gv_misc_res.dat
+++ b/print/gv/files/patch-src-gv_misc_res.dat
@@ -1,5 +1,5 @@
---- source/gv_misc_res.dat.orig	Sat Jun 21 07:00:00 1997
-+++ source/gv_misc_res.dat	Mon Apr  7 00:39:23 2003
+--- src/gv_misc_res.dat.bak	Mon Dec 20 01:21:45 2004
++++ src/gv_misc_res.dat	Wed Dec 29 22:58:43 2004
 @@ -463,7 +463,6 @@
   <Key>BackSpace:	GV_Page(up,left-bottom,!page-1,bottom-rightedge)\n\
   <Key>Insert:		GV_Page(page-5)		\n\
diff --git a/print/gv/files/patch-src::Makefile.in b/print/gv/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..e4f912c27194
--- /dev/null
+++ b/print/gv/files/patch-src::Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Mon Dec 20 04:17:13 2004
++++ src/Makefile.in	Wed Dec 29 23:06:46 2004
+@@ -233,7 +233,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat
+-appdefaultsdir = $(pkglibdir)
++appdefaultsdir = $(libdir)/app-defaults
+ appdefaults_DATA = GV
+ EXTRA_DIST = ad2c gv_font_res.dat gv_layout_res.dat gv_misc_res.dat Aaa_bison.yacc \
+            gv_current.xbm gv_doc.xbm gv_empty.xbm gv_even.xbm gv_icon.xbm gv_odd.xbm \
diff --git a/print/gv/files/patch-src::file.c b/print/gv/files/patch-src::file.c
new file mode 100644
index 000000000000..1817d45d4b10
--- /dev/null
+++ b/print/gv/files/patch-src::file.c
@@ -0,0 +1,13 @@
+--- src/file.c.orig	Wed Dec  8 08:37:40 2004
++++ src/file.c	Wed Dec 29 22:54:42 2004
+@@ -70,6 +70,10 @@
+ #   include <string.h>
+ #endif
+ 
++#ifndef ENODATA
++#define ENODATA 61
++#endif
++
+ 
+ /*############################################################*/
+ /* file_getDirOfPath */
diff --git a/print/gv/files/patch-src::gv_misc_res.dat b/print/gv/files/patch-src::gv_misc_res.dat
new file mode 100644
index 000000000000..86d971fb6692
--- /dev/null
+++ b/print/gv/files/patch-src::gv_misc_res.dat
@@ -0,0 +1,10 @@
+--- src/gv_misc_res.dat.bak	Mon Dec 20 01:21:45 2004
++++ src/gv_misc_res.dat	Wed Dec 29 22:58:43 2004
+@@ -463,7 +463,6 @@
+  <Key>BackSpace:	GV_Page(up,left-bottom,!page-1,bottom-rightedge)\n\
+  <Key>Insert:		GV_Page(page-5)		\n\
+  <Key>Delete:		GV_Page(page+5)		\n\
+- <Key>apLineDel:	GV_Page(page+5)		\n\
+  <Key>Home:		GV_Page(page=0)		\n\
+  <Key>End:		GV_Page(page=99999)	\n\
+  <Key>Prior:		GV_Page(page-1)		\n\
diff --git a/print/gv/files/patch-src::main.c b/print/gv/files/patch-src::main.c
new file mode 100644
index 000000000000..5b4e13e9513e
--- /dev/null
+++ b/print/gv/files/patch-src::main.c
@@ -0,0 +1,20 @@
+--- src/main.c.orig	Tue Dec  7 08:36:57 2004
++++ src/main.c	Wed Dec 29 23:06:28 2004
+@@ -321,6 +321,8 @@
+     Dimension    maximum_width,maximum_height;
+     unsigned int gwidth=0,gheight=0;
+     int          dim_forced;
++    int          opt_counter=0;
++    int          c;
+ 
+ /*###  initializing global variables ####################################*/
+ 
+@@ -419,8 +421,6 @@
+    }
+ 
+    /*### Manage GNU command line arguments ########################*/
+-   int opt_counter = 0;
+-   int c;
+    while ((c = getopt_long (argc, argv, "vhu", GNU_longOptions, NULL))
+ 	  != -1)
+      {
diff --git a/print/gv/files/patch-src::ps.c b/print/gv/files/patch-src::ps.c
new file mode 100644
index 000000000000..9f843c8ee0a5
--- /dev/null
+++ b/print/gv/files/patch-src::ps.c
@@ -0,0 +1,22 @@
+--- src/ps.c.orig	Wed Dec  8 08:55:59 2004
++++ src/ps.c	Wed Dec 29 22:57:48 2004
+@@ -532,15 +532,16 @@
+       section_len = line_len;
+     } else if (iscomment(line,"%PDF-") && cmd_scan_pdf) {
+       
+-      /* PDF hack to set DELAYSAFER on interpreter invocation */
+-      pdf_delaysafer_hack = 1;
+-
+       struct document *retval = NULL;
+       FILE *tmpfile = (FILE*)NULL;
+       char *filename_dsc;
+       char cmd[512];
+       char s[512];
+       mode_t old_umask;
++
++      /* PDF hack to set DELAYSAFER on interpreter invocation */
++      pdf_delaysafer_hack = 1;
++
+       filename_dsc=file_getTmpFilename(NULL,filename_raw);
+       sprintf(cmd,cmd_scan_pdf,filename,filename_dsc);
+       old_umask = umask(0077);
diff --git a/print/gv/files/patch-src::resource.c b/print/gv/files/patch-src::resource.c
new file mode 100644
index 000000000000..e9372fb068c0
--- /dev/null
+++ b/print/gv/files/patch-src::resource.c
@@ -0,0 +1,20 @@
+--- src/resource.c.orig	Sun Nov 14 10:16:12 2004
++++ src/resource.c	Wed Dec 29 22:06:11 2004
+@@ -121,7 +121,7 @@
+ {
+   XrmDatabase db=NULL;
+   String *sP;
+-  String s,t;
++  String s,t,rpath;
+   char tmp[GV_MAX_FILENAME_LENGTH];
+ #ifdef VMS
+   int b;
+@@ -150,7 +150,7 @@
+     //  s = XtResolvePathname(display,"app-defaults",NULL,NULL,NULL,NULL,0,NULL);
+     /* #endif */
+ 
+-    String rpath = GV_XtNewString(GV_LIBDIR);
++    rpath = GV_XtNewString(GV_LIBDIR);
+     if (rpath) {
+       INFSMESSAGE(merging system resource file into database,rpath)
+ 	XrmCombineFileDatabase(rpath,&db,True);
diff --git a/print/gv/pkg-descr b/print/gv/pkg-descr
index 8789f1f47817..a7a47db13801 100644
--- a/print/gv/pkg-descr
+++ b/print/gv/pkg-descr
@@ -1,3 +1,4 @@
-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.
+GNU gv allows to view and navigate through PostScript and PDF documents on
+an X display by providing a user interface for the ghostscript interpreter.
+
+WWW: http://www.gnu.org/software/gv/
diff --git a/print/gv/pkg-plist b/print/gv/pkg-plist
deleted file mode 100644
index 194b44e3d7fc..000000000000
--- a/print/gv/pkg-plist
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $FreeBSD$
-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
-share/doc/gv/comments.doc.gz
-share/doc/gv/gs.interface.gz
-share/doc/gv/gv-1.html
-share/doc/gv/gv-10.html
-share/doc/gv/gv-11.html
-share/doc/gv/gv-12.html
-share/doc/gv/gv-13.html
-share/doc/gv/gv-2.html
-share/doc/gv/gv-3.html
-share/doc/gv/gv-4.html
-share/doc/gv/gv-5.html
-share/doc/gv/gv-6.html
-share/doc/gv/gv-7.html
-share/doc/gv/gv-8.html
-share/doc/gv/gv-9.html
-share/doc/gv/gv-faq.html
-share/doc/gv/gv-faq.txt.gz
-share/doc/gv/gv.html
-share/doc/gv/gv.ps.gz
-share/doc/gv/key-bindings.txt.gz
-@dirrm lib/X11/gv
-@dirrm share/doc/gv