* update to 116 revision

* conditionnaly add USE_ICONV
* startup script converted to rcNG
* Makefile reworked
* DOC_FILES added
* DOCSDIR utilized

PR:		ports/67497
Submitted by:	maintainer
Approved by:	krion (mentor)

3 files changed, 75 insertions, 38 deletions

diff --git a/mail/elm+ME/files/00elm.sh b/mail/elm+ME/files/00elm.sh
index b498c4549044..ab80dc89b7ea 100644
--- a/mail/elm+ME/files/00elm.sh
+++ b/mail/elm+ME/files/00elm.sh
@@ -2,20 +2,36 @@
 #
 # $FreeBSD$
 #
+# Configure the shared library cache
+#
+# PROVIDE: elm
+# REQUIRE: ldconfig
+# KEYWORD: FreeBSD
+
+elm_enable="YES"
+elm_shlib_dir="%%SHLIB_DIR%%"
+
+. %%RC_SUBR%%
+
+name=ldconfig
+rcvar=$(set_rcvar)
+ldconfig_command="/sbin/ldconfig"
+load_rc_config ${name}
+
+name="elm"
+rcvar=$(set_rcvar)
+start_cmd="elm_start"
+stop_cmd=":"
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
+elm_start ()
+{
+	_ins=
+	ldconfig=${ldconfig_command}
+	checkyesno ldconfig_insecure && _ins="-i"
+	if [ -x "${ldconfig_command}" ]; then
+		${ldconfig} -m ${_ins} ${elm_shlib_dir}
+	fi
+}
 
-case "$1" in
-start)
-	/sbin/ldconfig -m ${PREFIX}/%%SHLIB_SUBDIR%%
-	;;
-stop)
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" 2>&1
-	exit 64
-	;;
-esac
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/mail/elm+ME/files/patch-ac b/mail/elm+ME/files/patch-ac
index fd8393602082..c86bf8799e53 100644
--- a/mail/elm+ME/files/patch-ac
+++ b/mail/elm+ME/files/patch-ac
@@ -1,21 +1,42 @@
---- Configure.orig	Tue Jul 23 20:26:30 2002
-+++ Configure	Tue Jul 23 20:26:31 2002
-@@ -94,10 +94,10 @@
-     yes)
-     ;;
-     *)
--    if test ! -t 0; then
--	echo "Say 'sh Configure', not 'sh <Configure'"
--	exit 1
--    fi
-+#     if test ! -t 0; then
-+# 	echo "Say 'sh Configure', not 'sh <Configure'"
-+# 	exit 1
-+#     fi
-     ;;
- esac
- 
-@@ -2251,7 +2251,7 @@
+--- Configure.orig	Sat Nov 15 17:19:06 2003
++++ Configure	Tue Dec 23 03:24:03 2003
+@@ -64,7 +64,7 @@
+ 		    shift
+ 		    ;;
+ 		-P*)
+-		    prefix="`expr \"$1\" : '-P\(.*\)'`"
++		    prefix="`expr \"X$1\" : 'X-P\(.*\)'`"
+ 		    shift
+ 		    case "$prefix" in
+ 			"")
+@@ -75,7 +75,7 @@
+        		    echo "Prefix: $prefix"
+ 		;;
+ 		-s*)
+-		    libsuffix="`expr \"$1\" : '-s\(.*\)'`"
++		    libsuffix="`expr \"X$1\" : 'X-s\(.*\)'`"
+ 		    shift
+ 		    case "$libsuffix" in
+ 			"")
+@@ -86,7 +86,7 @@
+        		    echo "Extra library suffix: $libsuffix"
+ 		;;
+ 		-c*)
+-		    config="`expr \"$1\" : '-c\(.*\)'`"
++		    config="`expr \"X$1\" : 'X-c\(.*\)'`"
+ 		    shift
+ 		    case "$config" in
+ 			"")
+@@ -122,7 +122,7 @@
+ case "$error" in
+ true)
+     cat >&2 << EOM
+-Usage: Configure [-dS]
++Usage: Configure [-dbhSMN] [-P'prefix'] [-s'suffix'] [-c'config'] [-DDEBUG]
+   -d : use defaults for all answers.
+   -b : batchmode -- do not prompt user (implies -d)
+   -h : print this help message and exit (with an error status).
+@@ -2296,7 +2296,7 @@
  	echo "Found shlib directory"
      fi
  
@@ -24,7 +45,7 @@
  
      LibLoc=`cd ..; pwd`/shlib
      
-@@ -2544,7 +2544,10 @@
+@@ -2589,7 +2589,10 @@
  
  : see if crypt exists
  echo " "
@@ -36,7 +57,7 @@
      echo 'crypt() found.'
      d_crypt="$define"
      cryptlib=''
-@@ -3048,6 +3051,7 @@
+@@ -3093,6 +3096,7 @@
  
      $echo $n "Testing if inet_aton can be used ... $c"
      $cat > try.c <<'EOF'
diff --git a/mail/elm+ME/files/patch-newmbox.c b/mail/elm+ME/files/patch-header_alloc.c
index 9ee96d2d04e4..cf2a7f5c708a 100644
--- a/mail/elm+ME/files/patch-newmbox.c
+++ b/mail/elm+ME/files/patch-header_alloc.c
@@ -1,6 +1,6 @@
---- src/newmbox.c.orig	Wed Mar 20 08:04:48 2002
-+++ src/newmbox.c	Tue Apr 16 05:02:54 2002
-@@ -422,6 +422,36 @@
+--- src/messages/header_alloc.c.orig	Wed Dec 17 19:22:20 2003
++++ src/messages/header_alloc.c	Tue Dec 23 03:14:46 2003
+@@ -333,6 +333,36 @@
      }
  
      if (NULL != (tmphdr = locate_header_by_name(parsed_headers,