5 files changed, 59 insertions, 67 deletions

diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 96209105732c..b552373343a6 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -1,15 +1,19 @@
 # New ports collection makefile for:	mailagent
-# Version required:		3.0.44
+# Version required:		3.0pl53+unofficial-patch
 # Date created:			23 Sep 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1996/11/17 07:42:30 obrien Exp $
+# $Id: Makefile,v 1.5 1996/12/08 01:44:51 max Exp $
 #
 
-DISTNAME=	mailagent-3.0pl44
-PKGNAME=	mailagent-3.0.44
+DISTNAME=	mailagent-3.0pl53
+PKGNAME=	mailagent-3.0.53
 CATEGORIES=	mail
-MASTER_SITES=	http://www.sfc.wide.ad.jp/~max/FreeBSD/ports/distfiles/ 
+MASTER_SITES=	http://www.sfc.wide.ad.jp/~max/FreeBSD/ports/distfiles/ \
+		ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS
+
+PATCHFILES=	mailagent-3.0pl53-unoff-patch.gz
+PATCH_SITES=	http://www.sfc.wide.ad.jp/~max/FreeBSD/ports/distfiles/
 
 MAINTAINER=	max@FreeBSD.ORG
 
@@ -23,16 +27,17 @@ IS_INTERACTIVE=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=		-dres \
-			-Dccflags='${CFLAGS} -D_HAVE_PARAM_H' \
-			-Dperlpath='/usr/local/bin/perl' \
+			-Dperlpath='${PERLPATH}/perl' \
 			-Dutmp='/var/run/utmp' \
 			-Dprefix='${PREFIX}' -Dmansrc='${PREFIX}/man/man1' \
 			-Dnotifypatches='false'
+MAKE_ENV=	PATH=${PERLPATH}:/bin:/sbin:/usr/bin:/usr/sbin
 INSTALL_TARGET=	install install.man
 
 MAN1=			edusers.1 mailagent.1 maildist.1  \
 			maillist.1 mailpatch.1 package.1
 # Note that mailhelp.1 is intentionally left uncompressed as it is referred
 # from several other man pages with .so macro.
+PERLPATH!=	dirname `which perl5.003`
 
 .include <bsd.port.mk>
diff --git a/mail/mailagent/distinfo b/mail/mailagent/distinfo
index 86ef621c28af..88ee9884c508 100644
--- a/mail/mailagent/distinfo
+++ b/mail/mailagent/distinfo
@@ -1 +1,2 @@
-MD5 (mailagent-3.0pl44.tar.gz) = 07bb7951f6e0e3398aad81ac051d4127
+MD5 (mailagent-3.0pl53.tar.gz) = 48880a49c38ac1cc997298302915b81e
+MD5 (mailagent-3.0pl53-unoff-patch.gz) = ef8af8028e316d53543b60347f72f75a
diff --git a/mail/mailagent/files/patch-aa b/mail/mailagent/files/patch-aa
index 8e01bf0196dd..31a640b797f3 100644
--- a/mail/mailagent/files/patch-aa
+++ b/mail/mailagent/files/patch-aa
@@ -1,27 +1,23 @@
-*** agent/filter/logfile.c.orig	Thu Jan 26 17:06:23 1995
---- agent/filter/logfile.c	Sat Mar 23 02:42:02 1996
-***************
-*** 47,52 ****
---- 47,55 ----
-  # undef KERNEL
-  #endif
-  #include "confmagic.h"
-+ #ifdef _HAVE_PARAM_H
-+ #include <sys/param.h>
-+ #endif
-  
-  #define MAX_STRING	1024			/* Maximum length for logging string */
-  
-***************
-*** 176,183 ****
---- 179,188 ----
-  	 */
-  
-  #ifdef HAS_SYS_ERRLIST
-+ #if !(defined(BSD) && (BSD >= 199306))
-  	extern int sys_nerr;					/* Size of sys_errlist[] */
-  	extern char *sys_errlist[];				/* Maps error code to string */
-+ #endif
-  #endif
-  
-  #ifdef HAS_STRERROR
+--- agent/filter/logfile.c.orig	Fri Dec 27 00:53:50 1996
++++ agent/filter/logfile.c	Thu Jan 16 13:57:14 1997
+@@ -49,6 +49,9 @@
+ # include <sys/time.h>
+ # undef KERNEL
+ #endif
++#ifdef I_SYS_PARAM
++# include <sys/param.h>
++#endif
+ #include "confmagic.h"
+ 
+ #define MAX_STRING	1024			/* Maximum length for logging string */
+@@ -180,8 +183,10 @@
+ 	 */
+ 
+ #ifdef HAS_SYS_ERRLIST
++#if !(defined(BSD) && (BSD >= 199306))
+ 	extern int sys_nerr;					/* Size of sys_errlist[] */
+ 	extern char *sys_errlist[];				/* Maps error code to string */
++#endif
+ #endif
+ 
+ #ifdef HAS_STRERROR
diff --git a/mail/mailagent/files/patch-ac b/mail/mailagent/files/patch-ac
index a6e05f1db4b5..494de74149ff 100644
--- a/mail/mailagent/files/patch-ac
+++ b/mail/mailagent/files/patch-ac
@@ -1,31 +1,21 @@
-*** agent/filter/io.c.orig	Fri Sep  1 05:11:42 1995
---- agent/filter/io.c	Fri Mar 29 04:05:28 1996
-***************
-*** 69,74 ****
---- 69,77 ----
-  #include <stdio.h>
-  #include <errno.h>
-  #include <sys/stat.h>
-+ #ifdef _HAVE_PARAM_H
-+ #include <sys/param.h>
-+ #endif
-  
-  #ifdef I_SYS_WAIT
-  #include <sys/wait.h>
-***************
-*** 428,434 ****
-  	 */
-  	
-  	char **envp;			/* Environment pointer */
-! #ifdef UNION_WAIT
-  	union wait status;		/* Waiting status */
-  #else
-  	int status;				/* Status from command */
---- 431,437 ----
-  	 */
-  	
-  	char **envp;			/* Environment pointer */
-! #if defined(UNION_WAIT) && !defined(BSD)
-  	union wait status;		/* Waiting status */
-  #else
-  	int status;				/* Status from command */
+--- agent/filter/io.c.orig	Fri Dec 27 00:55:27 1996
++++ agent/filter/io.c	Thu Jan 16 14:11:00 1997
+@@ -110,6 +110,9 @@
+ #ifdef I_SYS_IOCTL
+ #include <sys/ioctl.h>
+ #endif
++#ifdef I_SYS_PARAM
++#include <sys/param.h>
++#endif
+ 
+ /*
+  * The following should be defined in <sys/stat.h>.
+@@ -635,7 +638,7 @@
+ 	 */
+ 	
+ 	char **envp;			/* Environment pointer */
+-#ifdef UNION_WAIT
++#if defined(UNION_WAIT) && (!defined(BSD) || BSD < 199306)
+ 	union wait status;		/* Waiting status */
+ #else
+ 	int status;				/* Status from command */
diff --git a/mail/mailagent/scripts/pre-configure b/mail/mailagent/scripts/pre-configure
index 5108d0a87a25..6a5a1be25c9e 100644
--- a/mail/mailagent/scripts/pre-configure
+++ b/mail/mailagent/scripts/pre-configure
@@ -10,7 +10,7 @@ while [ X$addr = X ]; do
 done
 
 while [ X$host = X ]; do
-    echo -n "Enter fully qualified name of this host (`hostname`)>" ; read host
+    echo -n "Enter fully qualified name of this host (`hostname`)> " ; read host
     if [ X$host = X ]; then
         host=`hostname`
     fi