ports/71114: Maintainer update : mail/elm+ME (2.4.119 + openssl build fix)
Cyrille Lefevre
cyrille.lefevre at laposte.net
Sun Aug 29 20:00:39 UTC 2004
>Number: 71114
>Category: ports
>Synopsis: Maintainer update : mail/elm+ME (2.4.119 + openssl build fix)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 29 20:00:39 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Cyrille Lefevre
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
ACME
>Environment:
System: FreeBSD gits 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Mon Aug 23 04:03:32 CEST 2004 root at gits.gits.invalid:/disk1/freebsd/current/obj/disk3/freebsd/current/src/sys/CUSTOM i386
>Description:
Makefile : USE_OPENSSL added, OPENSSL_* options added, ELM_REVISION bumped to 119.
distinfo : updated
files/00elm.sh : rcNG update
files/patch-aa : deleted
files/patch-ac : updated
files/patch-mailmsg2.c : rewritten
scripts/pre-configure : updated
thanks to "Stephen Griffin" for testing the build w/ the openssl ports.
>How-To-Repeat:
n/a
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/Makefile,v
retrieving revision 1.85
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.85 Makefile
--- Makefile 12 Jul 2004 12:27:05 -0000 1.85
+++ Makefile 25 Aug 2004 02:23:33 -0000
@@ -20,6 +20,7 @@
ftp://ftp.ntua.gr/pub/net/mail/elm-me/ \
ftp://ftp.eos.hokudai.ac.jp/pub/network/mail/elm-2.4ME+/ \
ftp://ftp.win.ne.jp/pub/network/mail/elm-2.4ME+/
+
# the following repositories maybe conform to the main repository.
# MASTER_SITES+= ftp://ftp.unina.it/pub/Unix/pkgs/network/mail/elm-me+/ \
# ftp://ftp.rge.com/pub/mail/elm/elm-2.4ME+/ \
@@ -46,13 +47,16 @@
HAS_CONFIGURE= yes
USE_RC_SUBR= yes
USE_REINPLACE= yes
+USE_OPENSSL= yes
CONFIGURE_SCRIPT= Configure
SCRIPTS_ENV= CONFIG_PATH="${CONFIG_PATH}" CFLAGS="${CFLAGS}" \
PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}" \
MAN1PREFIX="${MAN1PREFIX}" CONF_DIR="${CONF_DIR}" \
LIB_DIR="${LIB_DIR}" SHLIB_DIR="${SHLIB_DIR}" \
- STAGE_DIR="${STAGE_DIR}" ELM_SHLIBS="${ELM_SHLIBS}"
+ STAGE_DIR="${STAGE_DIR}" ELM_SHLIBS="${ELM_SHLIBS}" \
+ OPENSSLLIB="${OPENSSLLIB}" OPENSSLINC="${OPENSSLINC}" \
+ OPENSSLBASE="${OPENSSLBASE}"
CONFIGURE_ARGS= -b -S -P ${PREFIX} -c ../${CONFIG_PATH:T}
MAKE_ENV= MJ="FORMATTER=groff FORMATTER_OPTS=-Tlatin1"
@@ -82,7 +86,9 @@
.if !defined(ELM_USER_SHLIBS)
OPTIONS= ELM_ICONV "libiconv support" on \
ELM_SMTP "SMTP submission protocol (RFC2746) support" on \
- ELM_TLS "POP STLS and IMAP STARTTLS support" on
+ ELM_TLS "POP STLS and IMAP STARTTLS support" on \
+ OPENSSL_BASE "use the base system OpenSSL (required by TLS)" on \
+ OPENSSL_PORT "use OpenSSL from ports (requires by TLS)" off
.endif
.include <bsd.port.pre.mk>
@@ -91,7 +97,7 @@
#
ELM_VERSION= 2.4
-ELM_REVISION= 116
+ELM_REVISION= 119
ELM_PATCHLEVEL= _ # a...z = patch-level, _ means no patch-level.
ELM_PATCHDONE= false
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/distinfo,v
retrieving revision 1.49
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.49 distinfo
--- distinfo 12 Jul 2004 12:27:05 -0000 1.49
+++ distinfo 25 Aug 2004 02:23:33 -0000
@@ -1,2 +1,2 @@
-MD5 (elm-2.4ME+116.tar.gz) = cb2ef246253a679268102e3e0d0b1954
-SIZE (elm-2.4ME+116.tar.gz) = 1458277
+MD5 (elm-2.4ME+119.tar.gz) = b9491fcc6533a42d1e835c5cc0049a45
+SIZE (elm-2.4ME+119.tar.gz) = 1491512
Index: files/00elm.sh
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/files/00elm.sh,v
retrieving revision 1.3
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.3 00elm.sh
--- files/00elm.sh 12 Jul 2004 12:27:05 -0000 1.3
+++ files/00elm.sh 25 Aug 2004 02:23:33 -0000
@@ -8,8 +8,8 @@
# REQUIRE: ldconfig
# KEYWORD: FreeBSD
-elm_enable="YES"
-elm_shlib_dir="%%SHLIB_DIR%%"
+elm_enable=${elm_enable:-"YES"}
+elm_shlib_dir=${elm_shlib_dir:-"%%SHLIB_DIR%%"}
. %%RC_SUBR%%
@@ -25,6 +25,8 @@
elm_start ()
{
+ local _ins
+
_ins=
ldconfig=${ldconfig_command}
checkyesno ldconfig_insecure && _ins="-i"
Index: files/patch-ac
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/files/patch-ac,v
retrieving revision 1.11
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.11 patch-ac
--- files/patch-ac 12 Jul 2004 12:27:05 -0000 1.11
+++ files/patch-ac 25 Aug 2004 02:23:36 -0000
@@ -27,24 +27,6 @@
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
-
-- $echo "Trying create chared library"
-+ $echo "Trying create shared library"
-
- LibLoc=`cd ..; pwd`/shlib
-
@@ -2589,7 +2589,10 @@
: see if crypt exists
Index: files/patch-mailmsg2.c
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/files/patch-mailmsg2.c,v
retrieving revision 1.1
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.1 patch-mailmsg2.c
--- files/patch-mailmsg2.c 24 Jun 2002 04:51:30 -0000 1.1
+++ files/patch-mailmsg2.c 25 Aug 2004 02:23:36 -0000
@@ -1,61 +1,61 @@
---- src/mailmsg2.c.orig Wed Mar 20 08:04:47 2002
-+++ src/mailmsg2.c Fri May 10 10:21:54 2002
-@@ -259,6 +259,7 @@
-
- } else if (copy_msg && ! retransmit) { /* if retransmit we have it! */
- struct string * From_buffer = NULL;
-+ struct string * Date_buffer = NULL;
- struct addr_item *p;
+--- src/mailmsg2.c.orig Wed Aug 4 19:07:35 2004
++++ src/mailmsg2.c Wed Aug 25 01:44:23 2004
+@@ -486,6 +486,7 @@
+ } else if (
+ (forwarding || mime_attach || copy_msg)) {
+ struct string * From_buffer = NULL;
++ struct string * Date_buffer = NULL;
+ struct addr_item *p;
- if (current_header->from) {
-@@ -277,7 +278,23 @@
+ if (hdr->from) {
+@@ -504,7 +505,22 @@
+ }
}
}
- }
-
+
-+ if (current_header->time_sent) {
-+ char date_buf[SLEN];
++ if (hdr->time_sent) {
++ char date_buf[SLEN];
+
-+ Date_buffer = new_string(display_charset);
-+ add_ascii_to_string(Date_buffer,
-+ s2us(elm_date_str(date_buf,
-+ current_header->time_sent +
-+ current_header->tz_offset,
-+ sizeof date_buf)));
-+ if (current_header->time_zone[0]) {
-+ add_ascii_to_string(Date_buffer, s2us(" "));
++ Date_buffer = new_string(display_charset);
+ add_ascii_to_string(Date_buffer,
-+ s2us(current_header->time_zone));
++ s2us(elm_date_str(date_buf,
++ hdr->time_sent +
++ hdr->tz_offset,
++ sizeof date_buf)));
++ if (hdr->time_zone[0]) {
++ add_ascii_to_string(Date_buffer, s2us(" "));
++ add_ascii_to_string(Date_buffer, s2us(hdr->time_zone));
++ }
+ }
-+ }
+
- if (!cur_editcharset)
- cur_editcharset = display_charset;
+ if (!cur_editcharset)
+ cur_editcharset = display_charset;
-@@ -296,12 +313,14 @@
- current_header->env_from);
-
- } else if (attribution[0] && current_header) {
-+ char * date = us2s(stream_from_string(Date_buffer,1,NULL));
- if (From_buffer) {
- char * str = us2s(stream_from_string(From_buffer,1,NULL));
-- fprintf(reply, attribution, str);
-+ fprintf(reply, attribution, str, date);
- free(str);
- } else
-- fprintf(reply, attribution, current_header->env_from);
-+ fprintf(reply, attribution, current_header->env_from, date);
-+ free(date);
- fputc('\n', reply);
- }
- if (edit_message && current_folder) {
-@@ -389,6 +408,8 @@
- }
- if (From_buffer)
- free_string(&From_buffer);
-+ if (Date_buffer)
-+ free_string(&Date_buffer);
- }
-
- if (!cur_editcharset)
+@@ -523,12 +539,15 @@
+ hdr->env_from);
+
+ } else if (attribution[0] && hdr) {
++ char * date = us2s(stream_from_string(Date_buffer,1,NULL));
++
+ if (From_buffer) {
+ char * str = us2s(stream_from_string(From_buffer,1,NULL));
+- fprintf(reply, attribution, str);
++ fprintf(reply, attribution, str, date);
+ free(str);
+ } else
+- fprintf(reply, attribution, hdr->env_from);
++ fprintf(reply, attribution, hdr->env_from, date);
++ free(date);
+ fputc('\n', reply);
+ }
+ if (edit_message && mailbox_file) {
+@@ -621,6 +640,8 @@
+
+ if (From_buffer)
+ free_string(&From_buffer);
++ if (Date_buffer)
++ free_string(&Date_buffer);
+
+ } else {
+ /* make referenced message as edited message */
Index: scripts/pre-configure
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/scripts/pre-configure,v
retrieving revision 1.34
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.34 pre-configure
--- scripts/pre-configure 12 Jul 2004 12:27:05 -0000 1.34
+++ scripts/pre-configure 25 Aug 2004 02:23:37 -0000
@@ -101,7 +101,7 @@
diff
emacs
execmail
-finger
+gencat
gpg
ispell
line
@@ -177,9 +177,10 @@
pack='pack'
compress='/usr/bin/compress'
execmail=''
+gencat='/usr/bin/gencat'
libswanted='sun nls c_s'
noaddlib='yes'
-c_date='Wed Dec 24 03:02:21 CET 2003'
+c_date='Tue Aug 24 15:05:52 CEST 2004'
d_ascii='undef'
d_broke_ctype='undef'
d_calendar='define'
@@ -359,9 +360,9 @@
EOF
tee -a ${CONFIG_PATH} >> ${WRKSRC}/shared_libs/tls/config.res << EOF
-tls_dir='system'
-tls_include_dir=''
-tls_lib_dir=''
+tls_dir='${OPENSSLBASE}'
+tls_include_dir='${OPENSSLINC}'
+tls_lib_dir='${OPENSSLLIB}'
EOF
exit 0
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list