- Switch to options helpers

- Switch to new test framework
- Regenerate patches with `make makepatch`

1 files changed, 7 insertions, 7 deletions

diff --git a/mail/usendmail/files/patch-src_uogetopt.c b/mail/usendmail/files/patch-src_uogetopt.c
index 8b5ddb8f5370..84d5c35a7d27 100644
--- a/mail/usendmail/files/patch-src_uogetopt.c
+++ b/mail/usendmail/files/patch-src_uogetopt.c
@@ -1,6 +1,6 @@
---- src/uogetopt.c.orig	Wed Jul 20 19:28:57 2005
-+++ src/uogetopt.c	Wed Jul 20 19:31:50 2005
-@@ -116,7 +116,8 @@
+--- src/uogetopt.c.orig	2003-05-13 05:06:57 UTC
++++ src/uogetopt.c
+@@ -116,7 +116,8 @@ uogetopt_outn (uogetopt_env_t * env,
  #define SETEXITVOID() do { SETEXIT(); return; } while(0)
  #define SETEXITRET(x) do { SETEXIT(); return x; } while(0)
  
@@ -10,7 +10,7 @@
  	const char *s)
  {
  	unsigned int l;
-@@ -140,7 +141,7 @@
+@@ -140,7 +141,7 @@ uogetopt_num(uogetopt_env_t *env, int is
  #define uogetopt_hlong(e,s,o) uogetopt_num(e,1,s,o)
  
  
@@ -19,7 +19,7 @@
  outandcount(void (*out)(int iserr,const char *), const char *s)
  {
  	if (!s) return 0;
-@@ -231,7 +232,7 @@
+@@ -231,7 +232,7 @@ for, but i suppose someone will need the
  	} while (EXPECT(*p,1) && EXPECT(p[1],1));
  }
  
@@ -28,7 +28,7 @@
  uogetopt_printver(uogetopt_env_t *env, int maxlen)
  {
  	int l;
-@@ -249,7 +250,7 @@
+@@ -249,7 +250,7 @@ uogetopt_printver(uogetopt_env_t *env, i
  	env->out(0,env->version);
  }
  
@@ -37,7 +37,7 @@
  handle_argopt(uogetopt_env_t *env, uogetopt_t *o, char *arg)
  {
  	int at=o->argtype;
-@@ -274,7 +275,7 @@
+@@ -274,7 +275,7 @@ handle_argopt(uogetopt_env_t *env, uoget
  #define PRINTHELP_MODE_SHORT 0
  #define PRINTHELP_MODE_NORM  1
  #define PRINTHELP_MODE_LONG  2