Attachment #169685 for bug #209044

View | Details | Raw Unified | Return to bug 209044
Collapse All | Expand All




# $FreeBSD: head/mail/elmo/Makefile 412348 2016-04-01 14:17:44Z mat $

PORTNAME=	elmo
PORTVERSION=	1.3.2
PORTREVISION=	3
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
OPTIONS_DEFINE=	NLS

USES=		iconv ncurses perl5 shebangfix
SHEBANG_FILES=	src/elmoconf.pl
USE_OPENSSL=	yes
USE_PERL5=	run
GNU_CONFIGURE=	yes

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

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 \
		'/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>

Lines 1-2 Link Here

(-)mail/elmo/distinfo (-2 / +2 lines)
1	SHA256 (elmo-1.3.0.tar.gz) = 6a4033ac4db0316fc3cbb5b36a1422ecaaae844cd0c668240037f3a6cf68d36b	1	SHA256 (elmo-1.3.2.tar.gz) = 96fa20b171e3c24262b3af150e89141a2a59883075b5e6a0f9a40ff60830fcbd
2	SIZE (elmo-1.3.0.tar.gz) = 513705	2	SIZE (elmo-1.3.2.tar.gz) = 536768

Lines 1-10 Link Here

(-)mail/elmo/files/patch-src_elmoconf.pl (-10 lines)
1	--- src/elmoconf.pl.orig Sat Aug 7 11:30:51 2004
2	+++ src/elmoconf.pl Sat Aug 7 11:32:44 2004
3	@@ -26,7 +26,6 @@
4	# This script sets up user's config file based on few simple questions.
5
6	use strict;
7	-use warnings;
8
9	use constant VERSION => "1.48";
10




--- 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"
 




--- 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;

Lines 6-9 Link Here

(-)mail/elmo/pkg-descr (-1 / +1 lines)
6	Before running elmo, users should run elmoconf.pl to generate an	6	Before running elmo, users should run elmoconf.pl to generate an
7	~/.elmorc file.	7	~/.elmorc file.
8		8
9	WWW: http://elmo.sourceforge.net/	9	WWW: http://elmo.sourceforge.net/

Lines 1-8 Link Here

(-)mail/elmo/pkg-plist (-2 / +5 lines)
1	bin/elmo	1	bin/elmo
2	bin/elmoconf.pl	2	bin/elmoconf.pl
		3	man/man1/elmo.1.gz
		4	man/man1/elmoconf.pl.1.gz
3	%%DATADIR%%/template	5	%%DATADIR%%/template
		6	%%DATADIR%%/themes/80x25
		7	%%DATADIR%%/themes/README
		8	%%DATADIR%%/themes/outlook
4	%%DATADIR%%/tutorial	9	%%DATADIR%%/tutorial
5	%%NLS%%share/locale/de/LC_MESSAGES/elmo.mo	10	%%NLS%%share/locale/de/LC_MESSAGES/elmo.mo
6	%%NLS%%share/locale/pl/LC_MESSAGES/elmo.mo	11	%%NLS%%share/locale/pl/LC_MESSAGES/elmo.mo
7	man/man1/elmo.1.gz
8	man/man1/elmoconf.pl.1.gz

Return to bug 209044

Lines 2-47 Link Here

(-)mail/elmo/Makefile (-24 / +21 lines)
2	# $FreeBSD: head/mail/elmo/Makefile 412348 2016-04-01 14:17:44Z mat $	2	# $FreeBSD: head/mail/elmo/Makefile 412348 2016-04-01 14:17:44Z mat $
3		3
4	PORTNAME= elmo	4	PORTNAME= elmo
5	PORTVERSION= 1.3.0	5	PORTVERSION= 1.3.2
6	PORTREVISION= 3
7	CATEGORIES= mail	6	CATEGORIES= mail
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Receive, filter, read, compose, and send mail at the text console	10	COMMENT= Receive, filter, read, compose, and send mail at the text console
12		11
13	CONFLICTS= elmo-devel-[0-9]*	12	LICENSE= GPLv2
14		13	LICENSE_FILE= ${WRKSRC}/COPYING
15	OPTIONS_DEFINE= NLS
16		14
17	GNU_CONFIGURE= yes	15	USES= iconv ncurses perl5 shebangfix
18	USES= iconv ncurses shebangfix perl5	16	SHEBANG_FILES= src/elmoconf.pl
19	USE_OPENSSL= yes	17	USE_OPENSSL= yes
20	USE_PERL5= run	18	USE_PERL5= run
21	SHEBANG_FILES= src/elmoconf.pl	19	GNU_CONFIGURE= yes
22
23	LICENSE= GPLv2
24	LICENSE_FILE= ${WRKSRC}/COPYING
25		20
26	CPPFLAGS+= -I${LOCALBASE}/include	21	CPPFLAGS+= -I${LOCALBASE}/include
27	LDFLAGS+= -L${LOCALBASE}/lib	22	LDFLAGS+= -L${LOCALBASE}/lib
28		23
		24	OPTIONS_DEFINE= GPGME NLS
		25	OPTIONS_SUB= yes
		26
		27	CONFLICTS= elmo-devel-[0-9]*
		28
		29	GPGME_DESC= GnuPG support using GPGME
		30	GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme
		31	GPGME_CONFIGURE_ENV_OFF=ac_cv_header_gpgme_h=no
		32	NLS_USES= gettext
29	NLS_CONFIGURE_ON= --with-libintl-prefix="${LOCALBASE}"	33	NLS_CONFIGURE_ON= --with-libintl-prefix="${LOCALBASE}"
30	NLS_CONFIGURE_OFF= --disable-nls	34	NLS_CONFIGURE_OFF= --disable-nls
31	NLS_USES= gettext
32	OPTIONS_SUB= yes
33
34	.if exists(${LOCALBASE}/lib/libgpgme.so) \|\| defined(WITH_GPGME)
35	LIB_DEPENDS+= libgpgme.so:security/gpgme
36	.else
37	pre-everything::
38	@${ECHO_CMD}
39	@${ECHO_CMD} "Define WITH_GPGME=yes to build with gpgme support."
40	@${ECHO_CMD}
41	.endif
42		35
43	post-patch:	36	post-patch:
44	@${REINPLACE_CMD} -e 's\|gpgme4\|gpgme\|g' -e 's\|== "\|= "\|g' ${WRKSRC}/configure	37	@${REINPLACE_CMD} -e \
45	@${REINPLACE_CMD} -e 's\|gpgme4\|gpgme\|g' ${WRKSRC}/src/pgp.c	38	'/if test/s\|==\|=\|' ${WRKSRC}/configure
		39	@${REINPLACE_CMD} -e \
		40	'/^use warnings;/d' ${WRKSRC}/src/elmoconf.pl
		41	@${REINPLACE_CMD} -e \
		42	'/define gettext/s\|const char\|char\|' ${WRKSRC}/src/gettext.h
46		43
47	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Lines 1-18 Link Here

(-)mail/elmo/files/patch-src_rstring.c (-18 lines)
1	--- src/rstring.c.orig Sat Aug 7 03:01:05 2004
2	+++ src/rstring.c Sat Aug 7 03:02:12 2004
3	@@ -30,7 +30,6 @@
4	#include <string.h>
5	#include <stdarg.h>
6	#include <sys/types.h>
7	-#include <regex.h>
8	#include <errno.h>
9	#include <ctype.h>
10
11	@@ -38,6 +37,7 @@
12	#include "rarray.h"
13	#include "rstring.h"
14	#include "error.h"
15	+#include <regex.h>
16	#include "memchunk.h"
17	#include "str.h"
18

Lines 1-14 Link Here

(-)mail/elmo/files/patch-src_str.c (-14 lines)
1	--- src/str.c.orig Sat Aug 7 11:07:36 2004
2	+++ src/str.c Sat Aug 7 11:22:37 2004
3	@@ -217,7 +217,11 @@
4
5	while (1){
6	max_size = str->size - str->len - 1;
7	+#if (defined(__FreeBSD__) && __FreeBSD__ < 5)
8	+ copy = ap;
9	+#else
10	va_copy (copy, ap);
11	+#endif
12	n = vsnprintf (str->str + str->len, max_size, fmt, copy);
13	if (n > -1 && n < max_size){
14	str->len += n;