Update to 3.6.0, based on patch sent by Stefan Krueger in PR pkg/28502.

Changes on this release:

o New build system using GNU Autotools.
o Documentation is now distributed in the texinfo format.
o Some bugs (some of them critical) has been fixed.

11 files changed, 25 insertions, 306 deletions

diff --git a/print/gv/Makefile b/print/gv/Makefile
index 096f3081ccf..8fcd7fbf751 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,45 +1,31 @@
-# $NetBSD: Makefile,v 1.44 2004/11/13 21:28:28 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2004/12/01 21:24:30 xtraeme Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/07/13 18:49:29 max Exp
 #
 
-DISTNAME=	gv-3.5.8
-PKGREVISION=	4
+DISTNAME=	gv-3.6.0
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftpthep.physik.uni-mainz.de/pub/gv/unix/
+MASTER_SITES=	${MASTER_SITE_GNU:=gv/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://wwwthep.physik.uni-mainz.de/~plass/gv/
+HOMEPAGE=	http://www.gnu.org/software/gv/
 COMMENT=	PostScript and PDF previewer
 
 USE_BUILDLINK3=		yes
-USE_IMAKE=		# defined
-XAW_TYPE?=		3d
-
-IMAKEOPTS+=		-DCONVERT_INCLUDE_DIRECTIVES
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux"
 USE_GNU_TOOLS+=		make
-.elif ${OPSYS} == "IRIX" && !empty(ABI)
-# Hack to put the correct path first -- otherwise, buildlink will first try to link X11BASE/lib
-.  if ${ABI} == "64"
-IMAKEOPTS+=		-DsgiABIopts="-L/usr/lib${ABI} -DLONG64"
-.  else
-IMAKEOPTS+=		-DsgiABIdefs=-L/usr/lib${ABI}
-.  endif
-.endif
+USE_X11=		yes
+GNU_CONFIGURE=		yes
+WRKSRC=			${WRKDIR}/gv
 
-# We need Xaw3d to build.
-.if ${XAW_TYPE} == "standard"
-XAW_TYPE:=	3d
-.endif
+USE_MAKEINFO=		yes
+INFO_FILES=		gv.info
 
-post-extract:
-	${MV} ${WRKSRC}/doc/gv.man ${WRKSRC}/source/
+XAW_TYPE=		3d
 
-post-install:
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install.doc
+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"
diff --git a/print/gv/PLIST b/print/gv/PLIST
index 297fa863336..c139999178c 100644
--- a/print/gv/PLIST
+++ b/print/gv/PLIST
@@ -1,30 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/03 02:56:01 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/12/01 21:24:30 xtraeme 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
-${IMAKE_MAN_DIR}/gv.${IMAKE_MANNEWSUFFIX}
-share/doc/gv/comments.doc.gz
-share/doc/gv/gs.interface.gz
-share/doc/gv/gv-faq.txt.gz
-share/doc/gv/gv.ps.gz
-share/doc/gv/key-bindings.txt.gz
-share/doc/html/gv/gv-1.html
-share/doc/html/gv/gv-10.html
-share/doc/html/gv/gv-11.html
-share/doc/html/gv/gv-12.html
-share/doc/html/gv/gv-13.html
-share/doc/html/gv/gv-2.html
-share/doc/html/gv/gv-3.html
-share/doc/html/gv/gv-4.html
-share/doc/html/gv/gv-5.html
-share/doc/html/gv/gv-6.html
-share/doc/html/gv/gv-7.html
-share/doc/html/gv/gv-8.html
-share/doc/html/gv/gv-9.html
-share/doc/html/gv/gv-faq.html
-share/doc/html/gv/gv.html
-@dirrm share/doc/html/gv
-@dirrm share/doc/gv
-@dirrm lib/X11/gv
+lib/gv/GV
+lib/gv/gv_class.ad
+lib/gv/gv_spartan.dat
+lib/gv/gv_system.ad
+lib/gv/gv_user.ad
+@dirrm lib/gv
diff --git a/print/gv/distinfo b/print/gv/distinfo
index 48d254a5e53..3fe089caf57 100644
--- a/print/gv/distinfo
+++ b/print/gv/distinfo
@@ -1,12 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/07/24 00:06:23 reed Exp $
+$NetBSD: distinfo,v 1.8 2004/12/01 21:24:30 xtraeme Exp $
 
-SHA1 (gv-3.5.8.tar.gz) = 5c67b41ee19887bf1efed4e958d09d3845a857aa
-Size (gv-3.5.8.tar.gz) = 369609 bytes
-SHA1 (patch-aa) = 9896cda759cf9d722030345fbaee0b757e73257f
-SHA1 (patch-ab) = 219c5b4b9402dd68dc4855eb8179f44d60e9d8af
-SHA1 (patch-ac) = 19c9eb3db6b670f41996a7e5d10aaca1b1f92835
-SHA1 (patch-ae) = c9ff70c144a793b3cb058aa039dd51e8991d8036
-SHA1 (patch-af) = 6148ce1f295c302b2a09d4f4b58a313ed55c8cc2
-SHA1 (patch-ag) = 06e9f2f8ce39dc821b0edd8231a2a8b2f40d7184
-SHA1 (patch-ah) = 99253c32e35bf10c7fdffc0903b095a6a8047ac2
-SHA1 (patch-ai) = 2f1a65de62e5defb6ccf5805c424bbcc8ddf0bea
+SHA1 (gv-3.6.0.tar.gz) = fbe0d9c3ca514dba9a83ba8fe3d6f79489a1c69c
+Size (gv-3.6.0.tar.gz) = 542676 bytes
diff --git a/print/gv/patches/patch-aa b/print/gv/patches/patch-aa
deleted file mode 100644
index e2d636c8dff..00000000000
--- a/print/gv/patches/patch-aa
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2004/07/24 00:06:23 reed Exp $
-
---- config.Unix.orig	Fri Jun  6 15:00:00 1997
-+++ config.Unix
-@@ -32,16 +32,17 @@ XCOMM ##################################
- XCOMM --------------------------------------------------------------------
- XCOMM  Destination directories.
- XCOMM --------------------------------------------------------------------
--      GV_BINDIR    = /usr/local/bin/
--      GV_DOCDIR    = /usr/local/doc/gv/
--      GV_LIBDIR    = /usr/local/lib/gv/
--      GV_MANDIR    = /usr/local/man/man1/
-+      GV_BINDIR    = $(BINDIR)
-+      GV_DOCDIR    = $(BINDIR)/../share/doc/gv
-+      GV_HTMLDIR   = $(BINDIR)/../share/doc/html/gv
-+      GV_LIBDIR    = $(LIBDIR)/gv/
-+      GV_MANDIR    = $(MANDIR)
- 
- XCOMM --------------------------------------------------------------------
- XCOMM --- The name of the Xaw3d library.
- XCOMM --------------------------------------------------------------------
- XCOMM XAWLIB = -lXaw
--      XAWLIB = -lXaw3d
-+      XAWLIB = ${LIBXAW}
- 
- XCOMM --------------------------------------------------------------------
- XCOMM  As far as the Xaw3d header files are concerned it is by
-@@ -110,7 +111,7 @@ XCOMM ----------------------------------
- XCOMM --------------------------------------------------------------------
- XCOMM --- Use extra code for setenv() and getenv() ?
- XCOMM --------------------------------------------------------------------
--#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture)
-+#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) && !defined(NetBSDArchitecture) && !defined(OpenBSDArchitecture) && !defined(DarwinArchitecture)
- #   define USE_SETENV_CODE
- #endif
- 
-@@ -206,6 +207,7 @@ XCOMM ----------------------------------
- XCOMM  Destination directory for the gv class resource file.
- XCOMM --------------------------------------------------------------------
- XCOMM XAPPLOADDIR	= /home/etc/class-defaults
-+      XAPPLOADDIR	= $(LIBDIR)/app-defaults
- 
- XCOMM ####################################################################
- XCOMM ##### Don't touch any of the settings below ... 
-@@ -244,12 +246,12 @@ XCOMM ----------------------------------
- XCOMM  My personal settings ...
- XCOMM --------------------------------------------------------------------
- 
--#ifdef LinuxArchitecture
--   ifdef GV_DEVELOPMENT_OPTIONS
--         XAPPLOADDIR  = /home/etc/class-defaults
--         CCOPTIONS    = -ansi -pedantic -Wall -Wmissing-declarations
--XCOMM     -Wredundant-decls -Wmissing-prototypes -Wconversion -Wstrict-prototypes
--   endif
--#endif
-+XCOMM #ifdef LinuxArchitecture
-+XCOMM   ifdef GV_DEVELOPMENT_OPTIONS
-+XCOMM         XAPPLOADDIR  = /home/etc/class-defaults
-+XCOMM         CCOPTIONS    = -ansi -pedantic -Wall -Wmissing-declarations
-+XCOMM XCOMM     -Wredundant-decls -Wmissing-prototypes -Wconversion -Wstrict-prototypes
-+XCOMM   endif
-+XCOMM #endif
- 
- 
diff --git a/print/gv/patches/patch-ab b/print/gv/patches/patch-ab
deleted file mode 100644
index afd4bcf5dff..00000000000
--- a/print/gv/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2000/12/08 16:23:16 jlam Exp $
-
---- doc/Imakefile.orig	Fri Jun  6 18:00:00 1997
-+++ doc/Imakefile
-@@ -27,10 +27,6 @@
- GV_CONFIG_FILE = ../config.Unix
- #include "../config.Unix"
- 
--MANDIR=$(GV_MANDIR)
--
--ComplexProgramTarget(gv)
--
- #ifndef InstallDocFiles
- #define InstallDocFiles(file,destdir)				@@\
- install.doc::							@@\
-@@ -52,4 +48,4 @@
- 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))
-+InstallDocFiles(gv*.html,$(GV_HTMLDIR))
diff --git a/print/gv/patches/patch-ac b/print/gv/patches/patch-ac
deleted file mode 100644
index 77021c9cf1a..00000000000
--- a/print/gv/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2003/09/01 10:17:36 cjep Exp $
---- source/paths.h.orig	1997-04-06 08:00:00.000000000 +1000
-+++ source/paths.h	2003-07-30 01:30:09.000000000 +1000
-@@ -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/patches/patch-ae b/print/gv/patches/patch-ae
deleted file mode 100644
index 176484a3bf8..00000000000
--- a/print/gv/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2001/03/09 15:49:54 wiz Exp $
-
---- source/Imakefile.orig	Fri Mar  9 16:45:44 2001
-+++ source/Imakefile
-@@ -210,7 +210,6 @@
- InstallProgramWithFlags(program,$(GV_BINDIR),NullParameter)
- #endif /* InstallProgram */
- 
--MANDIR=$(GV_MANDIR)
- ComplexProgramTarget(gv)
- InstallNonExec($(GV_SYSTEM_AD),$(GV_LIBDIR))
- InstallNonExec($(GV_USER_AD),$(GV_LIBDIR))
-@@ -311,7 +311,7 @@
- 	@echo ""							>> $(GV_INTERN_RES_DAT)
- 	@echo "GV.gsInterpreter:	gs" >> $(GV_INTERN_RES_DAT)
- 	@echo "GV.gsCmdScanPDF:	gs -dNODISPLAY -dQUIET -sPDFname=%s -sDSCname=%s pdf2dsc.ps -c quit" >> $(GV_INTERN_RES_DAT)
--	@echo "GV.gsCmdConvPDF:	gs -dNODISPLAY -dQUIET $(PS_LEVEL) -dNOPAUSE -sPSFile=%s %s -c quit" >> $(GV_INTERN_RES_DAT)
-+	@echo "GV.gsCmdConvPDF:	gs -dQUIET $(PS_LEVEL) -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=%s %s" >> $(GV_INTERN_RES_DAT)
- 	@echo "GV.gsX11Device:		-sDEVICE=x11" >> $(GV_INTERN_RES_DAT)
- 	@echo "GV.gsX11AlphaDevice:	-dNOPLATFONTS -sDEVICE=x11alpha" >> $(GV_INTERN_RES_DAT)
- 	@echo "GV.gsSafer:		True" >> $(GV_INTERN_RES_DAT)
diff --git a/print/gv/patches/patch-af b/print/gv/patches/patch-af
deleted file mode 100644
index 12e0f597c19..00000000000
--- a/print/gv/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.3 1998/12/23 23:10:00 frueauf Exp $
-
---- Imakefile.orig	Fri Jun  6 18:00:00 1997
-+++ Imakefile	Tue Dec 22 01:55:12 1998
-@@ -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 	= 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/patches/patch-ag b/print/gv/patches/patch-ag
deleted file mode 100644
index 01780864cc1..00000000000
--- a/print/gv/patches/patch-ag
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/10/04 03:00:12 itojun Exp $
-
-http://www.epita.fr/~bevand_m/asa/asa-0000
-
-diff -ur source/file.c source/file.c
---- source/file.c	1997-06-07 00:00:00.000000000 +0200
-+++ source/file.c	2002-09-26 23:56:00.000000000 +0200
-@@ -285,6 +285,22 @@
- }
- 
- /*############################################################*/
-+/* file_nameIsDangerous */
-+/*############################################################*/
-+
-+char *file_charsAllowedInName = "+,-./:=@\\^_";
-+
-+int
-+file_nameIsDangerous(fn)
-+  char *fn;
-+{
-+  for (; *fn; fn++)
-+    if (!isalnum(*fn) && !strchr(file_charsAllowedInName, *fn))
-+      return(1);
-+  return(0);
-+}
-+
-+/*############################################################*/
- /* file_pdfname2psname */
- /* If the file ends in .pdf, change this to .ps.*/
- /* Return pointer to temp copy if changed, else to input string. */
diff --git a/print/gv/patches/patch-ah b/print/gv/patches/patch-ah
deleted file mode 100644
index 39b18681613..00000000000
--- a/print/gv/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/10/04 03:00:12 itojun Exp $
-
-http://www.epita.fr/~bevand_m/asa/asa-0000
-
-diff -ur source/file.h source/file.h
---- source/file.h	1997-04-26 00:00:00.000000000 +0200
-+++ source/file.h	2002-09-26 23:28:38.000000000 +0200
-@@ -70,6 +70,14 @@
- #endif
- );
- 
-+extern char *file_charsAllowedInName;
-+
-+extern int			file_nameIsDangerous (
-+#if NeedFunctionPrototypes
-+   char *
-+#endif
-+);
-+
- extern char*			file_pdfname2psname (
- #if NeedFunctionPrototypes
-    char *	/* name */
diff --git a/print/gv/patches/patch-ai b/print/gv/patches/patch-ai
deleted file mode 100644
index 32c73017379..00000000000
--- a/print/gv/patches/patch-ai
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2002/10/04 03:00:12 itojun Exp $
-
-http://www.epita.fr/~bevand_m/asa/asa-0000
-
-diff -ur source/ps.c source/ps.c
---- source/ps.c	1997-06-07 00:00:00.000000000 +0200
-+++ source/ps.c	2002-09-27 00:29:35.000000000 +0200
-@@ -420,6 +420,16 @@
-       char cmd[512];
-       char s[512];
-       filename_unc=file_getTmpFilename(NULL,filename_raw);
-+      if (file_nameIsDangerous(filename))
-+	{
-+	  INFMESSAGE(the filename is dangerous)
-+	  sprintf(s, "The filename \"%s\" is dangerous: only alphanumeric "
-+		  "characters and \"%s\" are allowed.\n",
-+		  filename, file_charsAllowedInName);
-+	  NotePopupShowMessage(s);
-+	  ENDMESSAGE(psscan)
-+	  return(NULL);
-+	}
-       sprintf(cmd,cmd_uncompress,filename,filename_unc);
-       INFMESSAGE(is compressed)
-       INFSMESSAGE(uncompress command,cmd)
-@@ -491,6 +501,16 @@
-       char cmd[512];
-       char s[512];
-       filename_dsc=file_getTmpFilename(NULL,filename_raw);
-+      if (file_nameIsDangerous(filename))
-+	{
-+	  INFMESSAGE(the filename is dangerous)
-+	  sprintf(s, "The filename \"%s\" is dangerous: only alphanumeric "
-+		  "characters and \"%s\" are allowed.\n",
-+		  filename, file_charsAllowedInName);
-+	  NotePopupShowMessage(s);
-+	  ENDMESSAGE(psscan)
-+	  return(NULL);
-+	}
-       sprintf(cmd,cmd_scan_pdf,filename,filename_dsc);
-       INFMESSAGE(is PDF)
-       INFSMESSAGE(scan command,cmd)