ports/62391: Fix port: japanese/prn

[Hiroki Sato]

>Number:         62391
>Category:       ports
>Synopsis:       Fix port: japanese/prn
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 05 07:30:13 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Hiroki Sato
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
Tokyo University of Science
>Environment:
System: FreeBSD alph.allbsd.org 4.9-RC FreeBSD 4.9-RC #0: Sat Oct 25 04:40:22 JST 2003     hrs at alph.allbsd.org:/usr/obj/usr/src/sys/ALPH  i386

>Description:
	Fix a build breakage due to <varargs.h> problem.

>How-To-Repeat:
	N/A

>Fix:

Index: prn/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/prn/Makefile,v
retrieving revision 1.11
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.11 Makefile
--- prn/Makefile	5 Feb 2004 08:52:39 -0000	1.11
+++ prn/Makefile	5 Feb 2004 15:26:38 -0000
@@ -21,10 +21,4 @@
 MAN1=		prn.1 cprn.1 cmt.1 psconv.1
 MAN5=		cmtdefs.5
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502000
-BROKEN=		"Does not compile"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: prn/files/patch-ab
===================================================================
RCS file: prn/files/patch-ab
diff -N prn/files/patch-ab
--- prn/files/patch-ab	23 Jun 1997 14:31:12 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-*** 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
-  
Index: prn/files/patch-cmt.c
===================================================================
RCS file: prn/files/patch-cmt.c
diff -N prn/files/patch-cmt.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ prn/files/patch-cmt.c	5 Feb 2004 15:20:27 -0000
@@ -0,0 +1,23 @@
+--- 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);
Index: prn/files/patch-cmt.h
===================================================================
RCS file: prn/files/patch-cmt.h
diff -N prn/files/patch-cmt.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ prn/files/patch-cmt.h	5 Feb 2004 15:20:26 -0000
@@ -0,0 +1,8 @@
+--- cmt.h.orig	Fri Feb  6 00:13:05 2004
++++ cmt.h	Fri Feb  6 00:13:18 2004
+@@ -32,4 +32,4 @@
+ /*
+  * Error handling function.
+  */
+-extern void error();
++extern void error(char *, ...);
Index: prn/files/patch-prn.c
===================================================================
RCS file: prn/files/patch-prn.c
diff -N prn/files/patch-prn.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ prn/files/patch-prn.c	5 Feb 2004 15:20:27 -0000
@@ -0,0 +1,60 @@
+--- 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);
>Release-Note:
>Audit-Trail:
>Unformatted: