upgrade to PL68

12 files changed, 46 insertions, 24 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 75e14ede3b27..2d0ef559f2cb 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -1,13 +1,14 @@
-# New ports collection makefile for:    elm
+# New ports collection makefile for:    elm ME+ (unofficial Elm)
 # See also: http://www.ozone.fmi.fi/KEH/
-# Version required:     2.4ME
+# Version required:     2.4ME+
 # Date created:         26 June 1995
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
-DISTNAME=       elm-2.4ME+61
+# WARNING: it is NOT official Elm 2.*
+DISTNAME=       elm-2.4ME+68
 CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.ozone.fmi.fi/KEH/ \
 		ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
@@ -15,7 +16,7 @@ MASTER_SITES=   ftp://ftp.ozone.fmi.fi/KEH/ \
 
 MAINTAINER=	ache@FreeBSD.org
 
-WRKSRC=         ${WRKDIR}/elm2.4.ME+.61
+WRKSRC=         ${WRKDIR}/elm2.4.ME+.68
 MAN1=           answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
 		frm.1 listalias.1 messages.1 newalias.1 newmail.1 \
 		printmail.1 readmsg.1
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index 9274419b2282..184136a532c1 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -1 +1 @@
-MD5 (elm-2.4ME+61.tar.gz) = fe34149362156cdaf27c10ba08a87785
+MD5 (elm-2.4ME+68.tar.gz) = 879b98df17dc5e8fce959ed4a666b564
diff --git a/mail/elm+ME/pkg-comment b/mail/elm+ME/pkg-comment
index 7464de623761..68efab4af774 100644
--- a/mail/elm+ME/pkg-comment
+++ b/mail/elm+ME/pkg-comment
@@ -1 +1 @@
-A once-popular mail user agent
+A once-popular mail user agent, unofficial clone.
diff --git a/mail/elm+ME/pkg-descr b/mail/elm+ME/pkg-descr
index 489b59b72c53..c80c268a40b7 100644
--- a/mail/elm+ME/pkg-descr
+++ b/mail/elm+ME/pkg-descr
@@ -1,2 +1,2 @@
        Elm is an interactive screen-oriented mailer program  that
-       supersedes mail and mailx.
+       supersedes mail and mailx. This is unofficial clone.
diff --git a/mail/elm+ME/pkg-plist b/mail/elm+ME/pkg-plist
index a4cd02519650..b0cde400c7d7 100644
--- a/mail/elm+ME/pkg-plist
+++ b/mail/elm+ME/pkg-plist
@@ -15,6 +15,7 @@ bin/readmsg
 lib/prlong
 lib/elm.mimecharsets
 lib/elm.mimetypes
+lib/elmcharset
 lib/elmrc-info
 lib/elm-help.0
 lib/elm-help.1
diff --git a/mail/elm+ME/scripts/pre-configure b/mail/elm+ME/scripts/pre-configure
index 3bf25680f933..2ae7a156371f 100644
--- a/mail/elm+ME/scripts/pre-configure
+++ b/mail/elm+ME/scripts/pre-configure
@@ -24,7 +24,11 @@ d_rename='define'
 d_symlink='define'
 d_whoami='undef'
 d_poll='define'
+d_select='define'
 d_mmap='define'
+d_socket='define'
+d_netdb='define'
+d_netinet_in='define'
 d_inttypes='define'
 d_nointtypes='undef'
 n='-n'
@@ -40,8 +44,10 @@ cat
 chgrp
 chmod
 cp
+dirname
 echo
 expr
+egrep
 grep
 fgrep
 head
@@ -78,6 +84,7 @@ date
 emacs
 execmail
 finger
+gpg
 ispell
 line
 lint
@@ -110,7 +117,7 @@ vi
 test='/bin/test'
 inews=''
 ispell="${PREFIX}/bin/ispell"
-egrep=''
+egrep='/usr/bin/egrep'
 more='/usr/bin/more'
 pg='pg'
 Mcc='Mcc'
@@ -153,7 +160,7 @@ compress='/usr/bin/compress'
 execmail=''
 libswanted='sun intl nls c_s'
 noaddlib='yes'
-c_date='Wed Sep  8 21:06:00 MSD 1999'
+c_date='Sat Jan 22 15:43:26 MSK 2000'
 d_ascii='undef'
 d_broke_ctype='undef'
 d_calendar='define'
@@ -168,7 +175,7 @@ d_domname='define'
 d_usegetdom='undef'
 d_errlst='define'
 d_flock='define'
-d_dotlock='undef'
+d_dotlock='define'
 d_fcntlock='undef'
 has_flock='define'
 has_fcntl='define'
@@ -298,8 +305,10 @@ d_bsd='define'
 locale='locale'
 d_pgp='define'
 pgp="${PREFIX}/bin/pgp"
-pgp_path="${PREFIX}/bin/pgp"
-special_path='/usr/local/bin'
+pgp2_path="${PREFIX}/bin/pgp"
+pgp5_dir='none'
+gpg_path='none'
+special_path='${PREFIX}/bin'
 CONFIG=true
 EOF
 
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 75e14ede3b27..2d0ef559f2cb 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,13 +1,14 @@
-# New ports collection makefile for:    elm
+# New ports collection makefile for:    elm ME+ (unofficial Elm)
 # See also: http://www.ozone.fmi.fi/KEH/
-# Version required:     2.4ME
+# Version required:     2.4ME+
 # Date created:         26 June 1995
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
-DISTNAME=       elm-2.4ME+61
+# WARNING: it is NOT official Elm 2.*
+DISTNAME=       elm-2.4ME+68
 CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.ozone.fmi.fi/KEH/ \
 		ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
@@ -15,7 +16,7 @@ MASTER_SITES=   ftp://ftp.ozone.fmi.fi/KEH/ \
 
 MAINTAINER=	ache@FreeBSD.org
 
-WRKSRC=         ${WRKDIR}/elm2.4.ME+.61
+WRKSRC=         ${WRKDIR}/elm2.4.ME+.68
 MAN1=           answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
 		frm.1 listalias.1 messages.1 newalias.1 newmail.1 \
 		printmail.1 readmsg.1
diff --git a/mail/elm/distinfo b/mail/elm/distinfo
index 9274419b2282..184136a532c1 100644
--- a/mail/elm/distinfo
+++ b/mail/elm/distinfo
@@ -1 +1 @@
-MD5 (elm-2.4ME+61.tar.gz) = fe34149362156cdaf27c10ba08a87785
+MD5 (elm-2.4ME+68.tar.gz) = 879b98df17dc5e8fce959ed4a666b564
diff --git a/mail/elm/pkg-comment b/mail/elm/pkg-comment
index 7464de623761..68efab4af774 100644
--- a/mail/elm/pkg-comment
+++ b/mail/elm/pkg-comment
@@ -1 +1 @@
-A once-popular mail user agent
+A once-popular mail user agent, unofficial clone.
diff --git a/mail/elm/pkg-descr b/mail/elm/pkg-descr
index 489b59b72c53..c80c268a40b7 100644
--- a/mail/elm/pkg-descr
+++ b/mail/elm/pkg-descr
@@ -1,2 +1,2 @@
        Elm is an interactive screen-oriented mailer program  that
-       supersedes mail and mailx.
+       supersedes mail and mailx. This is unofficial clone.
diff --git a/mail/elm/pkg-plist b/mail/elm/pkg-plist
index a4cd02519650..b0cde400c7d7 100644
--- a/mail/elm/pkg-plist
+++ b/mail/elm/pkg-plist
@@ -15,6 +15,7 @@ bin/readmsg
 lib/prlong
 lib/elm.mimecharsets
 lib/elm.mimetypes
+lib/elmcharset
 lib/elmrc-info
 lib/elm-help.0
 lib/elm-help.1
diff --git a/mail/elm/scripts/pre-configure b/mail/elm/scripts/pre-configure
index 3bf25680f933..2ae7a156371f 100644
--- a/mail/elm/scripts/pre-configure
+++ b/mail/elm/scripts/pre-configure
@@ -24,7 +24,11 @@ d_rename='define'
 d_symlink='define'
 d_whoami='undef'
 d_poll='define'
+d_select='define'
 d_mmap='define'
+d_socket='define'
+d_netdb='define'
+d_netinet_in='define'
 d_inttypes='define'
 d_nointtypes='undef'
 n='-n'
@@ -40,8 +44,10 @@ cat
 chgrp
 chmod
 cp
+dirname
 echo
 expr
+egrep
 grep
 fgrep
 head
@@ -78,6 +84,7 @@ date
 emacs
 execmail
 finger
+gpg
 ispell
 line
 lint
@@ -110,7 +117,7 @@ vi
 test='/bin/test'
 inews=''
 ispell="${PREFIX}/bin/ispell"
-egrep=''
+egrep='/usr/bin/egrep'
 more='/usr/bin/more'
 pg='pg'
 Mcc='Mcc'
@@ -153,7 +160,7 @@ compress='/usr/bin/compress'
 execmail=''
 libswanted='sun intl nls c_s'
 noaddlib='yes'
-c_date='Wed Sep  8 21:06:00 MSD 1999'
+c_date='Sat Jan 22 15:43:26 MSK 2000'
 d_ascii='undef'
 d_broke_ctype='undef'
 d_calendar='define'
@@ -168,7 +175,7 @@ d_domname='define'
 d_usegetdom='undef'
 d_errlst='define'
 d_flock='define'
-d_dotlock='undef'
+d_dotlock='define'
 d_fcntlock='undef'
 has_flock='define'
 has_fcntl='define'
@@ -298,8 +305,10 @@ d_bsd='define'
 locale='locale'
 d_pgp='define'
 pgp="${PREFIX}/bin/pgp"
-pgp_path="${PREFIX}/bin/pgp"
-special_path='/usr/local/bin'
+pgp2_path="${PREFIX}/bin/pgp"
+pgp5_dir='none'
+gpg_path='none'
+special_path='${PREFIX}/bin'
 CONFIG=true
 EOF