- Switch to options helpers

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

4 files changed, 17 insertions, 15 deletions

diff --git a/mail/usendmail/Makefile b/mail/usendmail/Makefile
index 29eb484a87f7..082864d24cf4 100644
--- a/mail/usendmail/Makefile
+++ b/mail/usendmail/Makefile
@@ -23,15 +23,17 @@ OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/var/qmail,${QMAIL_PREFIX},' \
-	    ${WRKSRC}/src/usendmail.c
+		${WRKSRC}/src/usendmail.c
 	@${REINPLACE_CMD} -e 's,^CC=,CC\?=,' \
-	    ${WRKSRC}/src/Makefile
+		${WRKSRC}/src/Makefile
 
-regression-test: build
+do-test:
 	cd ${WRKSRC} && ./package/check
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/command/usendmail ${STAGEDIR}${PREFIX}/sbin
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/src && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/mail/usendmail/files/patch-src_env_get.c b/mail/usendmail/files/patch-src_env_get.c
index 797bdd9275c1..29b3fa9e58d4 100644
--- a/mail/usendmail/files/patch-src_env_get.c
+++ b/mail/usendmail/files/patch-src_env_get.c
@@ -1,5 +1,5 @@
---- src/env_get.c.orig	Wed Jul 20 19:28:21 2005
-+++ src/env_get.c	Wed Jul 20 19:28:43 2005
+--- src/env_get.c.orig	2003-04-24 07:07:23 UTC
++++ src/env_get.c
 @@ -4,7 +4,6 @@
   */
  #include "env.h"
diff --git a/mail/usendmail/files/patch-src_typesize.sh b/mail/usendmail/files/patch-src_typesize.sh
index 34a52947ccd5..d7229d32e8f0 100644
--- a/mail/usendmail/files/patch-src_typesize.sh
+++ b/mail/usendmail/files/patch-src_typesize.sh
@@ -1,6 +1,6 @@
---- src/typesize.sh.orig	2009-11-22 19:02:59.000000000 +0100
-+++ src/typesize.sh	2009-11-22 19:04:28.000000000 +0100
-@@ -21,7 +21,7 @@
+--- src/typesize.sh.orig	2003-04-24 07:07:24 UTC
++++ src/typesize.sh
+@@ -21,7 +21,7 @@ for i in "short" "int" "long " "unsigned
  	:
        else
  	x=$?
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