From owner-svn-ports-all@freebsd.org Tue Apr 26 12:42:14 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5341EB1C3EE; Tue, 26 Apr 2016 12:42:14 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1288A1129; Tue, 26 Apr 2016 12:42:13 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3QCgD2Q093738; Tue, 26 Apr 2016 12:42:13 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3QCgCJw093732; Tue, 26 Apr 2016 12:42:12 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201604261242.u3QCgCJw093732@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 26 Apr 2016 12:42:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414048 - in head/mail/elmo: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2016 12:42:14 -0000 Author: mat Date: Tue Apr 26 12:42:12 2016 New Revision: 414048 URL: https://svnweb.freebsd.org/changeset/ports/414048 Log: Update to 1.3.2. PR: 209044 Submitted by: tkato432 yahoo com Sponsored by: Absolight Added: head/mail/elmo/files/patch-src_gettext.h (contents, props changed) Deleted: head/mail/elmo/files/patch-src_rstring.c head/mail/elmo/files/patch-src_str.c Modified: head/mail/elmo/Makefile (contents, props changed) head/mail/elmo/distinfo (contents, props changed) head/mail/elmo/files/patch-src_elmoconf.pl (contents, props changed) head/mail/elmo/pkg-descr (contents, props changed) head/mail/elmo/pkg-plist (contents, props changed) Modified: head/mail/elmo/Makefile ============================================================================== --- head/mail/elmo/Makefile Tue Apr 26 12:42:04 2016 (r414047) +++ head/mail/elmo/Makefile Tue Apr 26 12:42:12 2016 (r414048) @@ -2,17 +2,19 @@ # $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 @@ -20,28 +22,18 @@ 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 Modified: head/mail/elmo/distinfo ============================================================================== --- head/mail/elmo/distinfo Tue Apr 26 12:42:04 2016 (r414047) +++ head/mail/elmo/distinfo Tue Apr 26 12:42:12 2016 (r414048) @@ -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 Modified: head/mail/elmo/files/patch-src_elmoconf.pl ============================================================================== --- head/mail/elmo/files/patch-src_elmoconf.pl Tue Apr 26 12:42:04 2016 (r414047) +++ head/mail/elmo/files/patch-src_elmoconf.pl Tue Apr 26 12:42:12 2016 (r414048) @@ -1,5 +1,5 @@ ---- 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. Added: head/mail/elmo/files/patch-src_gettext.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/elmo/files/patch-src_gettext.h Tue Apr 26 12:42:12 2016 (r414048) @@ -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) \ Modified: head/mail/elmo/pkg-descr ============================================================================== --- head/mail/elmo/pkg-descr Tue Apr 26 12:42:04 2016 (r414047) +++ head/mail/elmo/pkg-descr Tue Apr 26 12:42:12 2016 (r414048) @@ -6,4 +6,4 @@ 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/ Modified: head/mail/elmo/pkg-plist ============================================================================== --- head/mail/elmo/pkg-plist Tue Apr 26 12:42:04 2016 (r414047) +++ head/mail/elmo/pkg-plist Tue Apr 26 12:42:12 2016 (r414048) @@ -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