View | Details | Raw Unified | Return to bug 75627
Collapse All | Expand All

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

Return to bug 75627