git: 9efb18e4fabf - main - mail/deforaos-mailer: update to version 0.2.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Olivier Cochard <olivier_at_FreeBSD.org>
Date: Mon, 21 Oct 2024 23:22:24 UTC
The branch main has been updated by olivier:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9efb18e4fabf1a2a026ffa25e258af72f24dcbb7

commit 9efb18e4fabf1a2a026ffa25e258af72f24dcbb7
Author:     Pierre Pronchery <khorben@defora.org>
AuthorDate: 2024-10-14 15:29:12 +0000
Commit:     Olivier Cochard <olivier@FreeBSD.org>
CommitDate: 2024-10-21 23:20:12 +0000

    mail/deforaos-mailer: update to version 0.2.0
    
    Sponsored by:   The FreeBSD Foundation
---
 mail/deforaos-mailer/Makefile                      | 41 +++++++++-------------
 mail/deforaos-mailer/distinfo                      |  5 +--
 mail/deforaos-mailer/files/patch-doc_Makefile      |  4 +--
 .../files/patch-src_account_imap4.c                | 11 ++++++
 .../deforaos-mailer/files/patch-src_account_nntp.c | 11 ++++++
 .../deforaos-mailer/files/patch-src_account_pop3.c | 11 ++++++
 mail/deforaos-mailer/files/patch-src_mailer.c      | 14 --------
 mail/deforaos-mailer/files/patch-tests_Makefile    |  4 +--
 mail/deforaos-mailer/pkg-descr                     |  7 +++-
 mail/deforaos-mailer/pkg-plist                     | 22 ++++++++++++
 10 files changed, 84 insertions(+), 46 deletions(-)

diff --git a/mail/deforaos-mailer/Makefile b/mail/deforaos-mailer/Makefile
index 7d17614fd246..9ad8859a1401 100644
--- a/mail/deforaos-mailer/Makefile
+++ b/mail/deforaos-mailer/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	mailer
-PORTVERSION=	0.1.7
-PORTREVISION=	2
+PORTVERSION=	0.2.0
 CATEGORIES=	mail
-MASTER_SITES=	http://www.defora.org/os/download/download/4426/
+MASTER_SITES=	https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/Mailer/
 PKGNAMEPREFIX=	deforaos-
 DISTNAME=	Mailer-${PORTVERSION}
 
@@ -10,18 +9,19 @@ MAINTAINER=	khorben@defora.org
 COMMENT=	DeforaOS desktop mail client
 WWW=		https://www.defora.org/
 
-LICENSE=	GPLv3
+LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
+LIB_DEPENDS=	libDesktop.so:x11/deforaos-libdesktop \
+		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
-		libfontconfig.so:x11-fonts/fontconfig \
-		libDesktop.so:x11/deforaos-libdesktop
+		libSystem.so:devel/deforaos-libsystem
 
-USES=		gnome pkgconfig ssl
-USE_GNOME=	cairo gdkpixbuf2 gtk20
+USES=		gnome pkgconfig ssl xorg
+USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_LDCONFIG=	yes
+USE_XORG=	x11
 
 MAKE_ARGS+=	PREFIX=${PREFIX}
 MAKE_ENV+=	MANDIR=${STAGEDIR}${PREFIX}/share/man
@@ -31,17 +31,14 @@ MAKE_JOBS_UNSAFE=	yes
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
-DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
-	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
+DOCS_BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+			gtkdoc-check:textproc/gtk-doc \
+			xsltproc:textproc/libxslt
+
 NLS_USES=	gettext
 
 .include <bsd.port.pre.mk>
 
-.if ${SSL_DEFAULT} == base
-# openssl from base doesn't install a .pc file and pkg-config didn't like it
-CONFIGURE_ENV+=	libssl_CFLAGS="-I${OPENSSLINC}" libssl_LIBS="-L${OPENSSLLIB} -lssl"
-.endif
-
 post-patch-DOCS-off:
 	${REINPLACE_CMD} 's|data doc include|data include|' \
 		${WRKSRC}/Makefile
@@ -53,14 +50,8 @@ post-patch-NLS-off:
 post-patch:
 	${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \
 		${WRKSRC}/data/pkgconfig.sh
-	${REINPLACE_CMD} 's/-lssl/& -lcrypto/' \
-		${WRKSRC}/src/Makefile ${WRKSRC}/src/account/Makefile \
-		${WRKSRC}/src/plugins/Makefile ${WRKSRC}/tests/Makefile
-	${REINPLACE_CMD} 's|-Wl,-pie||g' \
-		${WRKSRC}/src/Makefile \
-		${WRKSRC}/tests/Makefile
 .if ${OPSYS} == FreeBSD
-	${REINPLACE_CMD} 's/stack-protector-all/stack-protector-all -Wno-error=int-conversion/g' \
+	${REINPLACE_CMD} 's/-fstack-protector/-fstack-protector -Wno-error=int-conversion/g' \
 		${WRKSRC}/src/Makefile \
 		${WRKSRC}/src/account/Makefile \
 		${WRKSRC}/src/plugins/Makefile \
@@ -69,8 +60,8 @@ post-patch:
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* \
-		${STAGEDIR}${PREFIX}/lib/Mailer/plugins/* \
-		${STAGEDIR}${PREFIX}/lib/Mailer/account/* \
+		${STAGEDIR}${PREFIX}/lib/Mailer/plugins/*.so \
+		${STAGEDIR}${PREFIX}/lib/Mailer/account/*.so \
 		${STAGEDIR}${PREFIX}/lib/libMailer.so.0.0
 
 .include <bsd.port.post.mk>
diff --git a/mail/deforaos-mailer/distinfo b/mail/deforaos-mailer/distinfo
index 5084e7476a93..8e95212b6443 100644
--- a/mail/deforaos-mailer/distinfo
+++ b/mail/deforaos-mailer/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Mailer-0.1.7.tar.gz) = da272a75ea4b74811f8c25c3b7cf0c5d941f744e8520353f4c643694bf44281c
-SIZE (Mailer-0.1.7.tar.gz) = 117673
+TIMESTAMP = 1728603650
+SHA256 (Mailer-0.2.0.tar.gz) = 9db52d1a413b38e5f2481552a104da091dfab1099c216f32b6c610bd5ed19983
+SIZE (Mailer-0.2.0.tar.gz) = 112837
diff --git a/mail/deforaos-mailer/files/patch-doc_Makefile b/mail/deforaos-mailer/files/patch-doc_Makefile
index f85f31233a88..4bda1c5731b2 100644
--- a/mail/deforaos-mailer/files/patch-doc_Makefile
+++ b/mail/deforaos-mailer/files/patch-doc_Makefile
@@ -1,6 +1,6 @@
---- doc/Makefile.orig	2016-02-20 14:42:07 UTC
+--- doc/Makefile.orig	2020-01-12 08:55:32 UTC
 +++ doc/Makefile
-@@ -79,10 +79,8 @@ install: $(TARGETS)
+@@ -77,10 +77,8 @@ install: all
  		$(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \
  		else $(MAKE) install; fi) || exit; done
  	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)compose.1"
diff --git a/mail/deforaos-mailer/files/patch-src_account_imap4.c b/mail/deforaos-mailer/files/patch-src_account_imap4.c
new file mode 100644
index 000000000000..fa2e094c3ed2
--- /dev/null
+++ b/mail/deforaos-mailer/files/patch-src_account_imap4.c
@@ -0,0 +1,11 @@
+--- src/account/imap4.c.orig	2024-10-10 23:42:56 UTC
++++ src/account/imap4.c
+@@ -190,7 +190,7 @@ AccountConfig const _imap4_config[I4CV_COUNT + 1] =
+ 	{ "username",	"Username",		ACT_STRING,	NULL	},
+ 	{ "password",	"Password",		ACT_PASSWORD,	NULL	},
+ 	{ "hostname",	"Server hostname",	ACT_STRING,	NULL	},
+-	{ "port",	"Server port",		ACT_UINT16,	143	},
++	{ "port",	"Server port",		ACT_UINT16,	(void *)143 },
+ 	{ "ssl",	"Use SSL",		ACT_BOOLEAN,	0	},
+ #if 0 /* XXX not implemented yet */
+ 	{ "sent",	"Sent mails folder",	ACT_NONE,	NULL	},
diff --git a/mail/deforaos-mailer/files/patch-src_account_nntp.c b/mail/deforaos-mailer/files/patch-src_account_nntp.c
new file mode 100644
index 000000000000..2bfc106ce685
--- /dev/null
+++ b/mail/deforaos-mailer/files/patch-src_account_nntp.c
@@ -0,0 +1,11 @@
+--- src/account/nntp.c.orig	2024-10-10 23:44:04 UTC
++++ src/account/nntp.c
+@@ -41,7 +41,7 @@ static AccountConfig const _nntp_config[] =
+ 	{ "username",	"Username",		ACT_STRING,	NULL	},
+ 	{ "password",	"Password",		ACT_PASSWORD,	NULL	},
+ 	{ "hostname",	"Server hostname",	ACT_STRING,	NULL	},
+-	{ "port",	"Server port",		ACT_UINT16,	119	},
++	{ "port",	"Server port",		ACT_UINT16,	(void *)119 },
+ 	{ "ssl",	"Use SSL",		ACT_BOOLEAN,	0	},
+ 	{ NULL,		NULL,			ACT_NONE,	NULL	}
+ };
diff --git a/mail/deforaos-mailer/files/patch-src_account_pop3.c b/mail/deforaos-mailer/files/patch-src_account_pop3.c
new file mode 100644
index 000000000000..50e2dff3b42f
--- /dev/null
+++ b/mail/deforaos-mailer/files/patch-src_account_pop3.c
@@ -0,0 +1,11 @@
+--- src/account/pop3.c.orig	2024-10-10 23:43:19 UTC
++++ src/account/pop3.c
+@@ -154,7 +154,7 @@ static AccountConfig _pop3_config[P3CV_COUNT + 1] =
+ 	{ "username",	"Username",		ACT_STRING,	NULL },
+ 	{ "password",	"Password",		ACT_PASSWORD,	NULL },
+ 	{ "hostname",	"Server hostname",	ACT_STRING,	NULL },
+-	{ "port",	"Server port",		ACT_UINT16,	110 },
++	{ "port",	"Server port",		ACT_UINT16,	(void *)110 },
+ 	{ "ssl",	"Use SSL",		ACT_BOOLEAN,	NULL },
+ 	{ "delete",	"Delete read mails on server",
+ 						ACT_BOOLEAN,	NULL },
diff --git a/mail/deforaos-mailer/files/patch-src_mailer.c b/mail/deforaos-mailer/files/patch-src_mailer.c
deleted file mode 100644
index e2d85d03d5c1..000000000000
--- a/mail/deforaos-mailer/files/patch-src_mailer.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/mailer.c.orig	2016-02-20 14:36:22 UTC
-+++ src/mailer.c
-@@ -373,7 +373,11 @@ Mailer * mailer_new(void)
- 	/* ssl */
- 	SSL_load_error_strings();
- 	SSL_library_init();
-+#ifndef OPENSSL_NO_SSL3
- 	if((mailer->ssl_ctx = SSL_CTX_new(SSLv3_client_method())) == NULL
-+#else
-+	if((mailer->ssl_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL
-+#endif
- 			|| SSL_CTX_set_cipher_list(mailer->ssl_ctx,
- 				SSL_DEFAULT_CIPHER_LIST) != 1
- 			|| SSL_CTX_load_verify_locations(mailer->ssl_ctx, NULL,
diff --git a/mail/deforaos-mailer/files/patch-tests_Makefile b/mail/deforaos-mailer/files/patch-tests_Makefile
index 12ef3566a4fb..2b1eab2bf352 100644
--- a/mail/deforaos-mailer/files/patch-tests_Makefile
+++ b/mail/deforaos-mailer/files/patch-tests_Makefile
@@ -1,6 +1,6 @@
---- tests/Makefile.orig	2016-09-12 04:36:41 UTC
+--- tests/Makefile.orig	2020-01-12 08:55:32 UTC
 +++ tests/Makefile
-@@ -27,7 +27,7 @@ $(OBJDIR)date$(EXEEXT): $(date_OBJS)
+@@ -30,7 +30,7 @@ email_OBJS = $(OBJDIR)email.o
  	$(CC) -o $(OBJDIR)date$(EXEEXT) $(date_OBJS) $(date_LDFLAGS)
  
  email_OBJS = $(OBJDIR)email.o
diff --git a/mail/deforaos-mailer/pkg-descr b/mail/deforaos-mailer/pkg-descr
index b25a5578579f..c7cfc1628f58 100644
--- a/mail/deforaos-mailer/pkg-descr
+++ b/mail/deforaos-mailer/pkg-descr
@@ -1 +1,6 @@
-DeforaOS desktop mail client
+Mailer is a mail client application for the DeforaOS desktop.
+
+It supports local mail folders in the mbox format, as well as POP 3 and IMAP 4
+servers, including connectivity over SSL. It is possible to access GMail
+through its IMAP 4 gateway. It currently requires a functional local e-mail
+service to send e-mails; this is performed through the sendmail(8) command.
diff --git a/mail/deforaos-mailer/pkg-plist b/mail/deforaos-mailer/pkg-plist
index ce8042810425..ee3a6915f25f 100644
--- a/mail/deforaos-mailer/pkg-plist
+++ b/mail/deforaos-mailer/pkg-plist
@@ -21,6 +21,27 @@ libdata/pkgconfig/Mailer.pc
 %%PORTDOCS%%share/man/man1/compose.1.gz
 %%PORTDOCS%%share/man/man1/mailer.1.gz
 share/applications/deforaos-mailer.desktop
+%%PORTDOCS%%share/doc/Mailer/COPYING
+%%PORTDOCS%%share/doc/Mailer/README.md
+%%PORTDOCS%%share/gtk-doc/html/Mailer/Mailer-account.html
+%%PORTDOCS%%share/gtk-doc/html/Mailer/Mailer-folder.html
+%%PORTDOCS%%share/gtk-doc/html/Mailer/Mailer-helper.html
+%%PORTDOCS%%share/gtk-doc/html/Mailer/Mailer-mailer.html
+%%PORTDOCS%%share/gtk-doc/html/Mailer/Mailer-message.html
+%%PORTDOCS%%share/gtk-doc/html/Mailer/Mailer-plugin.html
+%%PORTDOCS%%share/gtk-doc/html/Mailer/Mailer.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/Mailer/api-index-full.html
+%%PORTDOCS%%share/gtk-doc/html/Mailer/ch01.html
+%%PORTDOCS%%share/gtk-doc/html/Mailer/deprecated-api-index.html
+%%PORTDOCS%%share/gtk-doc/html/Mailer/home.png
+%%PORTDOCS%%share/gtk-doc/html/Mailer/index.html
+%%PORTDOCS%%share/gtk-doc/html/Mailer/left-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/Mailer/left.png
+%%PORTDOCS%%share/gtk-doc/html/Mailer/right-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/Mailer/right.png
+%%PORTDOCS%%share/gtk-doc/html/Mailer/style.css
+%%PORTDOCS%%share/gtk-doc/html/Mailer/up-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/Mailer/up.png
 share/icons/hicolor/16x16/apps/mailer-accounts.png
 share/icons/hicolor/16x16/apps/mailer-drafts.png
 share/icons/hicolor/16x16/apps/mailer-inbox.png
@@ -37,4 +58,5 @@ share/icons/hicolor/48x48/apps/mailer-inbox.png
 share/icons/hicolor/48x48/apps/mailer-outbox.png
 share/icons/hicolor/48x48/apps/mailer-sent.png
 share/icons/hicolor/48x48/apps/mailer.png
+%%NLS%%share/locale/es/LC_MESSAGES/Mailer.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/Mailer.mo