summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2005-02-24 07:43:30 +0000
committerreed <reed@pkgsrc.org>2005-02-24 07:43:30 +0000
commit9bd01cdfa31cf7acf7f31a2f8b7c24cacb8c9a15 (patch)
tree1364968e246b79fa6b46fbe800f57e66b9229455
parentafb3d4b5ce33044da33d1a69f44ac50981fb249d (diff)
downloadpkgsrc-9bd01cdfa31cf7acf7f31a2f8b7c24cacb8c9a15.tar.gz
Define ENODATA (if not defined) in patch-ad.
Also make it work with older gcc (patch-aa).
-rw-r--r--print/gv/distinfo5
-rw-r--r--print/gv/patches/patch-aa16
-rw-r--r--print/gv/patches/patch-ad14
3 files changed, 26 insertions, 9 deletions
diff --git a/print/gv/distinfo b/print/gv/distinfo
index 4269721635f..6ab0b0a6e3d 100644
--- a/print/gv/distinfo
+++ b/print/gv/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2004/12/30 21:04:25 snj Exp $
+$NetBSD: distinfo,v 1.11 2005/02/24 07:43:30 reed Exp $
SHA1 (gv-3.6.1.tar.gz) = a094d019772e11c6003cc8682c945b7b9bc700b7
Size (gv-3.6.1.tar.gz) = 453921 bytes
-SHA1 (patch-aa) = b494958693116143084279e306491fa49cd5386f
+SHA1 (patch-aa) = 2034f06c3297af89bc06b2eba10c1828168b1b33
SHA1 (patch-ab) = 1b97781ebbf51447d0cddd04f6bce30c42187294
SHA1 (patch-ac) = eb1007d4a10b7e9bfcfa22ecd19d2694914ab208
+SHA1 (patch-ad) = 69378625f582e823e6ec0e68fce254f87f61b1d3
diff --git a/print/gv/patches/patch-aa b/print/gv/patches/patch-aa
index 7f519751c4c..d6100c00cce 100644
--- a/print/gv/patches/patch-aa
+++ b/print/gv/patches/patch-aa
@@ -1,19 +1,21 @@
-$NetBSD: patch-aa,v 1.12 2004/12/30 21:04:25 snj Exp $
+$NetBSD: patch-aa,v 1.13 2005/02/24 07:43:30 reed Exp $
---- 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)
+--- src/main.c.orig Mon Dec 6 15:36:57 2004
++++ src/main.c
+@@ -321,6 +321,8 @@ int main(argc, argv)
Dimension maximum_width,maximum_height;
unsigned int gwidth=0,gheight=0;
int dim_forced;
-+ int c;
++ int opt_counter = 0;
++ int c;
/*### initializing global variables ####################################*/
-@@ -420,7 +421,6 @@ int main(argc, argv)
+@@ -419,8 +421,6 @@ int main(argc, argv)
+ }
/*### Manage GNU command line arguments ########################*/
- int opt_counter = 0;
+- int opt_counter = 0;
- int c;
while ((c = getopt_long (argc, argv, "vhu", GNU_longOptions, NULL))
!= -1)
diff --git a/print/gv/patches/patch-ad b/print/gv/patches/patch-ad
new file mode 100644
index 00000000000..a7147137767
--- /dev/null
+++ b/print/gv/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.4 2005/02/24 07:43:30 reed Exp $
+
+--- src/file.c.orig Tue Dec 7 15:37:40 2004
++++ src/file.c
+@@ -296,6 +296,9 @@ file_fileIsNotUseful(fn)
+ errno = EISDIR;
+ } else if (s.st_size == 0) {
+ r = 1;
++#ifndef ENODATA
++#define ENODATA ENOMSG
++#endif
+ errno = ENODATA;
+ }
+ IMESSAGE(r)