Upgrade to PL25

Simplify external programs support
Allow users to set their full names

8 files changed, 32 insertions, 24 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index e08ad298eba9..d0603e697082 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -1,25 +1,28 @@
 # New ports collection makefile for:    elm
-# Version required:     2.4 ME8b
+# Version required:     2.4 pl25 ME8b
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.9 1995/12/02 21:30:51 ache Exp $
+# $Id: Makefile,v 1.10 1995/12/04 10:55:52 asami Exp $
 #
 
 DISTNAME=       elm-2.4pl24me8
-VERSION=        2.4m8b          # allows to not edit elm+* Makefiles
+VERSION=        2.4.25m8b          # allows to not edit elm+* Makefiles
 PKGNAME=        elm-${VERSION}
 CATEGORIES+=	mail
-MASTER_SITES=   ftp://cs.hmc.edu/pub/me/
+MASTER_SITES=   ftp://cs.hmc.edu/pub/me/ ftp://ftp.myxa.com/pub/elm/
+DISTFILES=      ${DISTNAME}${EXTRACT_SUFX} elm2.4.p25
+EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ache@FreeBSD.ORG
 
-PATCH_SITES=    ${MASTER_SITES}
+PATCH_SITES=    ftp://cs.hmc.edu/pub/me/
 PATCHFILES=     elm-2.4pl24me8a.diffs.Z elm-2.4pl24me8b.diffs.Z
 PATCH_DIST_STRIP= -p1
 
 pre-patch:
 	rm -f ${WRKSRC}/src/state.c
+	-patch -d ${WRKSRC} -s -p -N -S + < ${PORTSDIR}/distfiles/elm2.4.p25
 
 post-install:
 	cd ${WRKSRC}/nls; ${MAKE} install
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index 2e1a9b4445bd..dd035fc8574a 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -1,3 +1,4 @@
 MD5 (elm-2.4pl24me8.tar.gz) = 5419a3de3b9d8e69ea52c47c617a6a9c
 MD5 (elm-2.4pl24me8a.diffs.Z) = 6be90830bd929cab64e14c5aa7ca97cf
 MD5 (elm-2.4pl24me8b.diffs.Z) = 44505894d67d10a825fa87438aa0d79a
+MD5 (elm2.4.p25) = 5ec93595c7573be4d0cb4ce7097b6e83
diff --git a/mail/elm+ME/pkg-comment b/mail/elm+ME/pkg-comment
index e35506ccf114..4dcc379db14a 100644
--- a/mail/elm+ME/pkg-comment
+++ b/mail/elm+ME/pkg-comment
@@ -1 +1 @@
-ELM Mail User Agent, v2.4pl24 ME8b
+ELM Mail User Agent
diff --git a/mail/elm+ME/scripts/pre-configure b/mail/elm+ME/scripts/pre-configure
index 607029ad3fad..45ad2555ef5c 100644
--- a/mail/elm+ME/scripts/pre-configure
+++ b/mail/elm+ME/scripts/pre-configure
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	pre-configure script for Elm port to FreeBSD 2.0
-#	$Id: pre-configure,v 1.4 1995/11/19 21:11:57 ache Exp $
+#	$Id: pre-configure,v 1.5 1995/11/29 19:07:16 ache Exp $
 
 PortsDir=$PORTSDIR
   CurDir=$CURDIR
@@ -103,7 +103,7 @@ vi
 '
 test='test'
 inews=''
-ispell='ispell'
+ispell='/usr/local/bin/ispell'
 egrep=''
 more='/usr/bin/more'
 pg='pg'
@@ -175,8 +175,8 @@ d_havetlib='define'
 termlib='-ltermlib'
 d_index='undef'
 d_internet='define'
-d_ispell='undef'
-ispell_path=''
+d_ispell='define'
+ispell_path='/usr/local/bin/ispell'
 ispell_options=''
 d_locale='define'
 d_nl_types='define'
@@ -294,7 +294,7 @@ xencf=''
 xenlf=''
 d_xenix='undef'
 d_bsd='define'
-d_pgp='undef'
+d_pgp='define'
 pgp='/usr/local/bin/pgp'
 pgp_path='/usr/local/bin/pgp'
 d_remailer='define'
@@ -304,7 +304,7 @@ CONFIG=true
 EOF
 
 cd ${WrkSrc}
-yes "" | ./Configure
+yes "" | ./Configure -d
 cd ${CurDir}
 
 exit 0
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index e08ad298eba9..d0603e697082 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,25 +1,28 @@
 # New ports collection makefile for:    elm
-# Version required:     2.4 ME8b
+# Version required:     2.4 pl25 ME8b
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.9 1995/12/02 21:30:51 ache Exp $
+# $Id: Makefile,v 1.10 1995/12/04 10:55:52 asami Exp $
 #
 
 DISTNAME=       elm-2.4pl24me8
-VERSION=        2.4m8b          # allows to not edit elm+* Makefiles
+VERSION=        2.4.25m8b          # allows to not edit elm+* Makefiles
 PKGNAME=        elm-${VERSION}
 CATEGORIES+=	mail
-MASTER_SITES=   ftp://cs.hmc.edu/pub/me/
+MASTER_SITES=   ftp://cs.hmc.edu/pub/me/ ftp://ftp.myxa.com/pub/elm/
+DISTFILES=      ${DISTNAME}${EXTRACT_SUFX} elm2.4.p25
+EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ache@FreeBSD.ORG
 
-PATCH_SITES=    ${MASTER_SITES}
+PATCH_SITES=    ftp://cs.hmc.edu/pub/me/
 PATCHFILES=     elm-2.4pl24me8a.diffs.Z elm-2.4pl24me8b.diffs.Z
 PATCH_DIST_STRIP= -p1
 
 pre-patch:
 	rm -f ${WRKSRC}/src/state.c
+	-patch -d ${WRKSRC} -s -p -N -S + < ${PORTSDIR}/distfiles/elm2.4.p25
 
 post-install:
 	cd ${WRKSRC}/nls; ${MAKE} install
diff --git a/mail/elm/distinfo b/mail/elm/distinfo
index 2e1a9b4445bd..dd035fc8574a 100644
--- a/mail/elm/distinfo
+++ b/mail/elm/distinfo
@@ -1,3 +1,4 @@
 MD5 (elm-2.4pl24me8.tar.gz) = 5419a3de3b9d8e69ea52c47c617a6a9c
 MD5 (elm-2.4pl24me8a.diffs.Z) = 6be90830bd929cab64e14c5aa7ca97cf
 MD5 (elm-2.4pl24me8b.diffs.Z) = 44505894d67d10a825fa87438aa0d79a
+MD5 (elm2.4.p25) = 5ec93595c7573be4d0cb4ce7097b6e83
diff --git a/mail/elm/pkg-comment b/mail/elm/pkg-comment
index e35506ccf114..4dcc379db14a 100644
--- a/mail/elm/pkg-comment
+++ b/mail/elm/pkg-comment
@@ -1 +1 @@
-ELM Mail User Agent, v2.4pl24 ME8b
+ELM Mail User Agent
diff --git a/mail/elm/scripts/pre-configure b/mail/elm/scripts/pre-configure
index 607029ad3fad..45ad2555ef5c 100644
--- a/mail/elm/scripts/pre-configure
+++ b/mail/elm/scripts/pre-configure
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	pre-configure script for Elm port to FreeBSD 2.0
-#	$Id: pre-configure,v 1.4 1995/11/19 21:11:57 ache Exp $
+#	$Id: pre-configure,v 1.5 1995/11/29 19:07:16 ache Exp $
 
 PortsDir=$PORTSDIR
   CurDir=$CURDIR
@@ -103,7 +103,7 @@ vi
 '
 test='test'
 inews=''
-ispell='ispell'
+ispell='/usr/local/bin/ispell'
 egrep=''
 more='/usr/bin/more'
 pg='pg'
@@ -175,8 +175,8 @@ d_havetlib='define'
 termlib='-ltermlib'
 d_index='undef'
 d_internet='define'
-d_ispell='undef'
-ispell_path=''
+d_ispell='define'
+ispell_path='/usr/local/bin/ispell'
 ispell_options=''
 d_locale='define'
 d_nl_types='define'
@@ -294,7 +294,7 @@ xencf=''
 xenlf=''
 d_xenix='undef'
 d_bsd='define'
-d_pgp='undef'
+d_pgp='define'
 pgp='/usr/local/bin/pgp'
 pgp_path='/usr/local/bin/pgp'
 d_remailer='define'
@@ -304,7 +304,7 @@ CONFIG=true
 EOF
 
 cd ${WrkSrc}
-yes "" | ./Configure
+yes "" | ./Configure -d
 cd ${CurDir}
 
 exit 0