Subject: pkg/28502: print/gv is outdated, patch included
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Stefan Krüger <skrueger@meinberlikomm.de>
List: pkgsrc-bugs
Date: 12/01/2004 20:48:01
>Number: 28502
>Category: pkg
>Synopsis: print/gv is outdated
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Wed Dec 01 20:48:00 +0000 2004
>Originator: Stefan Krüger
>Release: NetBSD 2.99.10
>Organization:
>Environment:
System: NetBSD dsl-217-9-35-120.berlikomm.net 2.99.10 NetBSD 2.99.10 (PLUTO) #0: Mon Nov 29 19:59:45 CET 2004 space7@dsl-62-220-19-35.berlikomm.net:/usr/obj/cvsroot/src/sys/arch/i386/compile/PLUTO i386
Architecture: i386
Machine: i386
>Description:
from gnu.announce:
GNU gv 3.6.0 has been released today. It is available for download in
the GNU ftp, ftp://ftp.gnu.org/gnu/gv
This is the first release since 1997, when Johannes Plass (original gv
author) released gv 3.5.8.
Changes on this release:
- New build system using GNU Autotools.
- Documentation is now distributed in the texinfo format.
- Some bugs (some of them critical) has been fixed.
>How-To-Repeat:
cd ../pkgsrc/print/gv && make
>Fix:
I hope I've got everything right, pls check :-)
diff -uNr --exclude CVS gv.old/Makefile gv/Makefile
--- gv.old/Makefile 2004-12-01 21:06:30.000000000 +0100
+++ gv/Makefile 2004-12-01 21:35:07.000000000 +0100
@@ -2,45 +2,32 @@
# 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
+WRKSRC= ${WRKDIR}/gv
+USE_GNU_TOOLS+= make
+
USE_BUILDLINK3= yes
-USE_IMAKE= # defined
+GNU_CONFIGURE= yes
+USE_X11= yes
XAW_TYPE?= 3d
-IMAKEOPTS+= -DCONVERT_INCLUDE_DIRECTIVES
+USE_MAKEINFO= yes
+INFO_FILES= gv.info
.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
-
# We need Xaw3d to build.
.if ${XAW_TYPE} == "standard"
XAW_TYPE:= 3d
.endif
-post-extract:
- ${MV} ${WRKSRC}/doc/gv.man ${WRKSRC}/source/
-
-post-install:
- cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install.doc
-
.include "../../mk/xaw.buildlink3.mk"
-.include "../../mk/ghostscript.mk"
+#.include "../../mk/ghostscript.mk"
.include "../../mk/bsd.pkg.mk"
diff -uNr --exclude CVS gv.old/PLIST gv/PLIST
--- gv.old/PLIST 2004-12-01 21:06:30.000000000 +0100
+++ gv/PLIST 2004-12-01 21:41:40.000000000 +0100
@@ -1,30 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/03 02:56:01 jschauma Exp $
+@comment $NetBSD$
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 -uNr --exclude CVS gv.old/distinfo gv/distinfo
--- gv.old/distinfo 2004-12-01 21:06:30.000000000 +0100
+++ gv/distinfo 2004-12-01 21:12:39.000000000 +0100
@@ -1,12 +1,4 @@
$NetBSD: distinfo,v 1.7 2004/07/24 00:06:23 reed 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 -uNr --exclude CVS gv.old/patches/patch-aa gv/patches/patch-aa
--- gv.old/patches/patch-aa 2004-12-01 21:06:30.000000000 +0100
+++ gv/patches/patch-aa 1970-01-01 01:00:00.000000000 +0100
@@ -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 -uNr --exclude CVS gv.old/patches/patch-ab gv/patches/patch-ab
--- gv.old/patches/patch-ab 2004-12-01 21:06:30.000000000 +0100
+++ gv/patches/patch-ab 1970-01-01 01:00:00.000000000 +0100
@@ -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 -uNr --exclude CVS gv.old/patches/patch-ac gv/patches/patch-ac
--- gv.old/patches/patch-ac 2004-12-01 21:06:30.000000000 +0100
+++ gv/patches/patch-ac 1970-01-01 01:00:00.000000000 +0100
@@ -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 -uNr --exclude CVS gv.old/patches/patch-ae gv/patches/patch-ae
--- gv.old/patches/patch-ae 2004-12-01 21:06:30.000000000 +0100
+++ gv/patches/patch-ae 1970-01-01 01:00:00.000000000 +0100
@@ -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 -uNr --exclude CVS gv.old/patches/patch-af gv/patches/patch-af
--- gv.old/patches/patch-af 2004-12-01 21:06:30.000000000 +0100
+++ gv/patches/patch-af 1970-01-01 01:00:00.000000000 +0100
@@ -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 -uNr --exclude CVS gv.old/patches/patch-ag gv/patches/patch-ag
--- gv.old/patches/patch-ag 2004-12-01 21:06:30.000000000 +0100
+++ gv/patches/patch-ag 1970-01-01 01:00:00.000000000 +0100
@@ -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 -uNr --exclude CVS gv.old/patches/patch-ah gv/patches/patch-ah
--- gv.old/patches/patch-ah 2004-12-01 21:06:30.000000000 +0100
+++ gv/patches/patch-ah 1970-01-01 01:00:00.000000000 +0100
@@ -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 -uNr --exclude CVS gv.old/patches/patch-ai gv/patches/patch-ai
--- gv.old/patches/patch-ai 2004-12-01 21:06:30.000000000 +0100
+++ gv/patches/patch-ai 1970-01-01 01:00:00.000000000 +0100
@@ -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)
>Unformatted: