Attachment #39591 for bug #62391

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

Lines 21-30 Link Here

(-)prn/Makefile (-7 / +1 lines)
21	MAN1= prn.1 cprn.1 cmt.1 psconv.1	21	MAN1= prn.1 cprn.1 cmt.1 psconv.1
22	MAN5= cmtdefs.5	22	MAN5= cmtdefs.5
23		23
24	.include <bsd.port.pre.mk>	24	.include <bsd.port.mk>
25
26	.if ${OSVERSION} >= 502000
27	BROKEN= "Does not compile"
28	.endif
29
30	.include <bsd.port.post.mk>




*** prn.c.orig	Thu May 26 11:37:45 1994
--- prn.c	Mon Jun  9 12:29:28 1997
***************
*** 34,41 ****
  #include <sys/stat.h>
  #include "euc.h"
  
  #define KCCPATH		"/usr/local/bin/kcc"
! #if defined (__bsdi__)
  #define LPRPATH		"/usr/bin/lpr"
  #else
  #define LPRPATH		"/usr/ucb/lpr"
--- 34,46 ----
  #include <sys/stat.h>
  #include "euc.h"
  
+ #if !defined KCCPATH
  #define KCCPATH		"/usr/local/bin/kcc"
! #endif
! #if (defined(__unix__) || defined(unix)) && !defined(USG)
! #include <sys/param.h>
! #endif
! #if defined (__bsdi__) || (defined(BSD) && (BSD >= 199103))
  #define LPRPATH		"/usr/bin/lpr"
  #else
  #define LPRPATH		"/usr/ucb/lpr"
***************
*** 48,55 ****
--- 53,64 ----
  
  #else
  
+ #if !defined CMTPATH
  #define CMTPATH		"/usr/local/bin/cmt"
+ #endif
+ #if !defined PSPATH
  #define PSPATH		"/usr/local/bin/psconv"
+ #endif
  
  #endif
  




--- cmt.c.orig	Mon Apr 25 16:26:57 1994
+++ cmt.c	Fri Feb  6 00:18:46 2004
@@ -352,16 +352,15 @@
 	error(format, arg1, arg2, ...)
 	    char *format;
  ---------------------------------------------------------------------*/
-#include <varargs.h>
+#include <stdarg.h>
 
-void error(va_alist)
-    va_dcl
+void error(char *a, ...)
 {
     va_list args;
 
-    va_start(args);
+    va_start(args, a);
     fprintf(stderr, "%s: ", progname);
-    vfprintf(stderr, va_arg(args, char *), args);
+    vfprintf(stderr, a, args);
     putc('\n', stderr);
     va_end(args);
     exit(1);

Added Link Here

(-)prn/files/patch-cmt.h (+8 lines)
1	--- cmt.h.orig Fri Feb 6 00:13:05 2004
2	+++ cmt.h Fri Feb 6 00:13:18 2004
3	@@ -32,4 +32,4 @@
4	/*
5	* Error handling function.
6	*/
7	-extern void error();
8	+extern void error(char *, ...);




--- prn.c.orig	Thu May 26 11:37:45 1994
+++ prn.c	Fri Feb  6 00:18:11 2004
@@ -34,8 +34,13 @@
 #include <sys/stat.h>
 #include "euc.h"
 
+#if !defined KCCPATH
 #define KCCPATH		"/usr/local/bin/kcc"
-#if defined (__bsdi__)
+#endif
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>
+#endif
+#if defined (__bsdi__) || (defined(BSD) && (BSD >= 199103))
 #define LPRPATH		"/usr/bin/lpr"
 #else
 #define LPRPATH		"/usr/ucb/lpr"
@@ -48,8 +53,12 @@
 
 #else
 
+#if !defined CMTPATH
 #define CMTPATH		"/usr/local/bin/cmt"
+#endif
+#if !defined PSPATH
 #define PSPATH		"/usr/local/bin/psconv"
+#endif
 
 #endif
 
@@ -96,7 +105,7 @@
 static char *filename;		/* name of the file being processed */
 static char *modtime;		/* the last modification time */
 
-static void error();
+static void error(char *, ...);
 static char *basename();
 static bool formatopt();
 static bool rangeopt();
@@ -498,16 +507,15 @@
 	error(format, arg1, arg2, ...)
 	    char *format;
  ---------------------------------------------------------------------*/
-#include <varargs.h>
+#include <stdarg.h>
 
-static void error(va_alist)
-    va_dcl
+static void error(char *a, ...)
 {
     va_list args;
 
-    va_start(args);
+    va_start(args, a);
     fprintf(stderr, "%s: ", progname);
-    vfprintf(stderr, va_arg(args, char *), args);
+    vfprintf(stderr, a, args);
     putc('\n', stderr);
     va_end(args);
     exit(1);

Return to bug 62391

Removed Link Here

(-)prn/files/patch-ab (-41 lines)
1	*** prn.c.orig Thu May 26 11:37:45 1994
2	--- prn.c Mon Jun 9 12:29:28 1997
3	***************
4	* 34,41 **
5	#include <sys/stat.h>
6	#include "euc.h"
7
8	#define KCCPATH "/usr/local/bin/kcc"
9	! #if defined (__bsdi__)
10	#define LPRPATH "/usr/bin/lpr"
11	#else
12	#define LPRPATH "/usr/ucb/lpr"
13	--- 34,46 ----
14	#include <sys/stat.h>
15	#include "euc.h"
16
17	+ #if !defined KCCPATH
18	#define KCCPATH "/usr/local/bin/kcc"
19	! #endif
20	! #if (defined(__unix__) \|\| defined(unix)) && !defined(USG)
21	! #include <sys/param.h>
22	! #endif
23	! #if defined (__bsdi__) \|\| (defined(BSD) && (BSD >= 199103))
24	#define LPRPATH "/usr/bin/lpr"
25	#else
26	#define LPRPATH "/usr/ucb/lpr"
27	***************
28	* 48,55 **
29	--- 53,64 ----
30
31	#else
32
33	+ #if !defined CMTPATH
34	#define CMTPATH "/usr/local/bin/cmt"
35	+ #endif
36	+ #if !defined PSPATH
37	#define PSPATH "/usr/local/bin/psconv"
38	+ #endif
39
40	#endif
41

Added Link Here

(-)prn/files/patch-cmt.c (+23 lines)
1	--- cmt.c.orig Mon Apr 25 16:26:57 1994
2	+++ cmt.c Fri Feb 6 00:18:46 2004
3	@@ -352,16 +352,15 @@
4	error(format, arg1, arg2, ...)
5	char *format;
6	---------------------------------------------------------------------*/
7	-#include <varargs.h>
8	+#include <stdarg.h>
9
10	-void error(va_alist)
11	- va_dcl
12	+void error(char *a, ...)
13	{
14	va_list args;
15
16	- va_start(args);
17	+ va_start(args, a);
18	fprintf(stderr, "%s: ", progname);
19	- vfprintf(stderr, va_arg(args, char *), args);
20	+ vfprintf(stderr, a, args);
21	putc('\n', stderr);
22	va_end(args);
23	exit(1);

Added Link Here

(-)prn/files/patch-prn.c (+60 lines)
1	--- prn.c.orig Thu May 26 11:37:45 1994
2	+++ prn.c Fri Feb 6 00:18:11 2004
3	@@ -34,8 +34,13 @@
4	#include <sys/stat.h>
5	#include "euc.h"
6
7	+#if !defined KCCPATH
8	#define KCCPATH "/usr/local/bin/kcc"
9	-#if defined (__bsdi__)
10	+#endif
11	+#if (defined(__unix__) \|\| defined(unix)) && !defined(USG)
12	+#include <sys/param.h>
13	+#endif
14	+#if defined (__bsdi__) \|\| (defined(BSD) && (BSD >= 199103))
15	#define LPRPATH "/usr/bin/lpr"
16	#else
17	#define LPRPATH "/usr/ucb/lpr"
18	@@ -48,8 +53,12 @@
19
20	#else
21
22	+#if !defined CMTPATH
23	#define CMTPATH "/usr/local/bin/cmt"
24	+#endif
25	+#if !defined PSPATH
26	#define PSPATH "/usr/local/bin/psconv"
27	+#endif
28
29	#endif
30
31	@@ -96,7 +105,7 @@
32	static char filename; / name of the file being processed */
33	static char modtime; / the last modification time */
34
35	-static void error();
36	+static void error(char *, ...);
37	static char *basename();
38	static bool formatopt();
39	static bool rangeopt();
40	@@ -498,16 +507,15 @@
41	error(format, arg1, arg2, ...)
42	char *format;
43	---------------------------------------------------------------------*/
44	-#include <varargs.h>
45	+#include <stdarg.h>
46
47	-static void error(va_alist)
48	- va_dcl
49	+static void error(char *a, ...)
50	{
51	va_list args;
52
53	- va_start(args);
54	+ va_start(args, a);
55	fprintf(stderr, "%s: ", progname);
56	- vfprintf(stderr, va_arg(args, char *), args);
57	+ vfprintf(stderr, a, args);
58	putc('\n', stderr);
59	va_end(args);
60	exit(1);