Fix main() definition. Fix prototype usage.

8 files changed, 103 insertions, 19 deletions

diff --git a/print/psutils/distinfo b/print/psutils/distinfo
index bcd402ed3d1..d6bf7cda0b7 100644
--- a/print/psutils/distinfo
+++ b/print/psutils/distinfo
@@ -1,13 +1,17 @@
-$NetBSD: distinfo,v 1.6 2007/11/14 02:27:36 minskim Exp $
+$NetBSD: distinfo,v 1.7 2011/08/02 17:05:48 joerg Exp $
 
 SHA1 (psutils-p17.tar.gz) = 6f1ecb5846cffb644826a02bd9153fe5d6387a9b
 RMD160 (psutils-p17.tar.gz) = 1494f37e7ae809f0e446d52d4b3a21cd48690cc0
 Size (psutils-p17.tar.gz) = 62039 bytes
 SHA1 (patch-aa) = 90961e898a113c4d4fa64e8d44d40469c76f156d
-SHA1 (patch-ab) = 818a4169aaa9765c9629bb2a01eb5fa887b90f7f
-SHA1 (patch-ac) = 5d7c0c0872b9101b29b0a5294f53d3dd1c550971
-SHA1 (patch-ad) = 74bd84ae49127e5e7e69eca4025927e230d4521f
+SHA1 (patch-ab) = 60f1d0cef0632cccc30735bdf04c2b97a7a2c20f
+SHA1 (patch-ac) = 5dcbb4fbbf883486e41dddbf5c9eca0ed91166c6
+SHA1 (patch-ad) = 9f2ed03ad9fd298692ef19204a9b5092022150c8
 SHA1 (patch-ae) = d6ed0910d6b2b6f43ffe1fa29c35543bb4b9855c
 SHA1 (patch-af) = 4452ec086be0abe895a48b2684f7e4afe65cf25c
 SHA1 (patch-ag) = a07233adb18ffa01999449935fce96983626e7c9
 SHA1 (patch-ah) = c79bfd15e8befdb592facfd8a4f4f7194ad6a3ea
+SHA1 (patch-ai) = 892656673a66e7088dd479d8aac330293541cc1f
+SHA1 (patch-aj) = b40914b40486599fcec8baba362dc8f38a39848f
+SHA1 (patch-ak) = af57aff407916deab9221485b62b9c81f8d7b55b
+SHA1 (patch-am) = 7ee8c9666051ecca81fd09b3c51acb76184ba6cb
diff --git a/print/psutils/patches/patch-ab b/print/psutils/patches/patch-ab
index ed9354566b4..b21418908d4 100644
--- a/print/psutils/patches/patch-ab
+++ b/print/psutils/patches/patch-ab
@@ -1,19 +1,29 @@
-$NetBSD: patch-ab,v 1.1 1998/11/11 11:42:57 agc Exp $
+$NetBSD: patch-ab,v 1.2 2011/08/02 17:05:48 joerg Exp $
 
 Read papersize from a config file, rather than using a compiled-in default.
 
---- psnup.c	1998/11/11 09:37:52	1.1
-+++ psnup.c	1998/11/11 10:25:45
-@@ -22,6 +22,8 @@
+--- psnup.c.orig	1997-03-11 22:53:02.000000000 +0000
++++ psnup.c
+@@ -22,6 +22,9 @@
   *		-f	for flipped (wider than tall) pages
   * 		-d<wid>	to draw the page boundaries
   */
 +#include <sys/types.h>
 +#include <sys/param.h>
++#include <string.h>
  
  #include "psutil.h"
  #include "psspec.h"
-@@ -79,13 +81,21 @@
+@@ -66,7 +69,7 @@ static int nextdiv(int n, int m)
+    return (0);
+ }
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+    int horiz, vert, rotate, column, flip, leftright, topbottom;
+    int nup = 1;
+@@ -79,13 +82,21 @@ void main(int argc, char *argv[])
     double iwidth, iheight ;			/* input paper size */
     double tolerance = 100000;			/* layout tolerance */
     Paper *paper;
diff --git a/print/psutils/patches/patch-ac b/print/psutils/patches/patch-ac
index 3b5d713275c..0c96a8c2e67 100644
--- a/print/psutils/patches/patch-ac
+++ b/print/psutils/patches/patch-ac
@@ -1,19 +1,29 @@
-$NetBSD: patch-ac,v 1.1 1998/11/11 11:42:57 agc Exp $
+$NetBSD: patch-ac,v 1.2 2011/08/02 17:05:48 joerg Exp $
 
 Read papersize from a config file, rather than using a compiled-in default.
 
---- psresize.c	1998/11/11 09:37:52	1.1
-+++ psresize.c	1998/11/11 10:31:11
-@@ -14,6 +14,8 @@
+--- psresize.c.orig	1997-03-11 22:53:03.000000000 +0000
++++ psresize.c
+@@ -14,6 +14,9 @@
   *              -H<dim> sets the input paper height
   *              -Ppaper sets the input paper size (width and height) by name
   */
 +#include <sys/types.h>
 +#include <sys/param.h>
++#include <string.h>
  
  #include "psutil.h"
  #include "psspec.h"
-@@ -56,13 +58,21 @@
+@@ -46,7 +49,7 @@ static void argerror(void)
+ #define MIN(x,y) ((x) > (y) ? (y) : (x))
+ #define MAX(x,y) ((x) > (y) ? (x) : (y))
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+    double scale, rscale;			/* page scale */
+    double waste, rwaste;			/* amount wasted */
+@@ -56,13 +59,21 @@ void main(int argc, char *argv[])
     double inheight = -1;
     Paper *paper;
     PageSpec *specs;
diff --git a/print/psutils/patches/patch-ad b/print/psutils/patches/patch-ad
index 8732a4643d6..2fc55c2ba04 100644
--- a/print/psutils/patches/patch-ad
+++ b/print/psutils/patches/patch-ad
@@ -1,19 +1,27 @@
-$NetBSD: patch-ad,v 1.1 1998/11/11 11:42:58 agc Exp $
+$NetBSD: patch-ad,v 1.2 2011/08/02 17:05:48 joerg Exp $
 
 Read papersize from a config file, rather than using a compiled-in default.
 
---- pstops.c	1998/11/11 09:37:52	1.1
-+++ pstops.c	1998/11/11 10:27:21
-@@ -7,6 +7,8 @@
+--- pstops.c.orig	1997-03-11 22:53:04.000000000 +0000
++++ pstops.c
+@@ -7,6 +7,9 @@
   * Usage:
   *       pstops [-q] [-b] [-d] [-w<dim>] [-h<dim>] [-ppaper] <pagespecs> [infile [outfile]]
   */
 +#include <sys/types.h>
 +#include <sys/param.h>
++#include <string.h>
  
  #include "psutil.h"
  #include "psspec.h"
-@@ -118,13 +120,21 @@
+@@ -112,19 +115,27 @@ static PageSpec *parsespecs(char *str)
+    return (head);
+ }
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+    PageSpec *specs = NULL;
     int nobinding = 0;
     double draw = 0;
     Paper *paper;
diff --git a/print/psutils/patches/patch-ai b/print/psutils/patches/patch-ai
new file mode 100644
index 00000000000..9e2abf01aed
--- /dev/null
+++ b/print/psutils/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2011/08/02 17:05:48 joerg Exp $
+
+--- psbook.c.orig	2011-08-02 13:48:35.000000000 +0000
++++ psbook.c
+@@ -32,7 +32,7 @@ static void usage(void)
+ }
+ 
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+    int signature = 0;
+    int currentpg, maxpage;
diff --git a/print/psutils/patches/patch-aj b/print/psutils/patches/patch-aj
new file mode 100644
index 00000000000..eee365ea5a1
--- /dev/null
+++ b/print/psutils/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2011/08/02 17:05:48 joerg Exp $
+
+--- psselect.c.orig	2011-08-02 13:49:30.000000000 +0000
++++ psselect.c
+@@ -91,7 +91,7 @@ static PageRange *addrange(char *str, Pa
+ }
+ 
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+    int currentpg, maxpage = 0;
+    int even = 0, odd = 0, reverse = 0;
diff --git a/print/psutils/patches/patch-ak b/print/psutils/patches/patch-ak
new file mode 100644
index 00000000000..610f2de069e
--- /dev/null
+++ b/print/psutils/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2011/08/02 17:05:48 joerg Exp $
+
+--- psutil.h.orig	2011-08-02 13:50:20.000000000 +0000
++++ psutil.h
+@@ -40,6 +40,8 @@ extern void writetrailer(void);
+ extern void writeemptypage(void);
+ extern void scanpages(void);
+ extern void writestring(char *s);
++extern int readconfig(char *name, size_t namesize);
++extern char *strnncpy(char *to, size_t tosize, char *from, size_t cc);
+ 
+ /* These variables are imported from the client program (e.g. psbook, psnup,
+    etc.) */
diff --git a/print/psutils/patches/patch-am b/print/psutils/patches/patch-am
new file mode 100644
index 00000000000..b382a8b74ad
--- /dev/null
+++ b/print/psutils/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2011/08/02 17:05:48 joerg Exp $
+
+--- epsffit.c.orig	2011-08-02 13:51:58.000000000 +0000
++++ epsffit.c
+@@ -39,7 +39,7 @@ static void usage(void)
+    exit(1);
+ }
+ 
+-void main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+    int bbfound = 0;              /* %%BoundingBox: found */
+    int urx, ury, llx, lly;