[pkgsrc/trunk]: pkgsrc/mbone/imm Revert:

[rtr <rtr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eebe31d894f3
branches:  trunk
changeset: 462674:eebe31d894f3
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Wed Oct 08 10:48:01 2003 +0000

description:
Revert:
 That's the wrong naming convention - patch-xy for any particular
 xy is assigned to a particular source file for life.   They don't
 get squashed back to aa ab ..., ever.

Make patch-aa -> patch-ae.

diffstat:

 mbone/imm/distinfo         |   4 +-
 mbone/imm/patches/patch-aa |  87 ----------------------------------------------
 mbone/imm/patches/patch-ae |  87 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+), 89 deletions(-)

diffs (194 lines):

diff -r e6c57b26f513 -r eebe31d894f3 mbone/imm/distinfo
--- a/mbone/imm/distinfo        Wed Oct 08 10:43:20 2003 +0000
+++ b/mbone/imm/distinfo        Wed Oct 08 10:48:01 2003 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2003/10/08 10:40:37 rtr Exp $
+$NetBSD: distinfo,v 1.5 2003/10/08 10:48:01 rtr Exp $
 
 SHA1 (imm36a1.tar.Z) = a3c0bd042ebed930739f22ebfec2bf28080a88f6
 Size (imm36a1.tar.Z) = 87695 bytes
-SHA1 (patch-aa) = b8133dd4ab0b25c9c6e5ae87ceca6ab7870a438b
 SHA1 (patch-ad) = dc9bc795bc177f5e0087b1bb2bcb2f5d654bdb66
+SHA1 (patch-ae) = b8133dd4ab0b25c9c6e5ae87ceca6ab7870a438b
diff -r e6c57b26f513 -r eebe31d894f3 mbone/imm/patches/patch-aa
--- a/mbone/imm/patches/patch-aa        Wed Oct 08 10:43:20 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
---- utils.c.orig       2003-10-08 16:18:08.000000000 +1000
-+++ utils.c    2003-10-08 16:18:18.000000000 +1000
-@@ -20,7 +20,7 @@
-  * These notices must be retained in any copies of any part of this software.
-  ******************************************************************************/
- #include <stdio.h>
--#include <varargs.h>
-+#include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
- #ifdef __NetBSD__
-@@ -40,14 +40,12 @@
- 
- /*----------------------------------------------------------------------------*/
- 
--void warn( va_alist )
--va_dcl
-+void
-+warn(const char *fmt, ...)
- {
-     va_list args;
--    char *fmt;
- 
--    va_start( args );
--    fmt = va_arg( args, char * );
-+    va_start(args, fmt);
-     fprintf( stderr, "Warning: " );
-     vfprintf( stderr, fmt, args );
-     va_end( args );
-@@ -55,14 +53,12 @@
- 
- /*----------------------------------------------------------------------------*/
- 
--void die( va_alist )
--va_dcl
-+void
-+die(const char *fmt, ...)
- {
-     va_list args;
--    char *fmt;
- 
--    va_start( args );
--    fmt = va_arg( args, char * );
-+    va_start(args, fmt);
-     fprintf( stderr, "Error: " );
-     vfprintf( stderr, fmt, args );
-     exit( 1 );
-@@ -70,14 +66,12 @@
- 
- /*----------------------------------------------------------------------------*/
- 
--void fatal( va_alist )
--va_dcl
-+void
-+fatal(const char *fmt, ...)
- {
-     va_list args;
--    char *fmt;
- 
--    va_start( args );
--    fmt = va_arg( args, char * );
-+    va_start(args, fmt);
-     fprintf( stderr, "Internal Error: " );
-     vfprintf( stderr, fmt, args );
-     exit( 2 );
-@@ -142,18 +136,16 @@
-     
- /*----------------------------------------------------------------------------*/
- 
--void mailmessage( va_alist )
--va_dcl
-+void
-+mailmessage(const char *fmt, ...)
- {
-     va_list args;
--    char *fmt;
-     FILE *popen(), *fp;
-     char cmdline[80];
-      if (whome == NULL) whome = getlogin();
-       sprintf(cmdline,"%s %s",mailprog,whome);
-       fp = popen(cmdline,"w");
--    va_start( args );
--    fmt = va_arg( args, char * );
-+    va_start(args, fmt);
-     fprintf( fp, "MNM Warning: " );
-     vfprintf( fp, fmt, args );
-     va_end( args );
diff -r e6c57b26f513 -r eebe31d894f3 mbone/imm/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mbone/imm/patches/patch-ae        Wed Oct 08 10:48:01 2003 +0000
@@ -0,0 +1,87 @@
+--- utils.c.orig       2003-10-08 16:18:08.000000000 +1000
++++ utils.c    2003-10-08 16:18:18.000000000 +1000
+@@ -20,7 +20,7 @@
+  * These notices must be retained in any copies of any part of this software.
+  ******************************************************************************/
+ #include <stdio.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #ifdef __NetBSD__
+@@ -40,14 +40,12 @@
+ 
+ /*----------------------------------------------------------------------------*/
+ 
+-void warn( va_alist )
+-va_dcl
++void
++warn(const char *fmt, ...)
+ {
+     va_list args;
+-    char *fmt;
+ 
+-    va_start( args );
+-    fmt = va_arg( args, char * );
++    va_start(args, fmt);
+     fprintf( stderr, "Warning: " );
+     vfprintf( stderr, fmt, args );
+     va_end( args );
+@@ -55,14 +53,12 @@
+ 
+ /*----------------------------------------------------------------------------*/
+ 
+-void die( va_alist )
+-va_dcl
++void
++die(const char *fmt, ...)
+ {
+     va_list args;
+-    char *fmt;
+ 
+-    va_start( args );
+-    fmt = va_arg( args, char * );
++    va_start(args, fmt);
+     fprintf( stderr, "Error: " );
+     vfprintf( stderr, fmt, args );
+     exit( 1 );
+@@ -70,14 +66,12 @@
+ 
+ /*----------------------------------------------------------------------------*/
+ 
+-void fatal( va_alist )
+-va_dcl
++void
++fatal(const char *fmt, ...)
+ {
+     va_list args;
+-    char *fmt;
+ 
+-    va_start( args );
+-    fmt = va_arg( args, char * );
++    va_start(args, fmt);
+     fprintf( stderr, "Internal Error: " );
+     vfprintf( stderr, fmt, args );
+     exit( 2 );
+@@ -142,18 +136,16 @@
+     
+ /*----------------------------------------------------------------------------*/
+ 
+-void mailmessage( va_alist )
+-va_dcl
++void
++mailmessage(const char *fmt, ...)
+ {
+     va_list args;
+-    char *fmt;
+     FILE *popen(), *fp;
+     char cmdline[80];
+      if (whome == NULL) whome = getlogin();
+       sprintf(cmdline,"%s %s",mailprog,whome);
+       fp = popen(cmdline,"w");
+-    va_start( args );
+-    fmt = va_arg( args, char * );
++    va_start(args, fmt);
+     fprintf( fp, "MNM Warning: " );
+     vfprintf( fp, fmt, args );
+     va_end( args );