Index: head/mail/elmo/Makefile =================================================================== --- head/mail/elmo/Makefile (revision 414047) +++ head/mail/elmo/Makefile (revision 414048) @@ -1,47 +1,39 @@ # Created by: trevor # $FreeBSD$ PORTNAME= elmo -PORTVERSION= 1.3.0 -PORTREVISION= 3 +PORTVERSION= 1.3.2 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Receive, filter, read, compose, and send mail at the text console +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + CONFLICTS= elmo-devel-[0-9]* -OPTIONS_DEFINE= NLS +OPTIONS_DEFINE= GPGME NLS GNU_CONFIGURE= yes USES= iconv ncurses shebangfix perl5 USE_OPENSSL= yes USE_PERL5= run SHEBANG_FILES= src/elmoconf.pl -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +GPGME_DESC= GnuPG support using GPGME +GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme +GPGME_CONFIGURE_ENV_OFF=ac_cv_header_gpgme_h=no NLS_CONFIGURE_ON= --with-libintl-prefix="${LOCALBASE}" NLS_CONFIGURE_OFF= --disable-nls NLS_USES= gettext OPTIONS_SUB= yes -.if exists(${LOCALBASE}/lib/libgpgme.so) || defined(WITH_GPGME) -LIB_DEPENDS+= libgpgme.so:security/gpgme -.else -pre-everything:: - @${ECHO_CMD} - @${ECHO_CMD} "Define WITH_GPGME=yes to build with gpgme support." - @${ECHO_CMD} -.endif - post-patch: - @${REINPLACE_CMD} -e 's|gpgme4|gpgme|g' -e 's|== "|= "|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|gpgme4|gpgme|g' ${WRKSRC}/src/pgp.c + @${REINPLACE_CMD} -e '/if test/s|==|=|g' ${WRKSRC}/configure .include Index: head/mail/elmo/distinfo =================================================================== --- head/mail/elmo/distinfo (revision 414047) +++ head/mail/elmo/distinfo (revision 414048) @@ -1,2 +1,2 @@ -SHA256 (elmo-1.3.0.tar.gz) = 6a4033ac4db0316fc3cbb5b36a1422ecaaae844cd0c668240037f3a6cf68d36b -SIZE (elmo-1.3.0.tar.gz) = 513705 +SHA256 (elmo-1.3.2.tar.gz) = 96fa20b171e3c24262b3af150e89141a2a59883075b5e6a0f9a40ff60830fcbd +SIZE (elmo-1.3.2.tar.gz) = 536768 Index: head/mail/elmo/files/patch-src_rstring.c =================================================================== --- head/mail/elmo/files/patch-src_rstring.c (revision 414047) +++ head/mail/elmo/files/patch-src_rstring.c (nonexistent) @@ -1,18 +0,0 @@ ---- src/rstring.c.orig Sat Aug 7 03:01:05 2004 -+++ src/rstring.c Sat Aug 7 03:02:12 2004 -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - -@@ -38,6 +37,7 @@ - #include "rarray.h" - #include "rstring.h" - #include "error.h" -+#include - #include "memchunk.h" - #include "str.h" - Property changes on: head/mail/elmo/files/patch-src_rstring.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/elmo/files/patch-src_str.c =================================================================== --- head/mail/elmo/files/patch-src_str.c (revision 414047) +++ head/mail/elmo/files/patch-src_str.c (nonexistent) @@ -1,14 +0,0 @@ ---- src/str.c.orig Sat Aug 7 11:07:36 2004 -+++ src/str.c Sat Aug 7 11:22:37 2004 -@@ -217,7 +217,11 @@ - - while (1){ - max_size = str->size - str->len - 1; -+#if (defined(__FreeBSD__) && __FreeBSD__ < 5) -+ copy = ap; -+#else - va_copy (copy, ap); -+#endif - n = vsnprintf (str->str + str->len, max_size, fmt, copy); - if (n > -1 && n < max_size){ - str->len += n; Property changes on: head/mail/elmo/files/patch-src_str.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/elmo/files/patch-src_elmoconf.pl =================================================================== --- head/mail/elmo/files/patch-src_elmoconf.pl (revision 414047) +++ head/mail/elmo/files/patch-src_elmoconf.pl (revision 414048) @@ -1,10 +1,10 @@ ---- src/elmoconf.pl.orig Sat Aug 7 11:30:51 2004 -+++ src/elmoconf.pl Sat Aug 7 11:32:44 2004 +--- src/elmoconf.pl.orig 2004-08-13 11:18:22 UTC ++++ src/elmoconf.pl @@ -26,7 +26,6 @@ # This script sets up user's config file based on few simple questions. use strict; -use warnings; use constant VERSION => "1.48"; Index: head/mail/elmo/files/patch-src_gettext.h =================================================================== --- head/mail/elmo/files/patch-src_gettext.h (nonexistent) +++ head/mail/elmo/files/patch-src_gettext.h (revision 414048) @@ -0,0 +1,11 @@ +--- src/gettext.h.orig 2003-04-26 19:01:59 UTC ++++ src/gettext.h +@@ -42,7 +42,7 @@ + for invalid uses of the value returned from these functions. + On pre-ANSI systems without 'const', the config.h file is supposed to + contain "#define const". */ +-# define gettext(Msgid) ((const char *) (Msgid)) ++# define gettext(Msgid) ((char *) (Msgid)) + # define dgettext(Domainname, Msgid) ((const char *) (Msgid)) + # define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) + # define ngettext(Msgid1, Msgid2, N) \ Property changes on: head/mail/elmo/files/patch-src_gettext.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/elmo/pkg-descr =================================================================== --- head/mail/elmo/pkg-descr (revision 414047) +++ head/mail/elmo/pkg-descr (revision 414048) @@ -1,9 +1,9 @@ Elmo (ELectronic Mail Operator) is an ncurses-based program for receiving, filtering, reading, composing, and sending mail from a character terminal. It speaks POP3 and SMTP and can work with maildir or Berkeley-formatted mailboxes. Before running elmo, users should run elmoconf.pl to generate an ~/.elmorc file. -WWW: http://elmo.sourceforge.net/ +WWW: http://elmo.sourceforge.net/ Index: head/mail/elmo/pkg-plist =================================================================== --- head/mail/elmo/pkg-plist (revision 414047) +++ head/mail/elmo/pkg-plist (revision 414048) @@ -1,8 +1,11 @@ bin/elmo bin/elmoconf.pl +man/man1/elmo.1.gz +man/man1/elmoconf.pl.1.gz %%DATADIR%%/template +%%DATADIR%%/themes/80x25 +%%DATADIR%%/themes/README +%%DATADIR%%/themes/outlook %%DATADIR%%/tutorial %%NLS%%share/locale/de/LC_MESSAGES/elmo.mo %%NLS%%share/locale/pl/LC_MESSAGES/elmo.mo -man/man1/elmo.1.gz -man/man1/elmoconf.pl.1.gz