Attachment 169685 Details for Bug 209044 – mail_elmo.diff

[patch] mail_elmo.diff

mail_elmo.diff (text/plain), 5.19 KB, created by tkato432 on 2016-04-25 18:31:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-04-25 18:31:38 UTC

Size: 5.19 KB

patch

obsolete

>diff -urN /usr/ports/mail/elmo/Makefile mail/elmo/Makefile
>--- /usr/ports/mail/elmo/Makefile	2016-04-02 02:04:46.281743000 +0900
>+++ mail/elmo/Makefile	2016-04-26 00:00:00.000000000 +0900
>@@ -2,46 +2,43 @@
> # $FreeBSD: head/mail/elmo/Makefile 412348 2016-04-01 14:17:44Z mat $
> 
> 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
> 
>-CONFLICTS=	elmo-devel-[0-9]*
>-
>-OPTIONS_DEFINE=	NLS
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-GNU_CONFIGURE=	yes
>-USES=		iconv ncurses shebangfix perl5
>+USES=		iconv ncurses perl5 shebangfix
>+SHEBANG_FILES=	src/elmoconf.pl
> USE_OPENSSL=	yes
> USE_PERL5=	run
>-SHEBANG_FILES=	src/elmoconf.pl
>-
>-LICENSE=	GPLv2
>-LICENSE_FILE=	${WRKSRC}/COPYING
>+GNU_CONFIGURE=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>+OPTIONS_DEFINE=		GPGME NLS
>+OPTIONS_SUB=		yes
>+
>+CONFLICTS=	elmo-devel-[0-9]*
>+
>+GPGME_DESC=		GnuPG support using GPGME
>+GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme
>+GPGME_CONFIGURE_ENV_OFF=ac_cv_header_gpgme_h=no
>+NLS_USES=		gettext
> 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|==|=|' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e \
>+		'/^use warnings;/d' ${WRKSRC}/src/elmoconf.pl
>+	@${REINPLACE_CMD} -e \
>+		'/define gettext/s|const char|char|' ${WRKSRC}/src/gettext.h
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/mail/elmo/distinfo mail/elmo/distinfo
>--- /usr/ports/mail/elmo/distinfo	2015-08-24 04:00:13.661139000 +0900
>+++ mail/elmo/distinfo	2016-04-26 00:00:00.000000000 +0900
>@@ -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
>diff -urN /usr/ports/mail/elmo/files/patch-src_elmoconf.pl mail/elmo/files/patch-src_elmoconf.pl
>--- /usr/ports/mail/elmo/files/patch-src_elmoconf.pl	2015-08-24 04:00:13.677466000 +0900
>+++ mail/elmo/files/patch-src_elmoconf.pl	1970-01-01 09:00:00.000000000 +0900
>@@ -1,10 +0,0 @@
>---- src/elmoconf.pl.orig	Sat Aug  7 11:30:51 2004
>-+++ src/elmoconf.pl	Sat Aug  7 11:32:44 2004
>-@@ -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";
>- 
>diff -urN /usr/ports/mail/elmo/files/patch-src_rstring.c mail/elmo/files/patch-src_rstring.c
>--- /usr/ports/mail/elmo/files/patch-src_rstring.c	2015-08-24 04:00:13.675713000 +0900
>+++ mail/elmo/files/patch-src_rstring.c	1970-01-01 09:00:00.000000000 +0900
>@@ -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 <string.h>
>- #include <stdarg.h>
>- #include <sys/types.h>
>--#include <regex.h>
>- #include <errno.h>
>- #include <ctype.h>
>- 
>-@@ -38,6 +37,7 @@
>- #include "rarray.h"
>- #include "rstring.h"
>- #include "error.h"
>-+#include <regex.h>
>- #include "memchunk.h"
>- #include "str.h"
>- 
>diff -urN /usr/ports/mail/elmo/files/patch-src_str.c mail/elmo/files/patch-src_str.c
>--- /usr/ports/mail/elmo/files/patch-src_str.c	2015-08-24 04:00:13.676592000 +0900
>+++ mail/elmo/files/patch-src_str.c	1970-01-01 09:00:00.000000000 +0900
>@@ -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;
>diff -urN /usr/ports/mail/elmo/pkg-descr mail/elmo/pkg-descr
>--- /usr/ports/mail/elmo/pkg-descr	2015-08-24 04:00:13.674460000 +0900
>+++ mail/elmo/pkg-descr	2016-04-26 00:00:00.000000000 +0900
>@@ -6,4 +6,4 @@
> Before running elmo, users should run elmoconf.pl to generate an 
> ~/.elmorc file.
> 
>-WWW:  http://elmo.sourceforge.net/
>+WWW: http://elmo.sourceforge.net/
>diff -urN /usr/ports/mail/elmo/pkg-plist mail/elmo/pkg-plist
>--- /usr/ports/mail/elmo/pkg-plist	2015-08-24 04:00:13.648725000 +0900
>+++ mail/elmo/pkg-plist	2016-04-26 00:00:00.000000000 +0900
>@@ -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

Actions: View | Diff

Attachments on bug 209044: 169685