* LICENSE=artistic

* using legacy module getopt.pl, add dependency on p5-Perl4-CoreLibs
* fixes some warnings of prototype mismatch.

Bump PKGREVISION from additional dependency.

6 files changed, 60 insertions, 7 deletions

diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 8c5f0b2a23a..df352e980f8 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -1,12 +1,15 @@
-# $NetBSD: Makefile,v 1.24 2013/05/31 12:41:14 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2013/06/15 06:09:37 obache Exp $
 
 DISTNAME=		mailagent-3.0.73
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:S/by-module/by-authors\/id\/RAM/g}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Sophisticated automatic mail-processing tool
+LICENSE=		artistic
+
+DEPENDS+=		p5-Perl4-CoreLibs-[0-9]*:../../devel/p5-Perl4-CoreLibs
 
 USE_TOOLS+=		perl:run
 
diff --git a/mail/mailagent/distinfo b/mail/mailagent/distinfo
index 79df6776280..82e73e83220 100644
--- a/mail/mailagent/distinfo
+++ b/mail/mailagent/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2011/12/14 03:03:47 sbd Exp $
+$NetBSD: distinfo,v 1.6 2013/06/15 06:09:37 obache Exp $
 
 SHA1 (mailagent-3.0.73.tar.gz) = c8a0329d79c98cb25bb53c79f06fcd63df58c418
 RMD160 (mailagent-3.0.73.tar.gz) = 70b2804fdd0602a20cb5a9f3391d460f47972570
@@ -7,11 +7,14 @@ SHA1 (patch-aa) = 3a54c5549bb38050871546b9ab9b58c30349c7a7
 SHA1 (patch-ab) = 06234ca205484e24dc175d828c6ecc82d4dc3342
 SHA1 (patch-ac) = 2431b92220a17eb8125eb31fabbd4a0827a150b3
 SHA1 (patch-ad) = d3e3e39c41219f8cbcff506046e2f00c0d659792
-SHA1 (patch-ae) = 9ba2345d2446321d7777bad4be74e8e8012529be
+SHA1 (patch-ae) = 37aab7df41b7e87aef4963e0e6eabb16e80023e0
 SHA1 (patch-agent_edusers.SH) = 25896f576297e33814f59b30bbacb6c375c12a27
+SHA1 (patch-agent_filter_lock.c) = 2c6d5a958038b264745dfb25765e204cc4bd24c7
+SHA1 (patch-agent_filter_main.c) = fdb7d2f6ee068646cc62329f197b4f9ba137cb9f
 SHA1 (patch-agent_magent.sh) = 39d4e9d6d848f2f51435bab13bb2f27fa391741f
 SHA1 (patch-agent_maildist.SH) = 7b94e87042aa416f6469d2b7cb0d1743db0eefba
 SHA1 (patch-agent_mailhelp.SH) = 0868f72362df49d169a5b45a226befb731cb0d49
 SHA1 (patch-agent_maillist.SH) = 811a179309462561202761e01eec56d3251417c2
 SHA1 (patch-agent_mailpatch.SH) = f25433d766c4acc8d7ffd41697cd217b82bb3cba
 SHA1 (patch-agent_package.SH) = 166319557ec0d6de3667e58010d10800e96da9dd
+SHA1 (patch-agent_pl_utmp_utmp__ph.c) = 1b07456aced48e12ede4cf5d87e4060e34064f1e
diff --git a/mail/mailagent/patches/patch-ae b/mail/mailagent/patches/patch-ae
index 9aee28c045f..4c36bf1041a 100644
--- a/mail/mailagent/patches/patch-ae
+++ b/mail/mailagent/patches/patch-ae
@@ -1,12 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2011/03/06 03:47:27 dholland Exp $
+$NetBSD: patch-ae,v 1.2 2013/06/15 06:09:37 obache Exp $
 
---- agent/filter/misc.c~	2001-03-17 18:31:21.000000000 +0000
+--- agent/filter/misc.c.orig	2001-03-17 18:31:21.000000000 +0000
 +++ agent/filter/misc.c
-@@ -36,14 +36,15 @@
+@@ -36,14 +36,16 @@
   *
   */
  
 +#include <stdlib.h>
++#include <stdio.h>
 +#include <string.h>
 +
  #include "config.h"
diff --git a/mail/mailagent/patches/patch-agent_filter_lock.c b/mail/mailagent/patches/patch-agent_filter_lock.c
new file mode 100644
index 00000000000..3f35eab9b9c
--- /dev/null
+++ b/mail/mailagent/patches/patch-agent_filter_lock.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-agent_filter_lock.c,v 1.1 2013/06/15 06:09:37 obache Exp $
+
+--- agent/filter/lock.c.orig	2001-03-17 18:31:21.000000000 +0000
++++ agent/filter/lock.c
+@@ -48,6 +48,7 @@
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <stdio.h>
+ 
+ #ifdef I_FCNTL
+ #include <fcntl.h>
diff --git a/mail/mailagent/patches/patch-agent_filter_main.c b/mail/mailagent/patches/patch-agent_filter_main.c
new file mode 100644
index 00000000000..5540301f788
--- /dev/null
+++ b/mail/mailagent/patches/patch-agent_filter_main.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-agent_filter_main.c,v 1.1 2013/06/15 06:09:37 obache Exp $
+
+--- agent/filter/main.c.orig	2001-03-17 18:31:21.000000000 +0000
++++ agent/filter/main.c
+@@ -56,6 +56,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <signal.h>
+ #include <sys/types.h>
+ #include <errno.h>
+@@ -81,7 +82,7 @@ extern void env_home();		/* Only for tes
+ extern int errno;
+ 
+ 
+-public void main(argc, argv, envp)
++public int main(argc, argv, envp)
+ int argc;
+ char **argv;
+ char **envp;
diff --git a/mail/mailagent/patches/patch-agent_pl_utmp_utmp__ph.c b/mail/mailagent/patches/patch-agent_pl_utmp_utmp__ph.c
new file mode 100644
index 00000000000..79d521d0581
--- /dev/null
+++ b/mail/mailagent/patches/patch-agent_pl_utmp_utmp__ph.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-agent_pl_utmp_utmp__ph.c,v 1.1 2013/06/15 06:09:37 obache Exp $
+
+--- agent/pl/utmp/utmp_ph.c.orig	2001-03-17 18:31:28.000000000 +0000
++++ agent/pl/utmp/utmp_ph.c
+@@ -50,6 +50,8 @@
+ #include <strings.h>
+ #endif
+ 
++#include <stdio.h>
++#include <stdlib.h>
+ #include <utmp.h>
+ #include "confmagic.h"
+