- Update to 3.6.2

PR:		ports/105034
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
Approved by:	maintainer timeout

7 files changed, 18 insertions, 85 deletions

diff --git a/print/gv/Makefile b/print/gv/Makefile
index 51143d2e37b1..3b967d9a0e66 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gv
-PORTVERSION=	3.6.1
+PORTVERSION=	3.6.2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,11 +24,9 @@ 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
+CONFIGURE_ARGS=	--libdir=${PREFIX}/lib/X11 \
+		--mandir=${MANPREFIX}/man \
+		--infodir=${PREFIX}/${INFO_PATH}
 
 MAN1=		gv.1
 INFO=		gv
@@ -40,7 +38,6 @@ PLIST_FILES=	bin/gv \
 		lib/X11/gv/gv_system.ad \
 		lib/X11/gv/gv_user.ad \
 		lib/X11/gv/gv_user_res.dat
-
 PLIST_DIRS=	lib/X11/gv
 
 post-install:
diff --git a/print/gv/distinfo b/print/gv/distinfo
index 0831ba62898f..919e71efed35 100644
--- a/print/gv/distinfo
+++ b/print/gv/distinfo
@@ -1,3 +1,3 @@
-MD5 (gv-3.6.1.tar.gz) = ace080d647b70f46fca7946e9543b79e
-SHA256 (gv-3.6.1.tar.gz) = 37eb3f58b62441ce62544cdd81c096713ddeeb454e313c3b3b7a93970e85bd08
-SIZE (gv-3.6.1.tar.gz) = 453921
+MD5 (gv-3.6.2.tar.gz) = dcdb2205cf0c61394419e015c7548df1
+SHA256 (gv-3.6.2.tar.gz) = 778e79832dd374238a916d8f202f405775de38422477bd6c60bb1aa7845c82f9
+SIZE (gv-3.6.2.tar.gz) = 446040
diff --git a/print/gv/files/patch-doc__gv.texi b/print/gv/files/patch-doc__gv.texi
new file mode 100644
index 000000000000..c6f4f2720312
--- /dev/null
+++ b/print/gv/files/patch-doc__gv.texi
@@ -0,0 +1,11 @@
+--- doc/gv.texi.orig	Fri Sep 15 04:51:20 2006
++++ doc/gv.texi	Mon Oct 16 04:03:24 2006
+@@ -9,7 +9,7 @@
+ 
+ @copying
+ This is the @value{EDITION} edition of the @cite{GNU gv Manual},
+-updated for gv version @value{VERSION}.
++updated for gv version @value{GVVER}.
+ 
+ Copyright @copyright{} 1995, 1996, 1997 Johannes Plass
+ 
diff --git a/print/gv/files/patch-src::file.c b/print/gv/files/patch-src::file.c
deleted file mode 100644
index 1817d45d4b10..000000000000
--- a/print/gv/files/patch-src::file.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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::main.c b/print/gv/files/patch-src::main.c
deleted file mode 100644
index 5b4e13e9513e..000000000000
--- a/print/gv/files/patch-src::main.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 9f843c8ee0a5..000000000000
--- a/print/gv/files/patch-src::ps.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
deleted file mode 100644
index e9372fb068c0..000000000000
--- a/print/gv/files/patch-src::resource.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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);