Date: Tue, 11 Jul 2006 02:00:25 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/100034: Update port: mail/mmr to 1.6.0 Message-ID: <20060711020025.0fd308d4.tkato432@yahoo.com> Resent-Message-ID: <200607101710.k6AHAHIW082224@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 100034 >Category: ports >Synopsis: Update port: mail/mmr to 1.6.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 10 17:10:17 GMT 2006 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p19 i386 >Organization: >Environment: >Description: - Update to version 1.6.0 New file: files/patch-handlemail.cpp files/patch-outgoing.cpp Remove file: files/patch-aa files/patch-ab files/patch-ac files/patch-ad files/patch-ae files/patch-base64.cpp files/patch-iobottle.cpp files/patch-listings.cpp files/patch-terminal.cpp >How-To-Repeat: >Fix: diff -urN /usr/ports/mail/mmr/Makefile mail/mmr/Makefile --- /usr/ports/mail/mmr/Makefile Tue Sep 28 20:02:36 2004 +++ mail/mmr/Makefile Mon Jul 10 01:15:29 2006 @@ -6,19 +6,29 @@ # PORTNAME= mmr -PORTVERSION= 1.5.5 +PORTVERSION= 1.6.0 CATEGORIES= mail MASTER_SITES= http://www.devolution.com/~slouken/projects/mmr/ MAINTAINER= ports@FreeBSD.org COMMENT= Curses based MIME Mail Reader -ALL_TARGET= # empty -USE_GCC= 2.95 +USE_ICONV= yes +MAKE_ARGS= LIBS='${LDFLAGS}' CXX='${CXX}' CXXFLAGS='${CXXFLAGS}' +ALL_TARGET= ${PORTNAME} PORTDOCS= BUGS CHANGES Features README TODO -PLIST_FILES= bin/mmr ${EXAMPLESDIR:S,${PREFIX}/,,}/dot.mmrc.sample -PLIST_DIRS= ${EXAMPLESDIR:S,${PREFIX}/,,} +PLIST_FILES= bin/mmr %%EXAMPLESDIR%%/dot.mmrc.sample +PLIST_DIRS= %%EXAMPLESDIR%% + +CXXFLAGS+= -DTHREADMAIL \ + -DMAILPATH=\"/var/mail\" \ + -DMAILER=\"/usr/sbin/sendmail\ -t\" \ + -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib -liconv -lcurses -lmd + +post-patch: + @${REINPLACE_CMD} -e 's|md5/libmd5.a||g' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mmr ${PREFIX}/bin diff -urN /usr/ports/mail/mmr/distinfo mail/mmr/distinfo --- /usr/ports/mail/mmr/distinfo Sat Nov 26 19:27:10 2005 +++ mail/mmr/distinfo Sun Jul 9 23:35:25 2006 @@ -1,3 +1,3 @@ -MD5 (mmr-1.5.5.tar.gz) = 115e22f8dc8d6f4ce96ab7b17f3a1796 -SHA256 (mmr-1.5.5.tar.gz) = 0a90f6a7cb11994009bfec4f0e0d227d01154346688d7a31d9b9aa6ce2441750 -SIZE (mmr-1.5.5.tar.gz) = 94016 +MD5 (mmr-1.6.0.tar.gz) = de9d6642b10bb53b6530caab522ff273 +SHA256 (mmr-1.6.0.tar.gz) = 62a939f603ced7fb55c35cd57aad4f7dc7e83c7f640138f7862bc1e9f6c24e45 +SIZE (mmr-1.6.0.tar.gz) = 76654 diff -urN /usr/ports/mail/mmr/files/patch-aa mail/mmr/files/patch-aa --- /usr/ports/mail/mmr/files/patch-aa Sat Apr 1 08:51:52 2000 +++ mail/mmr/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,23 +0,0 @@ ---- Makefile.orig Fri Mar 31 03:26:17 2000 -+++ Makefile Fri Mar 31 03:27:50 2000 -@@ -7,15 +7,15 @@ - # (Toggled at runtime with ^T) - # -DMAILPATH=\"/some/path\" - # Set the default mail spool directory --DEFS = -DTHREADMAIL -+DEFS = -DTHREADMAIL -DMAILPATH=\"/var/mail\" -DMAILER=\"/usr/sbin/sendmail\ -t\" - - OBJS = main.o rcfile.o listing.o handlemail.o commands.o terminal.o mailmsg.o \ - mime.o mimetype.o base64.o filemap.o iobottle.o my_regex.o outgoing.o \ - md5/libmd5.a --LIBS = -lcurses -ltermcap -lnsl --CXX = g++ -g --INCDIRS = -Imd5 -I/usr/include/ncurses --CXXFLAGS = $(DEFS) $(INCDIRS) -O2 -+LIBS = -lncurses -+CXX ?= g++ -g -+INCDIRS = -Imd5 -+CXXFLAGS += $(DEFS) $(INCDIRS) - - # Remind 'make' how to make C++ files.. *sigh* - include .c++howto diff -urN /usr/ports/mail/mmr/files/patch-ab mail/mmr/files/patch-ab --- /usr/ports/mail/mmr/files/patch-ab Sat Apr 1 08:51:53 2000 +++ mail/mmr/files/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,12 +0,0 @@ ---- outgoing.cpp.orig Thu Apr 22 23:24:59 1999 -+++ outgoing.cpp Fri Mar 31 03:22:18 2000 -@@ -14,7 +14,9 @@ - #include "rcfile.h" - #include "outgoing.h" - -+#ifndef MAILER - #define MAILER "/usr/lib/sendmail -t" -+#endif - #define EDITOR "vi +%d" - #define SIGFILE ".signature" - diff -urN /usr/ports/mail/mmr/files/patch-ac mail/mmr/files/patch-ac --- /usr/ports/mail/mmr/files/patch-ac Sat May 1 11:47:37 1999 +++ mail/mmr/files/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,14 +0,0 @@ ---- terminal.h Mon Jun 23 21:49:40 1997 -+++ /home/andy/tmp/wrk/terminal.h Tue Apr 27 18:06:25 1999 -@@ -13,7 +13,11 @@ - extern "C" { - #include <stdlib.h> - #include <stdarg.h> -+#ifdef __FreeBSD__ -+#include <ncurses.h> -+#else - #include <curses.h> -+#endif - } - - /* Note that screen coordinates start at (1,1) */ diff -urN /usr/ports/mail/mmr/files/patch-ad mail/mmr/files/patch-ad --- /usr/ports/mail/mmr/files/patch-ad Sat May 1 11:47:38 1999 +++ mail/mmr/files/patch-ad Thu Jan 1 09:00:00 1970 @@ -1,8 +0,0 @@ ---- md5/Makefile Wed Feb 12 01:38:38 1997 -+++ /home/andy/tmp/wrk/md5/Makefile Tue Apr 27 18:12:21 1999 -@@ -1,4 +1,4 @@ --CC = gcc -+CC?= gcc - - libmd5.a: md5c.o - ar rvc $@ md5c.o diff -urN /usr/ports/mail/mmr/files/patch-ae mail/mmr/files/patch-ae --- /usr/ports/mail/mmr/files/patch-ae Sat Oct 26 13:58:41 2002 +++ mail/mmr/files/patch-ae Thu Jan 1 09:00:00 1970 @@ -1,40 +0,0 @@ ---- mailmsg.cpp.orig Tue May 30 01:59:06 2000 -+++ mailmsg.cpp Fri Oct 25 13:54:39 2002 -@@ -18,7 +18,7 @@ - mailmsg::boundary[] = { "From", NULL }; - - /* This is called by a program to create a new list of messages */ --mailmsg:: mailmsg(IObottle *mailfile, void (*oncreate)(mailmsg *ptr) = NULL) -+mailmsg:: mailmsg(IObottle *mailfile, void (*oncreate)(mailmsg *ptr)) - { - struct mbox_data *MBox; - -@@ -173,7 +173,7 @@ - /* Simple corruption check -- early end? */ - if ( strncmp(newdata, "From ", - strlen("From ")) == 0 ) { -- cerr << "Warning: Corrupt mailfile?" << endl; -+ std::cerr << "Warning: Corrupt mailfile?" << std::cerr; - break; - } - -@@ -338,7 +338,7 @@ - - /* See/Set the status of the message */ - const char * --mailmsg:: Status(int in_listing = 0) -+mailmsg:: Status(int in_listing) - { - /* Thread aware. :) */ - if ( in_listing && (mbox->showthreads == HIDE_THREADS) ) { -@@ -664,8 +664,8 @@ - - /* Sanity check */ - if ( i != (strlen(newsubject)-RElen) ) { -- cerr << "Warning: RE stripping: possible corruption!" -- << endl; -+ std::cerr << "Warning: RE stripping: possible corruption!" -+ << std::cerr; - } - - /* Make it the new subject */ diff -urN /usr/ports/mail/mmr/files/patch-base64.cpp mail/mmr/files/patch-base64.cpp --- /usr/ports/mail/mmr/files/patch-base64.cpp Thu Oct 24 00:02:44 2002 +++ mail/mmr/files/patch-base64.cpp Thu Jan 1 09:00:00 1970 @@ -1,7 +0,0 @@ ---- base64.cpp.orig Mon Oct 21 23:29:39 2002 -+++ base64.cpp Mon Oct 21 23:29:56 2002 -@@ -1,3 +1,4 @@ -+#include <string.h> - - /* Convert to Base64 encoding */ - static char to_base64[64] = { diff -urN /usr/ports/mail/mmr/files/patch-handlemail.cpp mail/mmr/files/patch-handlemail.cpp --- /usr/ports/mail/mmr/files/patch-handlemail.cpp Thu Jan 1 09:00:00 1970 +++ mail/mmr/files/patch-handlemail.cpp Sun Jul 9 23:39:02 2006 @@ -0,0 +1,10 @@ +--- handlemail.cpp.orig Tue Jan 24 06:32:46 2006 ++++ handlemail.cpp Sun Jul 9 23:38:50 2006 +@@ -9,6 +9,7 @@ + #include <dirent.h> + #include <errno.h> + #include <string.h> ++#include <limits.h> + } + + #include "headers.h" diff -urN /usr/ports/mail/mmr/files/patch-iobottle.cpp mail/mmr/files/patch-iobottle.cpp --- /usr/ports/mail/mmr/files/patch-iobottle.cpp Sat Oct 26 13:58:41 2002 +++ mail/mmr/files/patch-iobottle.cpp Thu Jan 1 09:00:00 1970 @@ -1,25 +0,0 @@ ---- iobottle.cpp.orig Fri Aug 6 05:39:19 1999 -+++ iobottle.cpp Fri Oct 25 13:58:58 2002 -@@ -1,3 +1,4 @@ -+#include <string.h> - - extern "C" { - #include <stdlib.h> -@@ -97,7 +98,7 @@ - } - /* If buf[len-1] is a null, then a newline should be written */ - size_t --IObottle:: writeline(char *buf, size_t len = 0) { -+IObottle:: writeline(char *buf, size_t len) { - int lenwritten = 0; - - if ( fputs(buf, wfp) >= 0 ) -@@ -134,7 +135,7 @@ - return(0); - } - int --IObottle:: set_time(time_t actime, time_t modtime = 0) { -+IObottle:: set_time(time_t actime, time_t modtime) { - struct stat sb; - struct utimbuf ub; - diff -urN /usr/ports/mail/mmr/files/patch-listings.cpp mail/mmr/files/patch-listings.cpp --- /usr/ports/mail/mmr/files/patch-listings.cpp Sat Oct 26 09:27:50 2002 +++ mail/mmr/files/patch-listings.cpp Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- listing.cpp.orig Fri Oct 25 14:00:55 2002 -+++ listing.cpp Fri Oct 25 14:01:12 2002 -@@ -40,7 +40,7 @@ - } - - void --Msg_Listing:: ReSize(int modified = 1) -+Msg_Listing:: ReSize(int modified) - { - if ( modified ) { - helppane->reset(); -@@ -1197,7 +1197,7 @@ - } - - mailmsg * --Msg_Listing:: View(mailmsg *which, MIME_body *body = NULL) -+Msg_Listing:: View(mailmsg *which, MIME_body *body) - { - mailmsg *newmsg, *holder; - diff -urN /usr/ports/mail/mmr/files/patch-main.cpp mail/mmr/files/patch-main.cpp --- /usr/ports/mail/mmr/files/patch-main.cpp Sat Oct 26 09:27:50 2002 +++ mail/mmr/files/patch-main.cpp Sun Jul 9 23:38:20 2006 @@ -1,197 +1,10 @@ ---- main.cpp.orig Fri Oct 25 13:49:34 2002 -+++ main.cpp Fri Oct 25 13:49:52 2002 -@@ -38,12 +38,12 @@ - void LoadStatus(mailmsg *message) - { - static char twiddle[] = "-+|+"; -- cerr << "\b\b" << twiddle[message->Index()%4] << ')'; -+ std::cerr << "\b\b" << twiddle[message->Index()%4] << ')'; - } - void QuitStatus(mailmsg *message) - { - static char twiddle[] = "-+|+"; -- cerr << "\b\b" << twiddle[message->Index()%4] << ')'; -+ std::cerr << "\b\b" << twiddle[message->Index()%4] << ')'; - } +--- main.cpp.orig Tue Jan 24 03:04:56 2006 ++++ main.cpp Sun Jul 9 23:38:13 2006 +@@ -1,6 +1,7 @@ - void CleanupMessages(void) -@@ -149,26 +149,26 @@ - case SIGHUP: - if ( messages ) - messages->Abort(); -- cout << "\rExiting because of hang-up signal!" << endl; -+ std::cout << "\rExiting because of hang-up signal!" << std::cerr; - break; - case SIGINT: - case SIGQUIT: - if ( messages ) - messages->Abort(); -- cout << "\rExiting because of keyboard interrupt!" << -- endl; -+ std::cout << "\rExiting because of keyboard interrupt!" << -+ std::cerr; - break; - case SIGSEGV: - case SIGBUS: - if ( messages ) - messages->Abort(); -- cout << "\rExiting because of program bug!" << endl; -+ std::cout << "\rExiting because of program bug!" << std::cerr; - break; - case SIGTERM: - if ( messages ) - messages->Abort(); -- cout << "\rExiting because of termination signal!" << -- endl; -+ std::cout << "\rExiting because of termination signal!" << -+ std::cerr; - break; - default: - break; -@@ -178,17 +178,17 @@ - char cmdbuf[BUFSIZ]; + /* This is the main body of my C++ mailer */ - if ( messages ) { -- cout << "Saving messages: ( )" << flush; -+ std::cout << "Saving messages: ( )" << std::flush; - messages->OnSave(QuitStatus); - CleanupMessages(); - messages = NULL; -- cout << " -- Done." << endl; -+ std::cout << " -- Done." << std::cerr; ++#include <limits.h> + #include <time.h> - /* Check for new mail */ - time_t atime, mtime; - mailfile->get_time(&atime, &mtime); - if ( mtime > atime ) -- cout << "You have NEW mail!" << endl; -+ std::cout << "You have NEW mail!" << std::cerr; - } - if ( was_compressed ) { - /* For some reason, this crashes on some mailboxes -@@ -202,9 +202,9 @@ - - /* Any final mailfile cleanup */ - if ( was_compressed ) { -- cout << "Compressing mailfile..." << flush; -+ std::cout << "Compressing mailfile..." << std::flush; - (void) system(cmdbuf); -- cout << "Done." << endl; -+ std::cout << "Done." << std::cerr; - /* For some reason, this crashes on some mailboxes - delete[] cmdbuf; - */ -@@ -447,12 +447,12 @@ - - void Usage(char *prog) - { -- cout << --Version << endl << endl << --"Usage: " << prog << " [-s subject] recipient1 recipient2 ... " << endl << --"or... " << prog << " -c" << endl << --"or... " << prog << " [-r initfile] [-f mailbox]" << endl << -- endl; -+ std::cout << -+Version << std::cerr << std::cerr << -+"Usage: " << prog << " [-s subject] recipient1 recipient2 ... " << std::cerr << -+"or... " << prog << " -c" << std::cerr << -+"or... " << prog << " [-r initfile] [-f mailbox]" << std::cerr << -+ std::cerr; - } - - main(int argc, char *argv[]) -@@ -511,7 +511,7 @@ - /* Command line mailing? */ - if ( *argv ) { - if ( NewMail(argv, subject) < 0 ) { -- cerr << "Mail send failed!" << endl; -+ std::cerr << "Mail send failed!" << std::cerr; - quit(-1); - } - quit(0); -@@ -526,7 +526,7 @@ - ((mailpath=(char *)getenv("MAIL")) == NULL) ) { - if ( ((whoami=getlogin()) == NULL) && - ((whoami=mycuserid()) == NULL) ) { -- cerr << "Who are you? -- Aborting!" << endl; -+ std::cerr << "Who are you? -- Aborting!" << std::cerr; - quit(-1); - } - mailpath = new char[strlen(MAILPATH)+1+strlen(whoami)+1]; -@@ -546,25 +546,25 @@ - struct stat sb; - - if ( stat(mailpath, &sb) < 0 ) { -- cout << mailpath << " is not readable" << endl; -+ std::cout << mailpath << " is not readable" << std::cerr; - quit(0); - } - if ( sb.st_size == 0 ) { -- cout << "No mail." << endl; -+ std::cout << "No mail." << std::cerr; - quit(0); - } - if ( check_mail ) { - if ( sb.st_mtime < sb.st_atime ) -- cout << "You have mail." << endl; -+ std::cout << "You have mail." << std::cerr; - else -- cout << "You have NEW mail." << endl; -+ std::cout << "You have NEW mail." << std::cerr; - quit(0); - } - - /* Check to see if the lock file exists */ - if ( CheckLock(mailpath) ) { -- cout << "Lockfile (" << mailpath << ".lock) exists!" << endl; -- cout << "Please try again later..." << endl; -+ std::cout << "Lockfile (" << mailpath << ".lock) exists!" << std::cerr; -+ std::cout << "Please try again later..." << std::cerr; - quit(0); - } - -@@ -592,10 +592,10 @@ - - /* Perform decompression */ - if ( decompress ) { -- cout << "Uncompressing mailfile..." << flush; -+ std::cout << "Uncompressing mailfile..." << std::flush; - if ( system(cmdbuf) == 0 ) - was_compressed = 1; -- cout << "Done." << endl; -+ std::cout << "Done." << std::cerr; - } - delete[] cmdbuf; - } -@@ -616,11 +616,11 @@ - char buffer[BUFSIZ]; - - if ( mailfile->fail() || mailfile->eof() ) { -- cout << "No mail in " << mailpath << endl; -+ std::cout << "No mail in " << mailpath << std::cerr; - quit(0); - } - if ( mailfile->readline(buffer, BUFSIZ) == 1 ) { -- cout << "Newline at start of mailfile -- aborting!" << endl; -+ std::cout << "Newline at start of mailfile -- aborting!" << std::cerr; - quit(-1); - } - mailfile->seekg(0); -@@ -629,7 +629,7 @@ - MIME_body::MIME_Ignore(GetStartVar("MIME_ignore")); - - /* If we have succeeded in opening the mailfile, load mail */ -- cout << "Loading messages: ( )" << flush; -+ std::cout << "Loading messages: ( )" << std::flush; - messages = new mailmsg(mailfile, LoadStatus); - if ( ((current = messages->ByStatus("N")) == NULL) && - ((current = messages->ByStatus("O")) == NULL) ) { -@@ -637,7 +637,7 @@ - for ( current = messages; newmsg = current->Next(); ) - current = newmsg; - } -- cout << " -- Done." << endl; -+ std::cout << " -- Done." << std::cerr; - sleep(1); - mailfile->get_time(NULL, &last_mtime); - mailfile->Size(&last_size); + /* Include all of the standard headers that we need */ diff -urN /usr/ports/mail/mmr/files/patch-mime.cpp mail/mmr/files/patch-mime.cpp --- /usr/ports/mail/mmr/files/patch-mime.cpp Sat Oct 26 09:27:50 2002 +++ mail/mmr/files/patch-mime.cpp Sun Jul 9 23:47:07 2006 @@ -1,20 +1,11 @@ ---- mime.cpp.orig Fri Oct 25 13:55:40 2002 -+++ mime.cpp Fri Oct 25 13:56:15 2002 -@@ -102,7 +102,7 @@ +--- mime.cpp.orig Tue Jan 24 16:58:33 2006 ++++ mime.cpp Sun Jul 9 23:46:48 2006 +@@ -110,7 +110,7 @@ + } + size_t available = obytesleft; + while ( ibytesleft > 0 ) { +- iconv(iconv_ctx, &ibuf, &ibytesleft, &obuf, &obytesleft); ++ iconv(iconv_ctx, (const char **)&ibuf, &ibytesleft, &obuf, &obytesleft); - /* The MIME_body class constructor */ - MIME_body:: MIME_body(IObottle *RawFile, char *endings[], -- MIME_body *lineage = NULL) -+ MIME_body *lineage) - { - MD5_CTX md5_ctx; - int i; -@@ -652,7 +652,7 @@ - length) to a new IO stream with SaveRaw(), or these changes will be lost. - */ - int --MIME_body:: AddPart(const char *file, int is_mime = 0) -+MIME_body:: AddPart(const char *file, int is_mime) - { - MD5_CTX md5_ctx; - int (*EncodeFile)(FILE *, IObottle *); + if ( ibytesleft > 0 ) { + if ( errno == EILSEQ ) { diff -urN /usr/ports/mail/mmr/files/patch-outgoing.cpp mail/mmr/files/patch-outgoing.cpp --- /usr/ports/mail/mmr/files/patch-outgoing.cpp Thu Jan 1 09:00:00 1970 +++ mail/mmr/files/patch-outgoing.cpp Mon Jul 10 01:14:33 2006 @@ -0,0 +1,12 @@ +--- outgoing.cpp.orig Mon Jan 23 17:55:34 2006 ++++ outgoing.cpp Mon Jul 10 01:14:23 2006 +@@ -16,7 +16,9 @@ + #include "tempfile.h" + #include "outgoing.h" + ++#ifndef MAILER + #define MAILER "/usr/lib/sendmail -t" ++#endif + #define EDITOR "vi +%d" + #define SIGFILE ".signature" + diff -urN /usr/ports/mail/mmr/files/patch-terminal.cpp mail/mmr/files/patch-terminal.cpp --- /usr/ports/mail/mmr/files/patch-terminal.cpp Sat Oct 26 09:27:50 2002 +++ mail/mmr/files/patch-terminal.cpp Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- terminal.cpp.orig Fri Oct 25 13:51:29 2002 -+++ terminal.cpp Fri Oct 25 13:51:50 2002 -@@ -11,7 +11,7 @@ - int Terminal::wasraw = 0; - int Terminal::maxwait = 0; - --Terminal:: Terminal(int makeraw = 1) -+Terminal:: Terminal(int makeraw) - { - /* Initialize curses, if necessary */ - if ( refcount == 0 ) { -@@ -133,7 +133,7 @@ - - /* Input routines */ - int --Terminal:: waitchar(WINDOW *the_win = NULL) -+Terminal:: waitchar(WINDOW *the_win) - { - int ch, t; - >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060711020025.0fd308d4.tkato432>