From ed2c89d24145bd321b1934fdd69ee29d878c705b Mon Sep 17 00:00:00 2001
From: okan <okan@openbsd.org>
Date: Sat, 12 Jan 2008 19:15:37 +0000
Subject: [PATCH] proper proto fix for malloc() from mickey (and a pkg bump)

ok merdely
---
 mail/majordomo/Makefile                |  4 ++--
 mail/majordomo/patches/patch-wrapper_c | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 9d1fd9c9791..432b425bdc1 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2007/09/16 00:17:05 merdely Exp $
+# $OpenBSD: Makefile,v 1.16 2008/01/12 19:15:37 okan Exp $
 
 COMMENT=	mailing list manager
 
 DISTNAME=	majordomo-1.94.5
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=     mail
 
 HOMEPAGE=	http://www.greatcircle.com/majordomo/
diff --git a/mail/majordomo/patches/patch-wrapper_c b/mail/majordomo/patches/patch-wrapper_c
index 6b14e2a3e50..03077ce8f69 100644
--- a/mail/majordomo/patches/patch-wrapper_c
+++ b/mail/majordomo/patches/patch-wrapper_c
@@ -1,6 +1,16 @@
---- wrapper.c.orig	Wed Aug 27 12:01:12 1997
-+++ wrapper.c	Tue May 23 07:06:23 2000
-@@ -42,20 +42,27 @@
+--- wrapper.c.orig	Wed Aug 27 15:01:12 1997
++++ wrapper.c	Fri Jan  4 18:06:49 2008
+@@ -16,9 +16,7 @@ static char rcs_header[] = "$Header: /sources/cvsrepos
+ #include <stdio.h>
+ #include <sysexits.h>
+ 
+-#if defined(sun) && defined(sparc)
+ #include <stdlib.h>
+-#endif
+ 
+ 
+ #ifndef STRCHR
+@@ -42,20 +40,27 @@ static char rcs_header[] = "$Header: /sources/cvsrepos
  #  define SHELL "SHELL=/bin/sh"
  #endif
  
@@ -31,7 +41,7 @@
  
  main(argc, argv, env)
      int argc;
-@@ -89,11 +96,7 @@
+@@ -89,11 +94,7 @@ main(argc, argv, env)
       *  if they exist.
       */
  
@@ -44,7 +54,7 @@
  
      for (i = 0 ; env[i] != NULL && e <= new_env_size; i++) {
  	if ((strncmp(env[i], "USER=", 5) == 0) ||
-@@ -153,5 +156,6 @@
+@@ -153,5 +154,6 @@ main(argc, argv, env)
      fprintf(stderr, "    PATH is %s,\n", PATH);
      fprintf(stderr, "    SHELL is %s,\n", SHELL);
      fprintf(stderr, "    MAJORDOMO_CF is %s\n", MAJORDOMO_CF);