summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--print/gv/Makefile26
-rw-r--r--print/gv/PLIST20
-rw-r--r--print/gv/distinfo17
-rw-r--r--print/gv/patches/patch-aa8
-rw-r--r--print/gv/patches/patch-ab88
-rw-r--r--print/gv/patches/patch-ad23
-rw-r--r--print/gv/patches/patch-ae6
-rw-r--r--print/gv/patches/patch-af4
-rw-r--r--print/gv/patches/patch-aj15
9 files changed, 65 insertions, 142 deletions
diff --git a/print/gv/Makefile b/print/gv/Makefile
index dfb3ded4f7a..ec1fce8022b 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.70 2010/03/11 12:46:42 drochner Exp $
+# $NetBSD: Makefile,v 1.71 2010/07/24 08:22:02 obache Exp $
-DISTNAME= gv-3.6.3
-PKGREVISION= 2
+DISTNAME= gv-3.7.1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GNU:=gv/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/gv/
COMMENT= PostScript and PDF previewer
-LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake gs:run makeinfo
+USE_TOOLS+= gmake gs:run makeinfo perl:run
TEXINFO_REQD= 4.2
INFO_FILES= yes
@@ -33,6 +32,23 @@ XAW_TYPE= 3d
CONFIGURE_ARGS+= --enable-setenv-code
.endif
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+= --enable-SIGCHLD-fallback
+.endif
+
+SUBST_CLASSES+= optlong1
+SUBST_STAGE.optlong1= post-extract
+SUBST_FILES.optlong1= src/gv_message.h
+SUBST_SED.optlong1= -e 's/\[-\]-/--/'
+
+SUBST_CLASSES+= optlong2
+SUBST_STAGE.optlong2= post-extract
+SUBST_FILES.optlong2= doc/gv.1
+SUBST_SED.optlong2= -e 's/\[\\-\]\\-/\\-\\-/'
+
+REPLACE_PERL+= src/gv-update-userconfig.in
+
.include "../../devel/libgetopt/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
.include "../../mk/xaw.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/gv/PLIST b/print/gv/PLIST
index 30c3da24a1b..cc2464b8778 100644
--- a/print/gv/PLIST
+++ b/print/gv/PLIST
@@ -1,11 +1,15 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:11:56 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/07/24 08:22:02 obache Exp $
bin/gv
+bin/gv-update-userconfig
info/gv.info
-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-update-userconfig.1
man/man1/gv.1
+share/gv/GV
+share/gv/gv_class.ad
+share/gv/gv_copyright.dat
+share/gv/gv_spartan.dat
+share/gv/gv_system.ad
+share/gv/gv_user.ad
+share/gv/gv_user_res.dat
+share/gv/gv_widgetless.dat
+@pkgdir share/gv/safe-gs-workdir
diff --git a/print/gv/distinfo b/print/gv/distinfo
index ff662d499ab..46b9d1c00d7 100644
--- a/print/gv/distinfo
+++ b/print/gv/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.17 2010/03/11 12:46:42 drochner Exp $
+$NetBSD: distinfo,v 1.18 2010/07/24 08:22:02 obache Exp $
-SHA1 (gv-3.6.3.tar.gz) = 1eb09482a1b77f6db957840ba691b42947aeb364
-RMD160 (gv-3.6.3.tar.gz) = 3c0fb1c252b305f25522abc8528dfe9489029ad3
-Size (gv-3.6.3.tar.gz) = 480724 bytes
-SHA1 (patch-aa) = 4a13819735017694fad8a44e3b50a90b763c4a46
-SHA1 (patch-ab) = 63d103a821074ab36a6cf946bbf1252d4d356987
-SHA1 (patch-ad) = 8803493dd643554067677edec5c4efccfbfc2606
-SHA1 (patch-ae) = 2d1057004a1bd1b29af491c3163d83dd31bba7c2
-SHA1 (patch-af) = 618164139ea6dcc81996dff659d01ede6245ff43
+SHA1 (gv-3.7.1.tar.gz) = 05fcf76f29de77e67379bae7e9ca1c8a26bbf6e1
+RMD160 (gv-3.7.1.tar.gz) = ddeef03ff83442379cd02d8ac4491a43c57eeddc
+Size (gv-3.7.1.tar.gz) = 747166 bytes
+SHA1 (patch-aa) = de9dff87b4a064dda2ac2cd949cf78c8c2349e2e
+SHA1 (patch-ae) = 8ed82e599e729d01b05b0053eb027ab3cb9ca773
+SHA1 (patch-af) = da0bf3a7f4bdce391531274d4c51b9ec6d35c07e
+SHA1 (patch-aj) = 9bba6286d8ee4e6c197ca2a07aae8538471df4f3
diff --git a/print/gv/patches/patch-aa b/print/gv/patches/patch-aa
index 78b3ebf5e35..51d0e836533 100644
--- a/print/gv/patches/patch-aa
+++ b/print/gv/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2006/10/23 12:29:56 tron Exp $
+$NetBSD: patch-aa,v 1.15 2010/07/24 08:22:02 obache Exp $
---- src/main.c.orig 2006-09-14 19:56:08.000000000 +0100
-+++ src/main.c 2006-10-23 12:50:43.000000000 +0100
-@@ -408,7 +408,7 @@
+--- src/main.c.orig 2010-06-04 17:34:53.000000000 +0000
++++ src/main.c
+@@ -467,7 +467,7 @@ int main(argc, argv)
}
/*### Manage GNU command line arguments ########################*/
diff --git a/print/gv/patches/patch-ab b/print/gv/patches/patch-ab
deleted file mode 100644
index 8a8851587cf..00000000000
--- a/print/gv/patches/patch-ab
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2006/10/23 12:29:56 tron Exp $
-
---- src/gv_message.h.orig 2005-03-31 14:02:39.000000000 +0100
-+++ src/gv_message.h 2006-10-23 13:16:40.000000000 +0100
-@@ -29,48 +29,48 @@
- char *message_usage = "\
- Usage: gv [OPTION]... [FILE]\n\
- PostScript and PDF viewer.\n\
-- [-]-monochrome display document using only black and white\n\
-- [-]-grayscale display document without colors\n\
-- [-]-color display document as usual\n\
-- [-]-safer start ghostscript in safe mode\n\
-- [-]-nosafer do not start ghostscript in safe mode\n\
-- [-]-quiet start ghostscript with the -dQUIET option\n\
-- [-]-noquiet do not start ghostscript with the -dQUIET option\n\
-- [-]-arguments=ARGS start ghostscript with additional options as specified\n\
-+ --monochrome display document using only black and white\n\
-+ --grayscale display document without colors\n\
-+ --color display document as usual\n\
-+ --safer start ghostscript in safe mode\n\
-+ --nosafer do not start ghostscript in safe mode\n\
-+ --quiet start ghostscript with the -dQUIET option\n\
-+ --noquiet do not start ghostscript with the -dQUIET option\n\
-+ --arguments=ARGS start ghostscript with additional options as specified\n\
- by the string ARGS\n\
-- [-]-page=LABEL display the page with label LABEL first\n\
-- [-]-center the page should be centered automatically\n\
-- [-]-nocenter the page should not be centered automatically\n\
-- [-]-media=MEDIA selects the paper size to be used\n\
-- [-]-orientation=ORIENTATION sets the orientation of the page\n\
-- [-]-scale=N selects the scale N\n\
-- [-]-scalebase=N selects the scale base N\n\
-- [-]-swap interchange the meaning of the orientations landscape\n\
-+ --page=LABEL display the page with label LABEL first\n\
-+ --center the page should be centered automatically\n\
-+ --nocenter the page should not be centered automatically\n\
-+ --media=MEDIA selects the paper size to be used\n\
-+ --orientation=ORIENTATION sets the orientation of the page\n\
-+ --scale=N selects the scale N\n\
-+ --scalebase=N selects the scale base N\n\
-+ --swap interchange the meaning of the orientations landscape\n\
- and seascape\n\
-- [-]-noswap do not interchange the meaning of the orientation\n\
-+ --noswap do not interchange the meaning of the orientation\n\
- landscape and seascape\n\
-- [-]-antialias use antialiasing\n\
-- [-]-noantialias do not use antialiasing\n\
-- [-]-dsc dsc comments are respected\n\
-- [-]-nodsc dsc comments are not respected\n\
-- [-]-eof ignore the postscript EOF comment while scanning\n\
-+ --antialias use antialiasing\n\
-+ --noantialias do not use antialiasing\n\
-+ --dsc dsc comments are respected\n\
-+ --nodsc dsc comments are not respected\n\
-+ --eof ignore the postscript EOF comment while scanning\n\
- documents\n\
-- [-]-noeof do not ignore the postscript EOF comment while\n\
-+ --noeof do not ignore the postscript EOF comment while\n\
- scanning documents\n\
-- [-]-pixmap use backing pixmap\n\
-- [-]-nopixmap do not use backing pixmap\n\
-- [-]-watch watch the document file for changes\n\
-- [-]-nowatch do not watch the document file for changes\n\
-- [-]-help print a help message and exit\n\
-- [-]-usage print a usage message and exit\n\
-- [-]-resize fit the size of the window to the size of the page\n\
-- [-]-noresize do not fit the size of the window to the size of the page\n\
-+ --pixmap use backing pixmap\n\
-+ --nopixmap do not use backing pixmap\n\
-+ --watch watch the document file for changes\n\
-+ --nowatch do not watch the document file for changes\n\
-+ --help print a help message and exit\n\
-+ --usage print a usage message and exit\n\
-+ --resize fit the size of the window to the size of the page\n\
-+ --noresize do not fit the size of the window to the size of the page\n\
- -geometry [<width>][x<height>][{+-}<xoffset>{+-}<yoffset>]\n\
-- [-]-ad=FILE read and use additional resources from FILE\n\
-- [-]-style=FILE read and use additional resources from FILE. These resources\n\
-+ --ad=FILE read and use additional resources from FILE\n\
-+ --style=FILE read and use additional resources from FILE. These resources\n\
- have lower priority than those provided on the context of --ad\n\
-- [-]-spartan shortcut for --style=gv_spartan.dat\n\
-- [-]-version show gv version and exit\n\
-+ --spartan shortcut for --style=gv_spartan.dat\n\
-+ --version show gv version and exit\n\
- ";
-
- char *message_help = "\
diff --git a/print/gv/patches/patch-ad b/print/gv/patches/patch-ad
deleted file mode 100644
index f017d380bfd..00000000000
--- a/print/gv/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2010/03/11 12:46:42 drochner Exp $
-
---- src/file.c.orig 2005-08-10 11:33:21.000000000 +0000
-+++ src/file.c
-@@ -199,7 +199,7 @@ file_getTmpFilename(baseDirectory,baseFi
- #ifdef VMS
- sprintf(tempFilename,"%sgv_%lx_%x_%s_%s.tmp",tmpDirBuf,time(NULL),i,tmpName,tmpExt);
- #else
-- sprintf(tempFilename,"%sgv_%lx_%x_%s.%s.tmp",tmpDirBuf,time(NULL),i,tmpName,tmpExt);
-+ sprintf(tempFilename,"%sgv_%llx_%x_%s.%s.tmp",tmpDirBuf,(long long)time(NULL),i,tmpName,tmpExt);
- #endif
- file_translateTildeInPath(tempFilename);
- no_such_file = stat(tempFilename,&s);
-@@ -265,6 +265,9 @@ int file_fileIsDir(fn)
- /* file_fileIsNotUseful */
- /*############################################################*/
-
-+#ifndef ENODATA
-+#define ENODATA ENOMSG
-+#endif
- int
- file_fileIsNotUseful(fn)
- char *fn;
diff --git a/print/gv/patches/patch-ae b/print/gv/patches/patch-ae
index 46a91feb319..c069945efe7 100644
--- a/print/gv/patches/patch-ae
+++ b/print/gv/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.9 2006/10/23 12:29:56 tron Exp $
+$NetBSD: patch-ae,v 1.10 2010/07/24 08:22:02 obache Exp $
---- src/Ghostview.c.orig 2006-07-04 21:09:52.000000000 +0200
+--- src/Ghostview.c.orig 2010-06-03 16:36:25.000000000 +0000
+++ src/Ghostview.c
-@@ -83,8 +83,6 @@ typedef char *XPointer;
+@@ -87,8 +87,6 @@ typedef char *XPointer;
#endif
#include <errno.h>
diff --git a/print/gv/patches/patch-af b/print/gv/patches/patch-af
index 7b29d492588..a138c43b116 100644
--- a/print/gv/patches/patch-af
+++ b/print/gv/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.6 2006/10/23 12:29:56 tron Exp $
+$NetBSD: patch-af,v 1.7 2010/07/24 08:22:02 obache Exp $
---- src/error.h.orig 2005-08-10 13:33:21.000000000 +0200
+--- src/error.h.orig 2010-05-29 07:37:20.000000000 +0000
+++ src/error.h
@@ -36,8 +36,6 @@
diff --git a/print/gv/patches/patch-aj b/print/gv/patches/patch-aj
new file mode 100644
index 00000000000..108e5028760
--- /dev/null
+++ b/print/gv/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1 2010/07/24 08:22:02 obache Exp $
+
+Avoid unwanted regeneration.
+
+--- src/Makefile.in.orig 2010-06-08 17:59:16.000000000 +0000
++++ src/Makefile.in
+@@ -1185,7 +1185,7 @@ gv_class.h : gv_class.ad
+ @echo "creating gv_class.h"
+ @sh $(srcdir)/ad2c gv_class.ad > gv_class.h
+
+-gv-i18n.h: $(srcdir)/nls $(srcdir)/nls/*
++gv-i18n.h: $(srcdir)/nls/*
+ perl $(srcdir)/gv-i18n.pl $(srcdir) > gv-i18n.h
+
+ gv_class.ad : $(srcdir)/gv_font_res.dat $(srcdir)/gv_font_res-I18N_mb.dat $(srcdir)/gv_layout_res.dat gv_make_res.dat $(srcdir)/gv_misc_res.dat $(srcdir)/gv_user_res.dat gv_intern_res_unix.dat
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 04:32:30 +0000