Update to 2.4.99b.

PR:		40937
Submitted by:	Cyrille Lefevre <cyrille.lefevre@laposte.net>

5 files changed, 20 insertions, 27 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 5bb9a35fdf98..e74033c924b2 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -72,7 +72,7 @@ MLINKS=		frm.1 nfrm.1	newmail.1 wnewmail.1
 
 ELM_VERSION=	2.4
 ELM_REVISION=	99
-ELM_PATCHLEVEL=	_
+ELM_PATCHLEVEL=	b
 
 ELM_PATCHDONE=	false
 .for level in _ a b c d e f
@@ -98,7 +98,8 @@ DOC_SUBDIR=	share/doc/elm+ME
 RCD_DIR=	${PREFIX}/${RCD_SUBDIR}
 LIB_DIR=	${PREFIX}/${LIB_SUBDIR}
 
-RCD_FILE=	00elm.sh
+_RCD_FILE=	00elm.sh
+RCD_FILE=	000.elm.sh
 MIME_TYPES=	elm.mimetypes
 MIME_CSETS=	elm.mimecharsets
 TERM_INFO=	elm.terminalinfo
@@ -113,11 +114,14 @@ DOC_FILES=	README.ME+ \
 # Post-patch
 #
 
-post-patch: patch-install-script patch-setgid patch-nls-files
+post-patch: fix-permissions patch-install-script patch-setgid patch-nls-files
+
+fix-permissions:
+	@${CHMOD} -R u+w ${WRKSRC}
 
 patch-install-script:
 	@${SED} -e 's,%%SHLIB_SUBDIR%%,${SHLIB_SUBDIR},' \
-		${FILESDIR}/${RCD_FILE} > ${WRKSRC}/${RCD_FILE}
+		${FILESDIR}/${_RCD_FILE} > ${WRKSRC}/${RCD_FILE}
 
 # d_savegrpmboxid is currently broken using setgid(2) instead of setegid(2).
 # will probably be fixed in a next release, for instance, fake a patch.
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index 7d2a7b6f7fb8..d4760e8bc3ed 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -1 +1,3 @@
 MD5 (elm-2.4ME+99.tar.gz) = 014e2a606fb1a7e80d048680c80dfb60
+MD5 (elm-2.4ME+PL99a.patch.gz) = d8898816793c0b46ce9779a86c5bda03
+MD5 (elm-2.4ME+PL99b.patch.gz) = d5c1a2a0293d208a1f9927cf96a7ad7f
diff --git a/mail/elm+ME/files/00elm.sh b/mail/elm+ME/files/00elm.sh
index 337653829286..b498c4549044 100644
--- a/mail/elm+ME/files/00elm.sh
+++ b/mail/elm+ME/files/00elm.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
 
 if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
     echo "$0: Cannot determine the PREFIX" >&2
diff --git a/mail/elm+ME/files/patch-ac b/mail/elm+ME/files/patch-ac
index 03f3251a3625..fd8393602082 100644
--- a/mail/elm+ME/files/patch-ac
+++ b/mail/elm+ME/files/patch-ac
@@ -1,6 +1,6 @@
---- Configure.orig	Sat Jan 19 01:18:12 2002
-+++ Configure	Sat Jan 19 17:19:40 2002
-@@ -84,10 +84,10 @@
+--- Configure.orig	Tue Jul 23 20:26:30 2002
++++ Configure	Tue Jul 23 20:26:31 2002
+@@ -94,10 +94,10 @@
      yes)
      ;;
      *)
@@ -15,23 +15,7 @@
      ;;
  esac
  
-@@ -157,6 +157,7 @@
- 	nomap=y
-     fi
-     . ConfTool/GenCharmap 
-+    cp doc/terminal.info bin/elm.terminalinfo
-     exit 0
-     ;;
- map)
-@@ -187,6 +188,7 @@
- 	nomap=y
-     fi
-     . ConfTool/GenCharmap 
-+    cp doc/terminal.info bin/elm.terminalinfo
-     exit 0
-     ;;
- esac
-@@ -2050,7 +2052,7 @@
+@@ -2251,7 +2251,7 @@
  	echo "Found shlib directory"
      fi
  
@@ -40,7 +24,7 @@
  
      LibLoc=`cd ..; pwd`/shlib
      
-@@ -2342,7 +2344,10 @@
+@@ -2544,7 +2544,10 @@
  
  : see if crypt exists
  echo " "
@@ -52,7 +36,7 @@
      echo 'crypt() found.'
      d_crypt="$define"
      cryptlib=''
-@@ -2846,6 +2851,7 @@
+@@ -3048,6 +3051,7 @@
  
      $echo $n "Testing if inet_aton can be used ... $c"
      $cat > try.c <<'EOF'
diff --git a/mail/elm+ME/pkg-plist b/mail/elm+ME/pkg-plist
index 5188ab38ed4d..ac4b07bdcf05 100644
--- a/mail/elm+ME/pkg-plist
+++ b/mail/elm+ME/pkg-plist
@@ -16,7 +16,7 @@ bin/newmail
 @unexec rm -f %B/wnewmail
 bin/printmail
 bin/readmsg
-etc/rc.d/00elm.sh
+etc/rc.d/000.elm.sh
 %%LIB_SUBDIR%%/elm-help.0
 %%LIB_SUBDIR%%/elm-help.1
 %%LIB_SUBDIR%%/elm-help.2