Update to 3.6.1, based on a patch sent by "pancake" in PR pkg/28816. While

here, do some sorting and take maintainership.

Changes:
* configure.ac: Change reference source file on AC_INIT
* src/gv_message.h (displayed\n\): Fixed a typo on the help message.
* src/gv_misc_res.dat: Changed the Reopen label to Reload for the
  File menu.
* src/Makefile.am ($(srcdir)/gv_intern_res_unix.dat): Fix
  GV.gsCmdConvPDF in order to work.
* src/main.c (main): Process GNU arguments after X initialization
* configure.ac: Changed the scratch dir from ~/ to /tmp/

5 files changed, 30 insertions, 34 deletions

diff --git a/print/gv/Makefile b/print/gv/Makefile
index 5ac40b7ebfa..3b7c995e885 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,20 +1,18 @@
-# $NetBSD: Makefile,v 1.46 2004/12/08 03:51:54 minskim Exp $
+# $NetBSD: Makefile,v 1.47 2004/12/30 21:04:25 snj Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/07/13 18:49:29 max Exp
-#
 
-DISTNAME=	gv-3.6.0
+DISTNAME=	gv-3.6.1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNU:=gv/}
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	snj@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/gv/
 COMMENT=	PostScript and PDF previewer
 
+GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_X11=		yes
-GNU_CONFIGURE=		yes
-WRKSRC=			${WRKDIR}/gv
 
 USE_MAKEINFO=		yes
 TEXINFO_REQD=		4.2
@@ -22,12 +20,6 @@ INFO_FILES=		gv.info
 
 XAW_TYPE=		3d
 
-SUBST_CLASSES+=		sh
-SUBST_STAGE.sh=		post-patch
-SUBST_FILES.sh=		configure
-SUBST_SED.sh=		-e "s|==|=|g"
-SUBST_MESSAGE.sh=	"Fixing configure script."
-
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gv/PLIST b/print/gv/PLIST
index c139999178c..54b3af2dcd6 100644
--- a/print/gv/PLIST
+++ b/print/gv/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2004/12/01 21:24:30 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/12/30 21:04:25 snj Exp $
 bin/gv
 lib/gv/GV
 lib/gv/gv_class.ad
+lib/gv/gv_copyright.dat
 lib/gv/gv_spartan.dat
 lib/gv/gv_system.ad
 lib/gv/gv_user.ad
+lib/gv/gv_user_res.dat
+man/man1/gv.1
 @dirrm lib/gv
diff --git a/print/gv/distinfo b/print/gv/distinfo
index b803ee7bb91..4269721635f 100644
--- a/print/gv/distinfo
+++ b/print/gv/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2004/12/08 03:51:54 minskim Exp $
+$NetBSD: distinfo,v 1.10 2004/12/30 21:04:25 snj Exp $
 
-SHA1 (gv-3.6.0.tar.gz) = fbe0d9c3ca514dba9a83ba8fe3d6f79489a1c69c
-Size (gv-3.6.0.tar.gz) = 542676 bytes
-SHA1 (patch-aa) = 8dc4c7882e5416ec4773905e2f8700cdbea1c2cf
-SHA1 (patch-ab) = c2738bfc2db5f041fb0e1c73eff55c2b1895093c
+SHA1 (gv-3.6.1.tar.gz) = a094d019772e11c6003cc8682c945b7b9bc700b7
+Size (gv-3.6.1.tar.gz) = 453921 bytes
+SHA1 (patch-aa) = b494958693116143084279e306491fa49cd5386f
+SHA1 (patch-ab) = 1b97781ebbf51447d0cddd04f6bce30c42187294
 SHA1 (patch-ac) = eb1007d4a10b7e9bfcfa22ecd19d2694914ab208
diff --git a/print/gv/patches/patch-aa b/print/gv/patches/patch-aa
index 82199b0fce7..7f519751c4c 100644
--- a/print/gv/patches/patch-aa
+++ b/print/gv/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2004/12/08 03:51:54 minskim Exp $
+$NetBSD: patch-aa,v 1.12 2004/12/30 21:04:25 snj Exp $
 
---- src/main.c.orig	Mon Nov 15 22:34:31 2004
-+++ src/main.c
-@@ -256,6 +256,7 @@ int main(argc, argv)
+--- src/main.c.orig	2004-12-06 15:36:57.000000000 -0800
++++ src/main.c	2004-12-30 12:32:38.000000000 -0800
+@@ -321,6 +321,7 @@ int main(argc, argv)
      Dimension    maximum_width,maximum_height;
      unsigned int gwidth=0,gheight=0;
      int          dim_forced;
@@ -10,11 +10,11 @@ $NetBSD: patch-aa,v 1.11 2004/12/08 03:51:54 minskim Exp $
  
  /*###  initializing global variables ####################################*/
  
-@@ -284,7 +285,6 @@ int main(argc, argv)
- #endif
+@@ -420,7 +421,6 @@ int main(argc, argv)
  
-     /*### Manage GNU command line arguments ########################*/
--    int c;
-     while ((c = getopt_long (argc, argv, "vhu", GNU_longOptions, NULL))
- 	   != -1)
-       {
+    /*### 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/patches/patch-ab b/print/gv/patches/patch-ab
index 6e07b370667..02994b18664 100644
--- a/print/gv/patches/patch-ab
+++ b/print/gv/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2004/12/08 03:51:54 minskim Exp $
+$NetBSD: patch-ab,v 1.7 2004/12/30 21:04:25 snj Exp $
 
---- src/ps.c.orig	Mon Nov 15 14:43:29 2004
-+++ src/ps.c
-@@ -501,15 +501,15 @@ unc_ok:
+--- src/ps.c.orig	2004-12-07 15:55:59.000000000 -0800
++++ src/ps.c	2004-12-30 12:36:25.000000000 -0800
+@@ -531,16 +531,16 @@ unc_ok:
        doc->beginheader = position;
        section_len = line_len;
      } else if (iscomment(line,"%PDF-") && cmd_scan_pdf) {
@@ -15,10 +15,11 @@ $NetBSD: patch-ab,v 1.6 2004/12/08 03:51:54 minskim Exp $
        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);
-       INFMESSAGE(is PDF)
+       old_umask = umask(0077);