Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Jul 2002 23:35:52 +0200 (CEST)
From:      Cyrille Lefevre <cyrille.lefevre@laposte.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/40937: Maintainer update: mail/elm (2.4.99b)
Message-ID:  <200207232135.g6NLZqfh046849@gits.gits.dyndns.org>

next in thread | raw e-mail | index | archive | help

>Number:         40937
>Category:       ports
>Synopsis:       Maintainer update: mail/elm (2.4.99b)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 23 14:40:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Cyrille Lefevre
>Release:        FreeBSD 4.6-RC i386
>Organization:
ACME
>Environment:
System: FreeBSD gits 4.6-STABLE FreeBSD 4.6-STABLE #16: Sat Jul  6 19:06:54 CEST 2002     root@gits:/disk2/freebsd/stable/src/sys/compile/CUSTOM  i386
>Description:
	patchlevel bumped

	Makefile
		ELM_PATCHLEVEL bumped
		00elm.sh now installed as 000.elm.sh
	distinfo
		updated
	pkg-plist
		00elm.sh changed to 000.elm.sh
	files/patch-ac
		doc/terminal.info -> bin/elm.terminalinfo no more needed
>How-To-Repeat:
	n/a
>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/Makefile,v
retrieving revision 1.79
diff -u -r1.79 Makefile
--- Makefile	24 Jun 2002 04:51:30 -0000	1.79
+++ Makefile	23 Jul 2002 18:24:46 -0000
@@ -72,7 +72,7 @@
 
 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 @@
 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
@@ -117,7 +118,7 @@
 
 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.
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/distinfo,v
retrieving revision 1.45
diff -u -r1.45 distinfo
--- distinfo	24 Jun 2002 04:51:30 -0000	1.45
+++ distinfo	23 Jul 2002 18:25:23 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/pkg-plist,v
retrieving revision 1.18
diff -u -r1.18 pkg-plist
--- pkg-plist	24 Jun 2002 04:51:30 -0000	1.18
+++ pkg-plist	23 Jul 2002 21:27:01 -0000
@@ -16,7 +16,7 @@
 @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
Index: files/00elm.sh
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/files/00elm.sh,v
retrieving revision 1.1
diff -u -r1.1 00elm.sh
--- files/00elm.sh	27 May 2001 12:56:05 -0000	1.1
+++ files/00elm.sh	29 Jun 2002 22:10:31 -0000
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
 
 if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
     echo "$0: Cannot determine the PREFIX" >&2
Index: files/patch-ac
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/files/patch-ac,v
retrieving revision 1.9
diff -u -r1.9 patch-ac
--- files/patch-ac	10 May 2002 20:30:13 -0000	1.9
+++ files/patch-ac	23 Jul 2002 18:50:45 -0000
@@ -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'
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207232135.g6NLZqfh046849>